[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.16.0-1-4-gbb8095b

[Simon McVittie]

The following commit has been merged in the debian branch:
commit bb8095bbc33ce7b109562a943a320348dac4d2e8
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 27 12:30:58 2012 +0100

    Merge from experimental to unstable
    
      - switch branch names in gbp.conf

diff --git a/debian/changelog b/debian/changelog
index 75afa5d..48380c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 telepathy-gabble (0.16.0-2) UNRELEASED; urgency=low
 
+  * Merge from experimental to unstable
+    - switch branch names in gbp.conf
   * Use default.mk to get the dpkg-recommended build flags
 
  -- Simon McVittie <smcv at debian.org>  Fri, 13 Apr 2012 15:44:20 +0100
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 26870fe..6837223 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = debian-experimental
-upstream-branch = upstream-experimental
+debian-branch = debian
+upstream-branch = upstream
 pristine-tar = True
 
 [git-buildpackage]

-- 
telepathy-gabble packaging