tags 672457 + patch
thanks

The attached patch should - I believe - fix the issue. It will result in
shipping the systemd control files and the symlinks on every arch, even
when systemd is not used, even when support is not compiled into
syslog-ng.

They do no harm, and if any of these non-linux platforms grow systemd
support overnight, we'll have the files there. Plus, our conffiles are
consistent over architectures this way, which is great.

-- 
|8]

--- a/debian/rules	2012-05-11 12:00:38.213446208 +0200
+++ b/debian/rules	2012-05-11 12:00:42.813469008 +0200
@@ -129,14 +129,13 @@
 override_dh_auto_install:
 	dh_auto_install
 	${MAKE} -C debian/build-tree/lib/ivykis install DESTDIR=$(CURDIR)/debian/tmp
-ifeq (linux,$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS))
-	install -d debian/syslog-ng-core/etc/systemd/system/multi-user.target.wants
+
 	ln -sf /lib/systemd/system/syslog-ng.service \
 	       debian/syslog-ng-core/etc/systemd/system/syslog.service
 	ln -sf /lib/systemd/system/syslog-ng.service \
 	       debian/syslog-ng-core/etc/systemd/system/multi-user.target.wants/
-	cp -r debian/tmp/lib debian/syslog-ng-core/
-endif
+	install -m 0644 contrib/systemd/syslog-ng.service \
+			debian/syslog-ng-core/lib/systemd/system/
 
 ##
 #* Overrides for other debhelper commands
diff --git a/debian/syslog-ng-core.dirs b/debian/syslog-ng-core.dirs
index b2c4a17..73a42f6 100644
--- a/debian/syslog-ng-core.dirs
+++ b/debian/syslog-ng-core.dirs
@@ -1 +1,3 @@
 /etc/syslog-ng/conf.d/
+/etc/systemd/system/multi-user.target.wants/
+/lib/systemd/system/

Reply via email to