From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Fri, 5 Oct 2018 18:01:09 +0000 (-0400)
Subject: Update debian/gbp.conf
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~104
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bd624d14def967b88b965281133736a25ac6c91a;p=babl.git

Update debian/gbp.conf
---

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c17ca62..a68ffd5 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,15 +2,16 @@
 pristine-tar = True
 debian-branch = debian/master
 upstream-branch = upstream/latest
-# Use gbp import-orig --uscan --upstream-vcs-tag=BABL_0_1_56
-# for instance when upgrading to 0.1.56. See https://bugs.debian.org/908316
-upstream-vcs-tag = invalid
 
 [buildpackage]
 sign-tags = True
 
+[dch]
+multimaint-merge = True
+
 [import-orig]
 postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+upstream-vcs-tag = BABL_%(version%.%_)s
 
 [pq]
 patch-numbers = False