From bcb88ae0cdfa3548e3c650fd489fc49779e7235a Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Fri, 11 Dec 2020 11:40:13 +0100 Subject: d/gbp.conf: Update debian and upstream branches in compliance with DEP-14. --- debian/changelog | 1 + debian/gbp.conf | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d261ddd..d49c16a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ interimap (0.5.3-2) UNRELEASED; urgency=medium tags. * Add d/watch pointing to the upstream repository. * d/gbp.conf: Update upstream tag template. + * d/gbp.conf: Update debian and upstream branches in compliance with DEP-14. -- Guilhem Moulin Wed, 09 Dec 2020 16:13:26 +0100 diff --git a/debian/gbp.conf b/debian/gbp.conf index 5dd08f9..692618f 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] -upstream-branch = master -debian-branch = debian +upstream-branch = upstream +debian-branch = debian/latest upstream-tag = v%(version)s debian-tag = debian/%(version)s pristine-tar = False -- cgit v1.2.3