[pkg-bacula-commits] [bacula] 01/01: Merge branch 'master' 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 a39b33bd1017dd05fd82eec497a0583c3167deed
Merge: ab3117c af140b2
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Sep 10 21:15:21 2016 +0200

    Merge branch 'master' into systemd-fixuser

 debian/TODO                                        | 12 ++--
 debian/additions/common-functions.dpkg             | 46 ++------------
 debian/bacula-common-mysql.maintscript             |  1 -
 debian/bacula-common-pgsql.maintscript             |  1 -
 debian/bacula-common-sqlite3.maintscript           |  1 -
 debian/bacula-console-qt.autopostrm                |  2 +
 debian/bacula-console-qt.maintscript               |  1 -
 debian/bacula-console.autopostrm                   |  2 +
 debian/bacula-console.maintscript                  |  1 -
 debian/bacula-console.postrm                       | 67 ---------------------
 debian/bacula-director-mysql.maintscript           |  1 -
 debian/bacula-director-pgsql.maintscript           |  1 -
 debian/bacula-director-sqlite3.maintscript         |  1 -
 debian/bacula-director.autopostrm                  |  3 +
 debian/bacula-director.postrm                      | 70 ----------------------
 debian/bacula-fd.autopostrm                        |  3 +
 debian/bacula-fd.maintscript                       |  1 -
 debian/bacula-fd.postrm                            | 70 ----------------------
 debian/bacula-sd.autopostrm                        |  3 +
 debian/bacula-sd.maintscript                       |  1 -
 debian/bacula-sd.postrm                            | 70 ----------------------
 debian/changelog                                   | 13 ++--
 debian/rules                                       |  4 ++
 debian/scripts/autopostrm                          | 59 ++++++++++++++++++
 .../scripts/generate-doc-dir-to-symlink-migration  | 22 ++++++-
 debian/scripts/libpostrm.inc.sh                    | 40 -------------
 .../template.postrm}                               | 19 +++---
 27 files changed, 122 insertions(+), 393 deletions(-)

diff --cc debian/additions/common-functions.dpkg
index e976c7d,976324b..f091e7b
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@@ -142,18 -110,15 +110,15 @@@ install_config() 
    rm -f "$tempfile" "$tempfile.md5sum"
  }
  
- 
- 
  #
  # Function to setup /etc/default/*
- # Usage: call from postins script "setup_etc_default <package> $@"
+ # Usage: call from postinst script "setup_etc_default <package> $@"
  #
- # if there is fresh install, generate default /etc/default/* file
- # if there is upgrade from old version, then set ENABLED=no if /etc/bacula/do_not_run present
- # if there is upgrade from recent version, then preserve ENABLED and CONFIG variables/
+ # on a fresh install, generate default /etc/default/* file
 -# on an upgrade, preserve ENABLED, ARGS and CONFIG variables/
++# on an upgrade, preserve ENABLED and CONFIG variables/
  #
  setup_etc_default() {
 -    local PACKAGE SERVICE ARGS DEFAULT_ARGS ENABLED CONFIG DEFAULTS tempfile
 +    local PACKAGE SERVICE ENABLED CONFIG DEFAULTS tempfile
      PACKAGE="$1"
  
      if [ "$2" != "configure" ]; then
diff --cc debian/changelog
index 3e39443,5abcbeb..bb2278e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,4 +1,19 @@@
- bacula (7.4.3+dfsg-5~fixuser1) UNRELEASED; urgency=medium
++bacula (7.4.3+dfsg-6~fixuser1) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * Remove configuration option to change runtime user for director
 +    and storage daemon. This was broken never really possible without
 +    recompiling the package in the first place.
 +  * Add capability cap_dac_read_search to bacula-fd, making it possible
 +    to run as non-root
 +  * change bacula-fd init-script and systemd unit to be able to run as
 +    non-root (Closes: #699149)
 +  * README.Debian contains documentation on how to enable this feature,
 +    if needed
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
- bacula (7.4.3+dfsg-5) unstable; urgency=medium
+ bacula (7.4.3+dfsg-5) unstable; urgency=low
  
    Continue reorganisation of packages:
  

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