gbp.conf: rewrite with comments

We do actually need separate Debian and upstream tags.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 86f71c48689f2fe35f4ac0d81f4d6c09b1609c5a..caff513af6a4c6a3b42a57cc595c6c4ddf4d9f28 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,6 @@
 [DEFAULT]
-upstream-branch = master
-debian-branch = master
-upstream-tag = debian/%(version)s
-debian-tag = debian/%(version)s
 
+# Some standard gbp settings
 sign-tags = True
 pristine-tar = True
 pristine-tar-commit = True
@@ -12,5 +9,18 @@ color = on
 compression = xz
 compression-level = 9
 
+# Debian package maintainer is upstream project maintainer, so
+# everything lives on the master branch (from ver. 1.0.0-1 onwards)
+upstream-branch = master
+debian-branch = master
+# However, separate tags (e.g. one commit tagged both 1.0.0 and
+# debian/1.0.0-1) because git-remote-gcrypt is meant to be usable
+# outside of Debian
+upstream-tag = %(version)s
+debian-tag = debian/%(version)s
+
+# We need this filter so that gbp generates a suitable tarball so that
+# the end result is a proper 3.0 (quilt) source package
+[import-orig]
 filter = [ '.git', '.gitignore', 'debian' ]
 filter-pristine-tar = True