Merge tag '0.18.2'

[notmuch] / debian / gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a4794f1ca0797a45dd7a9977541ec392c885382c..6cb451a455e112ea8236161002887113a598b32f 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,13 +2,16 @@
 
 [DEFAULT]
 # The default branch for upstream sources
-upstream-branch = 0.3.x
+upstream-branch = master
 
 # The default branch for the debian patch (no patch in our case)
-debian-branch = 0.3.x
+debian-branch = master
 
 # Directory for performing the build
 export-dir = ./debian-build
 
+# Format for upstream tags
+upstream-tag = %(version)s
+
 # Format for the debian tag
-debian-tag = debian-%(version)s
+debian-tag = debian/%(version)s