[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.18.0-1-12-gb1242e0

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 54204448bcd62273d975412daacca08fd0b03752
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 20 17:12:59 2012 +0100

    Merge versions from experimental into unstable
    
    New upstream stable branch 0.18, released to correspond to GNOME 3.4

diff --git a/debian/changelog b/debian/changelog
index 5ec944c..3072fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 telepathy-glib (0.18.0-2) UNRELEASED; urgency=low
 
   [ Simon McVittie ]
+  * Merge versions from experimental into unstable
+    - new upstream stable branch 0.18, released to correspond to GNOME 3.4
   * Run dh_install with --list-missing to list anything we forgot
   * Use the debhelper "gir" sequence from gobject-introspection
   * Allow parallel builds
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-glib packaging