[yquake2] 01/01: debian/gbp.conf: use DEP-14 branch names

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository yquake2.

commit ec99bd42a8113a4e98d4b0c21c86534f0448793d
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 1 08:53:14 2016 +0100

    debian/gbp.conf: use DEP-14 branch names
---
 debian/changelog | 1 +
 debian/gbp.conf  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21587ce..cef87d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ yquake2 (5.34~dfsg1-1) UNRELEASED; urgency=medium
     - install new README.md instead of old README
   * Enable full compiler hardening
   * Rewrite __DATE__ patch to use SOURCE_DATE_EPOCH directly
+  * debian/gbp.conf: use DEP-14 branch names
 
  -- Simon McVittie <smcv at debian.org>  Fri, 22 Jan 2016 11:11:19 +0000
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index fbc109d..cbdad25 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
+debian-branch = debian/master
+upstream-branch = upstream/latest
 pristine-tar = True
 patch-numbers = False
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git