Merge tag 'debian/0.17-3'

[notmuch] / debian / gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4c8ce7ff85af8460fdeec42af2433554c25f11d5..6cb451a455e112ea8236161002887113a598b32f 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,6 @@
 # Configuration file for git-buildpackage
 
 [DEFAULT]
-cleaner = debian/rules prebuild && debuild clean
-
 # The default branch for upstream sources
 upstream-branch = master
 
@@ -12,5 +10,8 @@ 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