[mapserver] 04/05: Update branch in gbp.conf & Vcs-Git URL.

[Bas Couwenberg]

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

sebastic pushed a commit to branch ubuntu/precise
in repository mapserver.

commit 2d1731d125086df1aa0987090f4fcc2ef2c72b35
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 6 00:48:59 2016 +0100

    Update branch in gbp.conf & Vcs-Git URL.
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/gbp.conf  | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 361f9d5..3586ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (6.4.2-1~precise2) UNRELEASED; urgency=high
 
   * Add upstream patch to fix CVE-2016-9839.
+  * Update branch in gbp.conf & Vcs-Git URL.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Dec 2016 22:03:30 +0100
 
diff --git a/debian/control b/debian/control
index 60c2ccf..4609c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ XS-Ruby-Versions: ruby1.9.1
 X-Python-Version: 2.7
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git -b ubuntu/precise
 Homepage: http://www.mapserver.org
 
 Package: libmapserver1
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..71911ca
--- /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 = ubuntu/precise
+
+# 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/mapserver.git