[pkg-bacula-commits] [bacula] 02/02: 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 60ecdff5763441900719b240b37b25a628401c85
Merge: 5cd40cf f045313
Author: Sven Hartge <sven at svenhartge.de>
Date:   Wed Jul 20 14:16:25 2016 +0200

    Merge branch 'master-systemd' into systemd-fixuser

 debian/TODO      |  7 +++++++
 debian/changelog | 17 +++++++++++++----
 debian/control   | 10 ++++++----
 debian/copyright |  2 +-
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --cc debian/TODO
index 9fd685b,d0ef1ad..568086b
--- a/debian/TODO
+++ b/debian/TODO
@@@ -20,14 -20,14 +20,21 @@@ Wishlist
     http://www.bacula.org/7.4.x-manuals/en/main/New_Features_in_5_2_13.html#SECTION00658000000000000000
     https://lists.alioth.debian.org/pipermail/pkg-bacula-devel/2016-July/001536.html
     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699149
 +   Done:
 +        - setcap cap_dac_read_search+ep for /usr/sbin/bacula-fd via postinst
 +        - parsing variable ENABLE_NONROOT in bacula-fd init-script
 +   Missing:
 +        - decide if non-root should be default on Linux or not
 +        - adding ENABLE_NONROOT=true/false to /etc/default/bacula-fd
 +        - document way to do the systemd drop-in configuration to enable/disable non-root
  
+ Review unmerged old changes:
+ 
+  * Ask for passwords via debconf (git tag development/2011-04-29)
+     d4676fc19978a0588bb09a58234cf451d15859d6 Don't set passwords at build time but ask for them
+     aea2145a4f135fa6d18d33384a1af2c2bffc8617 Get rid of useless common-functions
+  * migrate config files to ucf (git tag development/migrate-to-ucf-2012-06-07)
+ 
  Old:
  
  * Maybe:
diff --cc debian/changelog
index 3066acf,01311af..9c31089
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,25 @@@
- bacula (7.4.3+dfsg-1+fixuser1) UNRELEASED; urgency=medium
++bacula (7.4.3+dfsg-4~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-1+systemd1) experimental; urgency=medium
+ bacula (7.4.3+dfsg-3) experimental; urgency=medium
+ 
+   [ Sven Hartge ]
+   * Fix dependencies between bacula-director-common and
+     bacula-director-DBTYPE to allow move of init-script
+     from the first to the second.
+ 
+  -- Sven Hartge <sven at svenhartge.de>  Wed, 20 Jul 2016 13:16:37 +0200
+ 
+ bacula (7.4.3+dfsg-2) experimental; urgency=medium
  
    [ Sven Hartge ]
    * Enable systemd integration

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