[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.12.1-1-4-gc8f62fe

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit cdac71e2497261773e0bdcf24d3dcd594c9fc8e6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jul 24 10:32:57 2012 +0200

    debian/gbp.conf: Set unstable branch names again.

diff --git a/debian/changelog b/debian/changelog
index ea61942..2adb99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-mission-control-5 (1:5.12.1-2) UNRELEASED; urgency=low
+
+  * debian/gbp.conf: Set unstable branch names again.
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 24 Jul 2012 10:32:40 +0200
+
 telepathy-mission-control-5 (1:5.12.1-1) experimental; urgency=low
 
   * New upstream release.
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]

-- 
MC 5 packaging