From a8402cd1b3766e25a97618abffbc5ac33e51dd28 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Mon, 10 Dec 2018 09:52:48 -0500 Subject: [PATCH] Update debian/gbp.conf --- debian/gbp.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 7eebcaf2fd..4ed071a96f 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,13 +2,16 @@ pristine-tar = True debian-branch = debian/master upstream-branch = upstream/latest -upstream-vcs-tag = %(version)s [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 = %(version)s [pq] patch-numbers = False