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

diff --git a/debian/changelog b/debian/changelog
index bcbab5bd00e35f103738d1207a1218f866a0a15a..c1f15fc20ecebc52c4232c8c86789007bcb66992 100644 (file)
--- 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 (file)
index 0000000..11f885a
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian