X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4fc6b7570c3e97b65c118b58cdf6729fa94c9b03..ae2a6be8a2155c136f9535abfbcc750c8c395cd2:/debian/gbp.conf

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