[osmium] 03/16: Update gbp.conf to use pristine-tar by default.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmium.

commit ed8054147847b3881438f5a050f74d48a3b33536
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 8 18:08:38 2014 +0200

    Update gbp.conf to use pristine-tar by default.
---
 debian/changelog |  1 +
 debian/gbp.conf  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc1217d..4fd4b6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ osmium (0.0~20111213-g7f3500a-4) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * Add myself to Uploaders.
+  * Update gbp.conf to use pristine-tar by default.
 
  -- Andreas Tille <tille at debian.org>  Tue, 17 Dec 2013 17:27:00 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4847f4c..8335022 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,19 @@
+[DEFAULT]
+
+# 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
+
 [git-import-orig]
 filter = [ 'debian' ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium.git