[SCM] sfarklib/master: Improve gbp.conf so that tags are always signed & branch layout described

[ross-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2aac5f31f039b5de6ed0e5f435ce7c8a114a531c
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun Sep 13 13:39:48 2015 +0200

    Improve gbp.conf so that tags are always signed & branch layout described

diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..b311380 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,18 @@
 [DEFAULT]
+# Applies to all commands.
+sign-tags = True
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig.
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
 pristine-tar = True

-- 
sfarklib packaging