[flexpart] 02/03: * Add gbp.conf file

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/9.02-16
in repository flexpart.

commit 0b12d19a1f38851ac6121f49a7d73a3654ce3122
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jul 28 10:35:53 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 25510c8..e7d9b31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flexpart (9.02-16) UNRELEASED; urgency=medium
+
+  * Standards-Version: 4.0.0'; no changes required
+  * Add gbp.conf file
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 28 Jul 2017 10:34:46 +0100
+
 flexpart (9.02-15) unstable; urgency=medium
 
   * arm64 now requires -fno-pie to build
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..0f92903
--- /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 = debian/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 = False

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flexpart.git