[gdal] 01/04: Update branch 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 gdal.

commit ed8bf678dcb6ec0f9271a3e911a67060aec56aa7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 10 14:07:09 2016 +0200

    Update branch 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 4a2c0f0..f7e1d32 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Build-Conflicts: automake1.11,
                  python-setuptools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git -b experimental-2.1
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git
 Homepage: http://www.gdal.org/
 X-Python3-Version: >= 3.2
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 5124d6a..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-2.1
+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-2.1
+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/gdal.git