Merge commit 'v15'

diff --cc Makefile.am
index 0d552e51d6cea065d5fa743c7a0d45b7ebe48a3b,471954bf684ffcfc4950a9a7f918e42db2b850b1..976afa4675f5c31129e3a93c13a4bca178e4485f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -332,18 -333,7 +333,14 @@@ dist_systemunit_DATA += 
        units/fedora/plymouth-poweroff.service \
        units/fedora/plymouth-halt.service
  endif
 +if TARGET_DEBIAN
 +dist_systemunit_DATA += \
 +      units/debian/halt.service \
 +      units/debian/killall.service \
 +      units/debian/poweroff.service \
 +      units/debian/reboot.service
 +endif
  
- if TARGET_GENTOO
- dist_systemunit_DATA += \
-       units/gentoo/xdm.service
- endif
  
  if TARGET_ARCH
  dist_systemunit_DATA += \