Update the gitbuilder template; we'll extract later back to debian/master.

diff --git a/debian/gbp.conf.template b/debian/gbp.conf.template
index 0ccec1bcbb51afa2bf04fb6a48890fad7da7b46c..b3fd1ddf3aa00612f918fe4b140db39eec6228b8 100644 (file)
--- a/debian/gbp.conf.template
+++ b/debian/gbp.conf.template
@@ -4,20 +4,13 @@
 # edit as needed.
 
 [DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
 #builder = debuild -d -us -uc -i\.git/ -I.git
 builder = pdebuild --debbuildopts '-d -i\.git/ -I.git'
-# the default clean command:
-#cleaner = debuild clean
+
 cleaner = fakeroot debian/rules clean
-# the default branch for upstream sources:
-#upstream-branch = upstream
-#upstream-branch = release/2.1.0/2
-upstream-branch = release/2.1.0
-# the default branch for the debian patch:
-#debian-branch = master
-debian-branch = dmaster-fixups # ideally debian/2.1.0, as a branch
+upstream-branch = release/2.1.1-4.3rc
+debian-branch = debian/2.1.1
+
 # the default tag formats used:
 #upstream-tag = upstream/%(version)s
 #debian-tag = debian/%(version)s