gbp.conf: set debian-branch = upstream-branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index fe6e2dd9990ba3da2b5c5ce9bc1ab0b6d807f716..d9410e7385c41cc4d8e880577c5448e693fbdaff 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
-upstream-branch = upstream
+upstream-branch = master
 debian-branch = master
-upstream-tag = %(version)s
+upstream-tag = debian/%(version)s
 debian-tag = debian/%(version)s
 
 #postbuild = lintian $GBP_CHANGES_FILE