[pkg-bacula-commits] [bacula] 01/01: 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 master-systemd
in repository bacula.

commit aecff74929bf5ccb663e654355cdc85ec09d5d02
Merge: e4d81c8 f111f13
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Jul 18 13:07:55 2016 +0200

    Merge branch 'master' into master-systemd

 ChangeLog                          | 23 ++++++++++++++++++++++-
 LICENSE                            | 25 +++++++++++++------------
 LICENSE-FOSS                       | 27 +++++++++++++--------------
 ReleaseNotes                       | 36 +++++++++++++++++++++++++++++++++++-
 debian/changelog                   |  9 +++++----
 debian/gbp.conf                    | 10 +++++++++-
 src/cats/grant_mysql_privileges.in | 10 +++++++++-
 src/cats/make_mysql_tables.in      | 16 +++++++++++++---
 src/dird/dird_conf.c               | 31 +++++++++++++++++++++++--------
 src/dird/fd_cmds.c                 |  5 ++++-
 src/dird/ua_cmds.c                 |  6 ++++--
 src/dird/ua_dotcmds.c              |  2 +-
 src/dird/ua_purge.c                |  2 ++
 src/dird/ua_status.c               |  2 +-
 src/filed/status.c                 |  2 +-
 src/lib/alist.h                    |  5 ++---
 src/lib/breg.c                     |  6 ++++--
 src/lib/bsock.c                    |  3 ---
 src/lib/edit.c                     | 19 +++++++++++--------
 src/lib/parse_conf.c               | 24 ++++++++++++++++++++++--
 src/lib/smartall.h                 |  6 ++----
 src/stored/autochanger.c           |  4 ++--
 src/stored/status.c                |  2 +-
 src/tools/bsmtp.c                  |  2 +-
 src/version.h                      |  6 +++---
 25 files changed, 203 insertions(+), 80 deletions(-)

diff --cc debian/changelog
index 4e5d6e2,dad16b3..3d46c12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,10 +1,22 @@@
- bacula (7.4.2+dfsg-3) UNRELEASED; urgency=medium
++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, 14 Jul 2016 11:36:12 +0200
++ -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 13:07:12 +0200
 +
- bacula (7.4.2+dfsg-2) unstable; urgency=medium
+ bacula (7.4.3+dfsg-1) unstable; urgency=low
  
+   * New upstream release
    * Fix MySQL database creation via dbconfig-common (Closes: #830999)
    * Really fix PostgreSQL upgrades
  
-  -- Carsten Leonhardt <leo at debian.org>  Mon, 14 Jul 2016 01:16:50 +0200
 - --
++ -- Carsten Leonhardt <leo at debian.org>  Mon, 18 Jul 2016 12:21:19 +0200
  
  bacula (7.4.2+dfsg-1) unstable; urgency=low
  

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