use std::locale::global instead of setlocale

[apt.git] / debian / gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 135522d4036a29f432d6b3eab5bf3e39e5e3f6da..a5e885896331340a7266f9681b8d4d7349cc1e34 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,10 @@
 [DEFAULT]
 [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
 postbuild = ./prepare-release post-build

-debian-branch = debian/experimental
+debian-branch = master

 debian-tag = %(version)s
 export-dir = ../build-area
 debian-tag = %(version)s
 export-dir = ../build-area

-sign-tags = True
\ No newline at end of file
+sign-tags = True
+multimaint-merge = True