summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2018-07-31 22:22:07 -0400
committerJames McCoy <jamessan@debian.org>2018-07-31 22:22:07 -0400
commit4817d6a0565467903df2603c9aa0c8390134baa7 (patch)
tree6d7cb4c0b4bf64e3ff439aac458d50fbdf3a3f4c /debian
parentb5eb748179617f8dfc326f1096869b8bde52afd7 (diff)
Prepare gbp conf per dgit-maint-debrebase(7)
Gbp-Dch: Ignore Signed-off-by: James McCoy <jamessan@debian.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/gbp.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d23df4c..c753e09 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,11 @@
[DEFAULT]
+upstream-branch = upstream
debian-branch = debian/sid
+upstream-tag = %(version)s
+
+sign-tags = True
+pristine-tar = False
+pristine-tar-commit = False
+
+[import-orig]
+merge-mode = merge