diff options
| -rw-r--r-- | debian/gbp.conf | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index 86f71c4..caff513 100644 --- 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 |