[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, squeeze-backports, updated. debian/5.2.6+dfsg-2-4-g0d6eae0

[Bart Swedrowski]

The following commit has been merged in the squeeze-backports branch:
commit d9ae57bf44085363f5c98f1558e74dbef6c228d2
Merge: 0392efdcc51b780e07b5fe197d588aea2614c0ec 9c214d49afa4fe03e1f2dfcd03e30d0ea2f5c747
Author: Bart Swedrowski <bart at timedout.org>
Date:   Fri Jun 29 16:15:03 2012 +0100

    merge changes between 5.2.6+dfsg-1 and 5.2.6+dfsg-2

diff --combined debian/changelog
index a7e9149,5f4433e..828df29
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,30 +1,37 @@@
+ bacula (5.2.6+dfsg-2) unstable; urgency=low
+ 
+   * debian/bacula-*.init:
+     + check if the daemon is executable.
+     + add $NAME to log_daemon_msg calls.
+   * debian/bacula-console.postinst,
+     debian/bacula-traymonitor.postinst:
+     - remove useless CONSOLE variable.
+   * debian/bacula-console*.postinst,
+     debian/bacula-traymonitor.postinst:
+     + also replace *PASSWORD in config files, thanks to Richard
+       Hartmann <richih.mailinglist at gmail.com> (Closes: #675227).
+   * debian/bacula-director-*.postinst:
+     + replace XXX_DBNAME_XXX, thanks to Guillaume Delacour
+       <gui at iroqwa.org> (Closes: #656912).
+   * debian/bacula-director-*.postinst,
+     debian/bacula-fd.postinst, debian/bacula-sd.postinst:
+     + move set call at the top.
+   * debian/bacula-sd.init:
+     + remove trailing space in stop case.
+   * debian/gbp.conf:
+     + explicitly set upstream and debian branches.
+   * debian/patches/fix-sql-bindir:
+     + convert to DEP-3.
+ 
+  -- Luca Capello <luca at pca.it>  Fri, 29 Jun 2012 05:59:45 +0200
+ 
 +bacula (5.2.6+dfsg-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Change Build-Depends debhelper (>= 8.0.0), libpq-dev (>= 8.4)
 +
 + -- Bart Swedrowski <bart at timedout.org>  Fri, 22 Jun 2012 16:12:23 +0100
 +
  bacula (5.2.6+dfsg-1) unstable; urgency=high
  
    [ Alexander Golovko ]
diff --combined debian/gbp.conf
index cec628c,45052a1..a18b60f
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,4 +1,4 @@@
  [DEFAULT]
+ upstream-branch = upstream
 -debian-branch = master
++debian-branch = squeeze-backports
  pristine-tar = True

-- 
Bacula, a network backup, recovery and verification program