[pkg-bacula-commits] [bacula] 01/01: Merge branch 'master' into hardcode-users

[Sven Hartge]

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

hartge-guest pushed a commit to branch hardcode-users
in repository bacula.

commit d7bd3cbbf295cd813e2f65c8246ade9ab0e3f837
Merge: 749f9f5 76829e8
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Sep 19 19:26:57 2016 +0200

    Merge branch 'master' into hardcode-users

 debian/TODO                                 | 14 +++++++++++
 debian/additions/make_catalog_backup.md5sum |  7 ++++++
 debian/bacula-director-mysql.install        |  2 --
 debian/bacula-director-pgsql.install        |  2 --
 debian/bacula-director-sqlite3.install      |  2 --
 debian/bacula-director.autopostrm           |  2 +-
 debian/bacula-director.install              |  4 ++++
 debian/bacula-director.postinst             | 36 ++++++++++++++++++++++++-----
 debian/changelog                            | 11 ++++++++-
 debian/control                              | 13 ++++++-----
 debian/rules                                |  6 -----
 11 files changed, 73 insertions(+), 26 deletions(-)

diff --cc debian/changelog
index 5b56fb5,ac9018a..ce7f710
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- bacula (7.4.3+dfsg-7~hardcode1) UNRELEASED; urgency=medium
++bacula (7.4.3+dfsg-7+hardcode1) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * Remove configuration option to change runtime user for director
 +    and storage daemon. This was never really possible without
 +    recompiling the package in the first place.
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
+ bacula (7.4.3+dfsg-7) unstable; urgency=high
+ 
+   * Handle make_catalog_backup script in postinst of package
+     bacula-director, inserting the correct database user (Closes: #838080)
+   * Move make_catalog_backup.pl to package bacula-director
+ 
+  -- Carsten Leonhardt <leo at debian.org>  Mon, 19 Sep 2016 17:55:43 +0200
++>>>>>>> master
+ 
  bacula (7.4.3+dfsg-6) unstable; urgency=low
  
    [Sven Hartge]

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