summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2015-08-18 21:38:57 -0700
committerRuss Allbery <eagle@eyrie.org>2015-08-18 21:38:57 -0700
commit3088644d2ae31302ffb0f73df01466cc7e9a3d9e (patch)
tree230fdd41a8e42631a867d996e38673fc96cc9bd6
parentce026def10ed5f1e4f2f29ec63533d97262afe90 (diff)
Add debian/gbp.conf file
* Add debian/gbp.conf reflecting the branch layout of the default packaging repository.
-rw-r--r--debian/changelog2
-rw-r--r--debian/gbp.conf6
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 41e42d6..869e485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ krb5-sync (3.1-1) UNRELEASED; urgency=medium
* Add the upstream release signing key and verify it in debian/watch.
* Prefer *.tar.xz in debian/watch to match packaging.
* Fix Upstream-Contact email address in debian/copyright.
+ * Add debian/gbp.conf reflecting the branch layout of the default
+ packaging repository.
-- Russ Allbery <rra@debian.org> Sun, 13 Apr 2014 12:30:34 -0700
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..b60e797
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+# 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.
+
+[DEFAULT]
+debian-branch = debian