[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-1-5-ga9827a3

[Luca Capello]

The following commit has been merged in the master branch:
commit a9827a3cbd2e7e0985228ac204ab58a45c45847d
Author: Luca Capello <luca at pca.it>
Date:   Sun Jun 24 16:30:22 2012 +0200

    debian/gbp.conf: explicitely set upstream and debian branches

diff --git a/debian/changelog b/debian/changelog
index a4f9457..82570d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ bacula (5.2.6+dfsg-2) UNRELEASED; urgency=low
     + move set call at the top.
   * debian/bacula-sd.init:
     + remove trailing space in stop case.
+  * debian/gbp.conf:
+    + explicitely set upstream and debian branches.
 
  --
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..45052a1 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,4 @@
 [DEFAULT]
+upstream-branch = upstream
+debian-branch = master
 pristine-tar = True

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