[pkg-bacula-commits] [bacula] 08/27: Removed debian/patches/add-systemd-bacula.conf-for-piddir.patch, fixed in upstream 5.2.8

Carsten Leonhardt cl-guest at moszumanska.debian.org
Sun Jul 19 22:38:30 UTC 2015


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

cl-guest pushed a commit to branch master
in repository bacula.

commit f3d120e35754773d5a243bf5bf0bf84844a54e50
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 20 00:11:21 2015 +0200

    Removed debian/patches/add-systemd-bacula.conf-for-piddir.patch, fixed in upstream 5.2.8
---
 .../add-systemd-bacula.conf-for-piddir.patch       | 72 ----------------------
 1 file changed, 72 deletions(-)

diff --git a/debian/patches/add-systemd-bacula.conf-for-piddir.patch b/debian/patches/add-systemd-bacula.conf-for-piddir.patch
deleted file mode 100644
index 44a2e3e..0000000
--- a/debian/patches/add-systemd-bacula.conf-for-piddir.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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"

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



More information about the pkg-bacula-commits mailing list