aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@debian.org>2020-12-11 11:40:13 +0100
committerGuilhem Moulin <guilhem@debian.org>2020-12-11 11:46:28 +0100
commitbcb88ae0cdfa3548e3c650fd489fc49779e7235a (patch)
tree346b93b4d0ff7d605c800fe2665e41d2cd3801eb
parente2d8405ec220a8c0417fada1404bd749fa71f8f8 (diff)
d/gbp.conf: Update debian and upstream branches in compliance with DEP-14.
-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 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 <guilhem@debian.org> 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