Switch to the DEP-14 branch layout

* Switch to the DEP-14 branch layout and update debian/gbp.conf and
  Vcs-Git accordingly.

3 files changed, 12 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index d010b19..f33702f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+remctl (3.10-2) UNRELEASED; urgency=medium
+
+  * Switch to the DEP-14 branch layout and update debian/gbp.conf and
+    Vcs-Git accordingly.
+
+ -- Russ Allbery <rra@debian.org>  Sat, 07 May 2016 14:39:15 -0700
+
 remctl (3.10-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 816abc9..3286bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ XS-Python-Version: >= 2.6
 XS-Ruby-Versions: all
 Standards-Version: 3.9.6
 Homepage: http://www.eyrie.org/~eagle/software/remctl/
-Vcs-Git: git://git.eyrie.org/kerberos/remctl.git -b debian
+Vcs-Git: git://git.eyrie.org/kerberos/remctl.git -b debian/master
 Vcs-Browser: http://git.eyrie.org/?p=kerberos/remctl.git
 
 Package: libremctl1
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b60e797..6a98191 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,8 @@
 # The Git repository referenced by the Vcs-Git field of debian/control
 # combines upstream development (in master) with the Debian packaging (in the
-# debian branch).  Tell git-buildpackage about this layout.
+# debian/* branches).  Tell git-buildpackage about this layout.
 
 [DEFAULT]
-debian-branch = debian
+debian-branch = debian/master
+upstream-branch = upstream/latest
+