[pyresample] 02/15: gbp.conf file added

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository pyresample.

commit 82d82f8d5ccf5667a254946409c53358e01dfdea
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Feb 21 08:15:38 2016 +0000

    gbp.conf file added
---
 debian/changelog |  7 +++++++
 debian/gbp.conf  | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f97b35..e80b0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyresample (1.1.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * debian/gbp.conf file added
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 21 Feb 2016 08:00:43 +0000
+
 pyresample (1.1.3-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..21d0417
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,16 @@
+[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

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