[mapserver] 01/08: Use upstream-6.4 branch in gbp.conf.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapserver.

commit e26bab3e2ed329f57006f5bd9235c852aa299e58
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 7 19:23:59 2015 +0200

    Use upstream-6.4 branch in gbp.conf.
---
 debian/changelog | 1 +
 debian/gbp.conf  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f27e54e..613b627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (6.4.1-7) UNRELEASED; urgency=medium
 
   * Update watch file to use GitHub releases instead of download.osgeo.org.
+  * Use upstream-6.4 branch in gbp.conf.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 19 Jun 2015 23:46:05 +0200
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 21d0417..d2e24ea 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,7 @@
 
 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream
+upstream-branch = upstream-6.4
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").

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