X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2054e4db2f40c44b90cd1a4d0751138abadc23e1..99ba7cc1901c761c97d67775f23858b86594f2ba:/debian/gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index ec6d9894e..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/sid
+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