From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 26 Dec 2010 12:01:09 +0000 (+0100)
Subject: Merge commit 'v15'
X-Git-Tag: 16-1~24^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c371dbad2c4e5411cfbe62cc9641b0c7d27cb520;p=systemd

Merge commit 'v15'
---

c371dbad2c4e5411cfbe62cc9641b0c7d27cb520
diff --cc Makefile.am
index 0d552e51,471954bf..976afa46
--- a/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 += \