X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a4221092e50af0b74040f5b4ee800c78b05fd84e..6d7fc45ed4e22163bba6478c7523f4509d200c58:/debian/gbp.conf?ds=inline

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 135522d40..a5e885896 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,10 @@
 [DEFAULT]
-prebuild = ./prepare-release pre-export
+; we need a preexport here
+;preexport = ./prepare-release pre-export
+prebuild = ./prepare-release pre-build
 postbuild = ./prepare-release post-build
-debian-branch = debian/experimental
+debian-branch = master
 debian-tag = %(version)s
 export-dir = ../build-area
-sign-tags = True
\ No newline at end of file
+sign-tags = True
+multimaint-merge = True