Switch to the DEP-14 branch layout

3 files changed, 14 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 8689ba3..1c1cbb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+krb5-sync (3.1-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>  Sun, 26 Aug 2018 17:52:39 -0700
+
 krb5-sync (3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4067781..087bce4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, libipc-run-perl,
 Standards-Version: 3.9.6
 Homepage: http://www.eyrie.org/~eagle/software/krb5-sync/
 Vcs-Browser: http://git.eyrie.org/?p=kerberos/krb5-sync.git
-Vcs-Git: git://git.eyrie.org/kerberos/krb5-sync.git -b debian
+Vcs-Git: git://git.eyrie.org/kerberos/krb5-sync.git -b debian/master
 
 Package: krb5-sync-plugin
 Architecture: any
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b60e797..6c0b02b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,10 @@
 # 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
+
+[import-orig]
+upstream-vcs-tag = release/%(version)s