[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 7796738e5bd2a496044d1175a6f392e29007a328
Merge: 81704a0 8b64473
Author: Sven Hartge <sven at svenhartge.de>
Date:   Fri Jul 15 17:45:35 2016 +0200

    Merge branch 'master' into master-systemd

 .../remove-use-statement-in-make-mysql-tables      |  22 ---
 debian/patches/series                              |   1 -
 debian/rules                                       |  10 +-
 debian/scripts/extract-dbupgrade.awk               |  50 +++++-
 debian/scripts/install-dbconfig                    | 180 ++++++++++++---------
 debian/scripts/install-dbconfig-upgrade            |  45 ------
 6 files changed, 150 insertions(+), 158 deletions(-)

diff --cc debian/patches/series
index 9d57234,fda1104..a58866a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -7,5 -7,3 +7,4 @@@ remove-upstream-autoconf-log.patc
  fix-libbaccats-rpath.patch
  fix-scriptdir-examples-devices.patch
  enable-hardening-for-bat.patch
 +non-forking-systemd-units.patch
- remove-use-statement-in-make-mysql-tables

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