Switch to the DEP-14 branch layout

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

diff --git a/debian/changelog b/debian/changelog
index 4335f590f1a42899283f58af06eae9c866f55e1e..e107df96199cd67659da0356b8d962ce7bcaedde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 krb5-strength (3.0-2) UNRELEASED; urgency=medium
 
+  * Switch to the DEP-14 branch layout and update debian/gbp.conf and
+    Vcs-Git accordingly.
   * Prefer *.tar.xz in debian/watch to match packaging.
   * Fix Upstream-Contact email address in debian/copyright.
 

diff --git a/debian/control b/debian/control
index 1d43e1f4fd31f231dd4759f988e571f67fa10861..e77def81f40249e95f32926c12f9ba2aea075436 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), cracklib-runtime, dh-autoreconf,
  libtest-strict-perl, perl, pkg-config, tinycdb
 Standards-Version: 3.9.5
 Homepage: http://www.eyrie.org/~eagle/software/krb5-strength/
-Vcs-Git: git://git.eyrie.org/kerberos/krb5-strength.git -b debian
+Vcs-Git: https://git.eyrie.org/git/kerberos/krb5-strength.git -b debian/master
 Vcs-Browser: http://git.eyrie.org/?p=kerberos/krb5-strength.git
 
 Package: krb5-strength

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..6a98191
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +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/* branches).  Tell git-buildpackage about this layout.
+
+[DEFAULT]
+debian-branch = debian/master
+upstream-branch = upstream/latest
+