[pkg-bacula-commits] [bacula] 01/01: Merge branch 'master-systemd' into systemd-fixuser

[Sven Hartge]

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

hartge-guest pushed a commit to branch systemd-fixuser
in repository bacula.

commit 5cd40cf27a5d8e9187d325b81ad536d942af7e09
Merge: 25e073c c90ac90
Author: Sven Hartge <sven at svenhartge.de>
Date:   Tue Jul 19 23:22:54 2016 +0200

    Merge branch 'master-systemd' into systemd-fixuser

 debian/bacula-common.postinst                      |  1 -
 debian/bacula-director-db.bacula-director.init.in  |  6 +++---
 debian/changelog                                   | 10 ++++-----
 ...=> fix-bring-back-tmpfiles-configuration.patch} | 11 +++++-----
 debian/patches/series                              |  2 +-
 debian/rules                                       | 24 +++++++---------------
 6 files changed, 22 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index dc30f23,994da9f..3066acf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,21 @@@
- bacula (7.4.3+dfsg-3) UNRELEASED; urgency=medium
++bacula (7.4.3+dfsg-1+fixuser1) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * remove configuration option to change runtime user for director
 +    and storage daemon
 +  * add capability cap_dac_read_search to bacula-fd, making it possible
 +    to run as non-root in the future.
 +  * change bacula-fd init-script to make running as non-root configurable
 +    by the admin via /etc/default/bacula-fd
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
- bacula (7.4.3+dfsg-2) UNRELEASED; urgency=medium
+ bacula (7.4.3+dfsg-1+systemd1) experimental; urgency=medium
  
-   [ Sven Hartge ] 
+   [ Sven Hartge ]
    * Enable systemd integration
    * Change bacula-{sd,fd,director}.services to non-forking simple mode
-   * Move init-scripts and systemd services files from 
+   * Move init-scripts and systemd services files from
      bacula-director-common to bacula-director-DBTYPE, simplyfying their
      handling for the packaging tools.
    * readd lost tmpfiles.d/bacula.conf to create /var/run/bacula

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