From: Axel Beckert <abe@deuxchevaux.org>
Date: Fri, 13 Feb 2015 23:12:58 +0000 (+0100)
Subject: Add debian/gbp.conf declaring non-default git branch names
X-Git-Tag: debian/2.1.2-2~12
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=48b90dea252422bea3651f9ec74990f92f2b04b9;p=pkg%2Fblosxom.git

Add debian/gbp.conf declaring non-default git branch names
---

diff --git a/debian/changelog b/debian/changelog
index bcbab5b..c1f15fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ blosxom (2.1.2-2) UNRELEASED; urgency=medium
   * Update my e-mail address.
   * Use "set -e" instead of "-e" option to sh in maintainer scripts.
   * Update Vcs-* header to point to git.deb.at instead of repo.or.cz.
+  * Add debian/gbp.conf declaring non-default git branch names.
 
  -- Axel Beckert <abe@debian.org>  Sat, 07 Feb 2015 13:54:51 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..11f885a
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian