[libosmium] 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 master
in repository libosmium.

commit 16bdbaa2c836cd9eb0263dc52b652d252274fb58
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 18 12:07:59 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 673531d..b78122b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libosmium (2.12.2-1~exp2) UNRELEASED; urgency=medium
 
   * Don't limit watch file results to 2.11.x releases.
+  * Update branch in gbp.conf & Vcs-Git URL.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Jun 2017 12:02:47 +0200
 
diff --git a/debian/control b/debian/control
index 6319c5b..bc4bb52 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9),
                zlib1g-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/libosmium.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git -b experimental
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git
 Homepage: http://osmcode.org/libosmium/
 
 Package: libosmium2-dev
diff --git a/debian/gbp.conf b/debian/gbp.conf
index c681534..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.11
+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/libosmium.git