[pkg-bacula-commits] [bacula] 01/01: Merge branch 'master' into migrate-files

[Carsten Leonhardt]

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

leo pushed a commit to branch migrate-files
in repository bacula.

commit c31476693153b3693541539d27d9dffa018d8a83
Merge: c7b0684 9c02680
Author: Carsten Leonhardt <leo at debian.org>
Date:   Thu Aug 18 11:36:46 2016 +0200

    Merge branch 'master' into migrate-files
    
    Resolved conflict in debian/changelog

 debian/bacula-director.init | 2 +-
 debian/bacula-fd.init       | 2 +-
 debian/bacula-sd.init       | 2 +-
 debian/changelog            | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 96e892e,8dc8846..4cac8c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,9 +1,45 @@@
 -bacula (7.4.3+dfsg-1+sid1) unstable; urgency=medium
 +bacula (7.4.3+dfsg-4) experimental; urgency=medium
  
 +  * bacula-director-DBTYPE: let dbconfig create a sourceable shell script
 +    with database information
+   * Fix init scripts to make sure the daemons can be stopped before
+     upgrades or when /etc/defaults/bacula-* were edited
++    (merged from 7.4.3+dfsg-1+sid1)
  
 - -- Carsten Leonhardt <leo at debian.org>  Wed, 03 Aug 2016 20:13:59 +0200
 + --
 +
 +bacula (7.4.3+dfsg-3) experimental; urgency=medium
 +
 +  Reorganisation of packages, providing the necessary Breaks/Conflicts for
 +  the transitions. Thanks to Sven Hartge for his help.
 +
 +  * Remove link /usr/bin/bconsole, finishing bconsole's transition to
 +    /usr/sbin/ started in 5.0.3+dfsgreal-1
 +  * Move all common files from bacula-diretor-DBTYPE to
 +    bacula-director-common
 +  * Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd
 +  * Move bscan into it's own package, making bacula-sd-DBTYPE obsolete
 +  * Move libbacsql from bacula-common-DBTYPE to bacula-common
 +  * Rename bacula-director-common to bacula-director
 +  * Move init-scripts and systemd services files into bacula-director
 +    (Closes: #832357)
 +  * Added note to debian/NEWS
 +
 + -- Carsten Leonhardt <leo at debian.org>  Mon, 01 Aug 2016 02:41:20 +0200
 +
 +bacula (7.4.3+dfsg-2) experimental; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * Enable systemd integration
 +  * Change bacula-{sd,fd,director}.services to non-forking simple mode
 +  * Move init-scripts and systemd services files from
 +    bacula-director-common to bacula-director-DBTYPE, simplyfying their
 +    handling for the packaging tools.
 +  * bring back lost tmpfiles.d/bacula.conf to create /var/run/bacula
 +  * remove old leftover config /etc/tmpfiles.d/bacula.conf if identical
 +    to new config-file in /usr/lib/tmpfiles.d
 +
 + -- Carsten Leonhardt <leo at debian.org>  Tue, 19 Jul 2016 23:18:28 +0200
  
  bacula (7.4.3+dfsg-1) unstable; urgency=medium
  

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