Add more settings to debian/gbp.conf

It doesn't seem wise to depend on gbp's defaults' not changing, so all
the settings that describe the repository layout are now in there.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 141cbda5ff28781c6a49442d093a8b2c135e9673..ec134a248a09038442f6bf2eb18c7afcae08b040 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,12 @@
 [DEFAULT]
-# Use DEP-14 branch names.
-debian-branch=debian/latest
-upstream-branch=upstream/latest
+# Repository-layout settings.  These include ones that are gbp
+# defaults just in case the defaults change.
+pristine-tar = False
+upstream-branch = upstream/latest
+upstream-tag = upstream/%(version)s
+upstream-tree = TAG
+debian-branch = debian/latest
+debian-tag = debian/%(version)s
+
 # Allow work on any branch.
-ignore-branch=True
+ignore-branch = True