[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 9e4be393e1d9d5614fbdecced20cac25af655d48
Merge: c6d29f7b5be18eb3e4e6316cd69c03d49eea846c d43a6f513d4df19d64e864a2ae6c61e4be593662
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 26 18:55:41 2010 +0100

    Merge commit 'upstream/5.5.0.rc2' into debian-experimental

diff --combined debian/changelog
index a4a01bb,0000000..355ca20
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,112 -1,0 +1,112 @@@
- telepathy-mission-control-5 (5.5.0~rc1-1) UNRELEASED; urgency=low
++telepathy-mission-control-5 (5.5.0~rc2-1) UNRELEASED; urgency=low
 +
 +  * Start an experimental branch
 +
 + -- Simon McVittie <smcv at debian.org>  Tue, 25 May 2010 19:46:46 +0100
 +
 +telepathy-mission-control-5 (5.4.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Simon McVittie <smcv at debian.org>  Tue, 25 May 2010 19:23:20 +0100
 +
 +telepathy-mission-control-5 (5.4.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Remove patch from previous release, no longer needed
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 15 Apr 2010 20:33:37 +0100
 +
 +telepathy-mission-control-5 (5.3.2-3) unstable; urgency=low
 +
 +  * debian/update-patches.mk: updated
 +  * debian/patches/0001-Only-time-out-channel-requests-after-many-hours.patch
 +    + Added. A channel request done by mission-control should in never timeout,
 +      update the timeout from dbus' standard 25 seconds to 5 hours (from
 +      upstream git)
 +
 + -- Sjoerd Simons <sjoerd at debian.org>  Thu, 08 Apr 2010 15:00:33 +0100
 +
 +telepathy-mission-control-5 (5.3.2-2) unstable; urgency=low
 +
 +  * Also ship the AccountManager service file
 +
 + -- Sjoerd Simons <sjoerd at debian.org>  Fri, 06 Nov 2009 19:29:50 +0000
 +
 +telepathy-mission-control-5 (5.3.2-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Simon McVittie <smcv at debian.org>  Mon, 02 Nov 2009 19:15:52 +0000
 +
 +telepathy-mission-control-5 (5.3.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Target unstable (where the previous release also ended up, by mistake...)
 +
 + -- Simon McVittie <smcv at debian.org>  Fri, 18 Sep 2009 17:46:49 +0100
 +
 +telepathy-mission-control-5 (5.3.0-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * Enable gnome-keyring
 +  * Upload to experimental, initially
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 10 Sep 2009 13:39:59 +0100
 +
 +telepathy-mission-control-5 (5.2.2-1) unstable; urgency=high
 +
 +  * New upstream version
 +  * urgency=high to fix incorrect permissions on ~/.mission-control/accounts
 +
 + -- Simon McVittie <smcv at debian.org>  Mon, 07 Sep 2009 18:24:12 +0100
 +
 +telepathy-mission-control-5 (5.2.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Standards-Version: 3.8.3 (no changes needed)
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 27 Aug 2009 16:35:00 +0100
 +
 +telepathy-mission-control-5 (5.2.0-2) unstable; urgency=low
 +
 +  * debian/control:
 +    + Added myself to Uploaders.
 +    + Added conflicts on telepathy-mission-control.
 +
 + -- Jonny Lamb <jonny at debian.org>  Wed, 26 Aug 2009 12:54:06 +0100
 +
 +telepathy-mission-control-5 (5.2.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 30 Jul 2009 12:11:55 +0100
 +
 +telepathy-mission-control-5 (5.1.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Building the libraries statically now works, so do that, since we don't
 +      want to use them outside this source package
 +    - Install the new man pages for all executables
 +    - Remove GConf build dependency (which is now optional) since we're not
 +      going to install mc-account-convert anyway
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 09 Jul 2009 10:36:56 +0100
 +
 +telepathy-mission-control-5 (5.1.3-1) unstable; urgency=low
 +
 +  * Initial upload of Mission Control 5 (Closes: #534750), which will
 +    eventually replace telepathy-mission-control. It's basically a rewrite of
 +    MC 4, and is incompatible but parallel-installable, so I've packaged it
 +    from scratch.
 +  * Don't package libmcclient headers, development symlink or docs, but just
 +    bundle the shared library (which has -release versioning) with the daemon:
 +    it's not ABI-stable, and shouldn't be used in mainstream distributions
 +    (use telepathy-glib instead). The shared library has to remain shared,
 +    since it has symbols that collide with the daemon itself (albeit with the
 +    same implementations; this is in the process of being fixed upstream).
 +  * Don't package mc-account-convert, since it's the only thing in this
 +    package that needs gconf, and Empathy will probably ship its own
 +    MC 4 to MC 5 converter (perhaps based on mc-account-convert).
 +
 + -- Simon McVittie <smcv at debian.org>  Wed, 01 Jul 2009 16:33:16 +0100

-- 
MC 5 packaging