aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/gbp.conf4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b33f3b..cd27e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lacme (0.7-2) UNRELEASED; urgency=medium
* d/control: Bump Standards-Version to 4.5.1 (no changes necessary).
* 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 <guilhem@debian.org> Wed, 09 Dec 2020 20:11:40 +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