[pkg-bacula-commits] [bacula] 01/02: Merge branch 'master' into master-systemd

[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 3a11b5b6eba94566949cf5c40d7efc03f3a7f992
Merge: ec7193c 3620d6a
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Jul 18 15:40:19 2016 +0200

    Merge branch 'master' into master-systemd

 debian/changelog                            | 6 +++---
 debian/patches/fix-mysql55-sql-syntax.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 3d46c12,d16fdec..59b18a1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,4 +1,16 @@@
 +bacula (7.4.3+dfsg-2) UNRELEASED; 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.
 +  * readd lost tmpfiles.d/bacula.conf to create /var/run/bacula
 +
-  -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 13:07:12 +0200
++ -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
- bacula (7.4.3+dfsg-1) unstable; urgency=low
+ bacula (7.4.3+dfsg-1) unstable; urgency=medium
  
    * New upstream release
    * Fix MySQL database creation via dbconfig-common (Closes: #830999)

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