[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-181-g9aa2a35

Thu Jun 7 15:32:31 UTC 2012

The following commit has been merged in the master branch:
commit 9aa2a35d89381f5dcf639a78ce33a2e0187c482d
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 7 17:15:13 2012 +0200

    debian/patches/add-systemd-bacula.conf-for-piddir.patch: (624532)

diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index eac8dd5..5c5d373 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -14,3 +14,4 @@ etc/bacula/bconsole.conf	usr/share/bacula-common/defconfig
 etc/bacula/bacula-sd.conf	usr/share/bacula-common/defconfig
 etc/bacula/bacula-fd.conf	usr/share/bacula-common/defconfig
 etc/bacula/bacula-dir.conf	usr/share/bacula-common/defconfig
+platforms/systemd/bacula.conf	etc/tmpfiles.d
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index d129c9f..77fc949 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -5,3 +5,4 @@ etc/bacula/scripts/*catalog_backup.pl
 debian/additions/mysql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
+platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 259103d..5c7fdbd 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -7,3 +7,4 @@ debian/additions/pgsql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
 debian/additions/pgsql/database/pgsql	usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
+platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index 2dffcce..b7ed49a 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -5,3 +5,4 @@ etc/bacula/scripts/*catalog_backup.pl
 debian/additions/sqlite3/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
+platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-fd.install b/debian/bacula-fd.install
index f92725e..07ddfa0 100644
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@ -1,2 +1,3 @@
 usr/sbin/bacula-fd
 usr/lib/bacula/bpipe-fd.so
+platforms/systemd/bacula-fd.service	lib/systemd/system
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index b5b5ea2..df49c21 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -5,3 +5,4 @@ etc/bacula/scripts/mtx-changer
 etc/bacula/scripts/mtx-changer.conf
 etc/bacula/scripts/disk-changer
 etc/bacula/scripts/dvd-handler
+platforms/systemd/bacula-sd.service	lib/systemd/system
diff --git a/debian/changelog b/debian/changelog
index 60bc1bd..76008f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,9 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
     - remove, deprecated upstream since 2.0.2-1 (see #391820).
   * debian/additions/bacula-tray-monitor.desktop:
     - remove, use upstream file.
+  * debian/bacula-common.install:
+    + install systemd tmpfiles.d's bacula.conf, thanks to Michael
+      Stapelberg <michael+db20090501 at stapelberg.de> (Closes: #624532).
   * debian/bacula-console*:
     + move bconsole to /usr/sbin/ as intended by upstream, providing
       symlinks in old place.
@@ -124,6 +127,9 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
     + move bat to /usr/sbin/ as intended by upstream.
     - remove useless -c option, /etc/bacula/bat.conf is used by default
       if not specified.
+  * debian/bacula-director-*.install, debian/bacula-fd.install,
+    debian/bacula-sd.install:
+    + install upstream systemd service files.
   * debian/bacula-director-*.postinst:
     - remove path for sh call (thanks to lintian).
   * debian/bacula-traymonitor.install:
@@ -142,6 +148,8 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/NEWS:
     + add note about moving bat/bconsole/bacula-tray-monitor to
       /usr/sbin/ as intended by upstream.
+  * debian/patches/add-systemd-bacula.conf-for-piddir.patch:
+    + add bacula.conf which defines the PID directory to be created.
   * debian/patches/fix-binutils-gold-linking.patch:
     + import from upstream BTS (Closes: #553956).
   * debian/patches/fix-scriptdir-examples-devices.patch:
@@ -152,6 +160,7 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/rules:
     + add --with-dump-email=root and --with-job-email=root to CONF_ALL,
       thus removing the '@localhost' domain part (Closes: #519567).
+    + add --with-systemd=/lib/systemd/system for systemd files.
     + rename bacula-tray-monitor.xpm.
 
   [ Martin Pitt ]
diff --git a/debian/patches/add-systemd-bacula.conf-for-piddir.patch b/debian/patches/add-systemd-bacula.conf-for-piddir.patch
new file mode 100644
index 0000000..44a2e3e
--- /dev/null
+++ b/debian/patches/add-systemd-bacula.conf-for-piddir.patch
@@ -0,0 +1,72 @@
+Description: add systemd's bacula.conf to create the PID directory
+Bug-Debian: 624532
+Bug: http://bugs.bacula.org/view.php?id=1886
+Author: Luca Capello <luca at pca.it>
+Last-Update: 2012-06-07
+
+--- a/platforms/systemd/Makefile.in
++++ b/platforms/systemd/Makefile.in
+@@ -11,13 +11,17 @@
+ # should be /lib/systemd/system and get be get with
+ # systemctl show | grep UnitPath | cut -d " " -f2
+ SYSTEMD_UNITDIR = @SYSTEMD_UNITDIR@
++SYSTEMD_TMPFILES = /etc/tmpfiles.d
+ 
+ nothing:
+ 
+-install: install-dir install-autostart
++install: install-dir install-conf install-autostart
+ 
+ install-dir: $(DESTDIR)/$(SYSTEMD_UNITDIR)
+-	mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR)
++	mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR) $(DESTDIR)/$(SYSTEMD_TMPFILES)
++
++install-conf:
++	@$(INSTALL_PROGRAM) -m 644 bacula.conf $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
+ 
+ install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
+ 
+@@ -61,7 +65,7 @@
+ 	fi
+ 
+ 
+-uninstall: uninstall-autostart
++uninstall: uninstall-autostart uninstall-conf
+ 
+ uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir
+ 
+@@ -87,14 +91,17 @@
+ 	fi
+ 	@rm -f	$(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-dir.service
+ 
++uninstall-conf:
++	@rm -f	$(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
++
+ clean:
+ 	@rm -f 1 2 3
+ 
+ distclean: clean
+ 	@rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+-	@rm -f bacula-sd.service bacula-fd.service bacula-dir.service
++	@rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
+ 
+ devclean: clean
+ 	@rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+-	@rm -f bacula-sd.service bacula-fd.service bacula-dir.service
++	@rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
+ 
+--- /dev/null
++++ b/platforms/systemd/bacula.conf.in
+@@ -0,0 +1,2 @@
++# See tmpfiles.d(5) for details
++d @piddir@ 2775 bacula bacula -
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -3144,6 +3144,7 @@
+ 
+ 	   PFILES="${PFILES} \
+ 		   platforms/systemd/Makefile \
++		   platforms/systemd/bacula.conf \
+ 		   platforms/systemd/bacula-dir.service \
+ 		   platforms/systemd/bacula-fd.service \
+ 		   platforms/systemd/bacula-sd.service"
diff --git a/debian/patches/series b/debian/patches/series
index 79b2073..1ef3d22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ fix-manpages
 remove-upstream-autoconf-log.patch
 fix-libbaccats-rpath.patch
 fix-scriptdir-examples-devices.patch
+add-systemd-bacula.conf-for-piddir.patch
diff --git a/debian/rules b/debian/rules
index e7dc873..8440a49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,8 @@ CONF_ALL	= \
 	--with-working-dir=/var/lib/bacula \
 	--with-subsys-dir=/var/lock \
 	--with-dump-email=root \
-	--with-job-email=root
+	--with-job-email=root \
+	--with-systemd=/lib/systemd/system
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CONF_ALL	+= --disable-acl --disable-xattr

-- 
Bacula, a network backup, recovery and verification program

