[pkg-bacula-commits] [bacula] 03/04: disable all native systemd support (Closes: #826163) avoids a regression of #825064 (daemon silently fails to start)

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 4a377d93280a982c4d0c7d4536699add8e5c5ae8
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Jun 5 10:43:22 2016 +0200

    disable all native systemd support (Closes: #826163)
    avoids a regression of #825064 (daemon silently fails to start)
---
 debian/rules | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 43bd63d..1081be6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,16 +49,16 @@ CONF_ALL	= \
 	--with-mysql --with-postgresql --with-sqlite3 \
 	--enable-bat --with-x
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONF_ALL	+= --with-systemd=/lib/systemd/system
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#CONF_ALL	+= --with-systemd=/lib/systemd/system
+#endif
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CONF_ALL	+= --disable-acl --disable-xattr
 endif
 
 #set to 1 if configured with systemd
-HAVE_SYSTEMD = $(findstring 1,$(shell egrep "^\#define HAVE_SYSTEMD" config.log))
+#HAVE_SYSTEMD = $(findstring 1,$(shell egrep "^\#define HAVE_SYSTEMD" config.log))
 
 LONGNAME_mysql		= mysql
 LONGNAME_pgsql		= postgresql
@@ -131,12 +131,12 @@ override_dh_install-arch:
 		-e "s/XX_DBLONGNAME_XX/$(LONGNAME_$(db))/" \
 		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup \
 		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl;)
-ifeq ($(HAVE_SYSTEMD),1)
-	# only install systemd related files if systemd is enabled during build
-	install -m 644 platforms/systemd/bacula-fd.service -D debian/bacula-fd/lib/systemd/system/bacula-fd.service
-	install -m 644 platforms/systemd/bacula-sd.service -D debian/bacula-sd/lib/systemd/system/bacula-sd.service
-	install -m 644 platforms/systemd/bacula-dir.service -D debian/bacula-director-common/lib/systemd/system/bacula-director.service
-endif
+#ifeq ($(HAVE_SYSTEMD),1)
+#	# only install systemd related files if systemd is enabled during build
+#	install -m 644 platforms/systemd/bacula-fd.service -D debian/bacula-fd/lib/systemd/system/bacula-fd.service
+#	install -m 644 platforms/systemd/bacula-sd.service -D debian/bacula-sd/lib/systemd/system/bacula-sd.service
+#	install -m 644 platforms/systemd/bacula-dir.service -D debian/bacula-director-common/lib/systemd/system/bacula-director.service
+#endif
 
 override_dh_installdocs:
 	dh_installdocs -pbacula --link-doc=bacula-server

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git