[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.12.0-1-1-g5cdafa2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 5cdafa23fee408c2b3b0b2e472928462908c6f68
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 9 11:33:50 2012 +0100

    Merge from experimental into unstable
    
    * Merge from experimental into unstable
    * Add NEWS.Debian for the butterfly -> haze migration
    * Suggest telepathy-haze

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..cf32bb1
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,12 @@
+telepathy-mission-control-5 (1:5.12.0-2) unstable; urgency=low
+
+  This version of Mission Control will automatically migrate Windows
+  Live Messenger accounts (also known as .NET Messenger, MSN Messenger etc.)
+  from telepathy-butterfly to telepathy-haze when it starts up. To trigger
+  this migration, ensure that telepathy-haze is installed, log out
+  from your desktop session, and log back in.
+
+  This has been done to support newer Telepathy interfaces required
+  by Empathy 3.4, which are not present in telepathy-butterfly.
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 09 May 2012 11:23:41 +0100
diff --git a/debian/changelog b/debian/changelog
index 17434cd..4e5c7d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-mission-control-5 (1:5.12.0-2) unstable; urgency=low
+
+  * Merge from experimental into unstable
+  * Add NEWS.Debian for the butterfly -> haze migration
+  * Suggest telepathy-haze
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 09 May 2012 11:22:43 +0100
+
 telepathy-mission-control-5 (1:5.12.0-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 3555cfc..d7c451d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libmission-control-plugins0 (= ${binary:Version})
+Suggests: telepathy-haze
 Conflicts: telepathy-mission-control
 Description: management daemon for Telepathy real-time communication framework
  Telepathy Mission Control 5 is an account manager and channel dispatcher for
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