[osm2pgsql] 01/07: Merge experimental back into master.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit fb5e4f3874d35b600ffb083d852407d05f4bedef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 15 07:57:50 2015 +0200

    Merge experimental back into master.
---
 debian/control  | 2 +-
 debian/gbp.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2dfefee..ef933fc 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9),
                python-psycopg2
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/osm2pgsql.git -b experimental
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osm2pgsql.git
 Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
 
 Package: osm2pgsql
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6464eea..21d0417 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ 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/osm2pgsql.git