[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 749f9f56f6f2c4f7bd4a243d73ac018104221d04
Merge: afc5af4 9c9f442
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sun Sep 11 22:08:58 2016 +0200

    Merge branch 'master' into hardcode-users

 debian/TODO                                      |  3 +++
 debian/bacula-director-mysql.lintian-overrides   |  2 ++
 debian/bacula-director-pgsql.lintian-overrides   |  2 ++
 debian/bacula-director-sqlite3.lintian-overrides |  2 ++
 debian/bacula-server.lintian-overrides           |  2 ++
 debian/changelog                                 | 15 ++++++++++++++-
 debian/control                                   |  2 +-
 debian/scripts/template.postrm                   |  2 +-
 debian/source.lintian-overrides                  |  2 ++
 9 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index c25e103,87f3734..5b56fb5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,25 @@@
- bacula (7.4.3+dfsg-6~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-6) unstable; urgency=low
+ 
+   [Sven Hartge]
+   * Fix boot dependencies of bacula-dir.service to be on par with
+     the SysV init-script.
+ 
+   [Carsten Leonhardt]
+   * Fix check for ucf in postrm template (Closes: #837333)
+   * Add various lintian overrides
+   * Correct VCS-Browser field in debian/control
+ 
+  -- Carsten Leonhardt <leo at debian.org>  Sun, 11 Sep 2016 21:53:53 +0200
+ 
  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