debian/gbp.conf: point debian-branch to master

[apt.git] / debian / gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index db22e3e1ee26e35f3a94e262a49f3fbb61d45a0c..8da0358df59fe7353132e7e333512394b120c554 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,9 @@
 [DEFAULT]
-prebuild = ./prepare-release pre-export
+; we need preexport here
+;prebuild = ./prepare-release pre-export
 postbuild = ./prepare-release post-build
-export-dir = ../build-area
-debian-branch = debian/sid
+debian-branch = master
 debian-tag = %(version)s
+export-dir = ../build-area
+sign-tags = True
+multimaint-merge = True