[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.4.1-1-18-g85b71a7

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 7bae2f38134da89a464addfbb94daf901f9b49d7
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 31 17:10:56 2010 +0100

    Merge from experimental into unstable
    
    * Merge from experimental into unstable. We've decided to keep 5.5.x in
      unstable at least for the moment; if it turns out to be problematic, we
      can re-upload with an epoch.

diff --git a/debian/changelog b/debian/changelog
index 9a45f41..7b93ce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
+telepathy-mission-control-5 (5.5.0-3) UNRELEASED; urgency=low
+
+  * Merge from experimental into unstable. We've decided to keep 5.5.x in
+    unstable at least for the moment; if it turns out to be problematic, we
+    can re-upload with an epoch.
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 31 May 2010 16:27:52 +0100
+
 telepathy-mission-control-5 (5.5.0-2) experimental; urgency=low
 
-  * Really upload to experimental... (saved by the NEW queue!)
+  * No changes.
+    (This was a failed attempt to recover from 5.5.0-1 incorrectly being
+    uploaded to unstable, by uploading with the correct distribution
+    before 5.5.0-1 was accepted from the NEW queue. The ftp-masters were
+    too fast...)
 
  -- Simon McVittie <smcv at debian.org>  Thu, 27 May 2010 12:06:46 +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]

-- 
MC 5 packaging