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

[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 19703ffcdd1bfe9e3a3a2d6961e30192cd741e8e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 24 15:05:13 2015 +0200

    Update branches in gbp.conf & Vcs-Git URL.
---
 debian/control  | 2 +-
 debian/gbp.conf | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index def8cb3..339fcf9 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 9),
 Build-Conflicts: libcurl3-openssl-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mapserver.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git -b experimental
+Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
 Homepage: http://www.mapserver.org
 XS-Ruby-Versions: all
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bd8f99d..21d0417 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,11 +2,11 @@
 
 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream-6.4
+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 = experimental
+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

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