Patch information for telepathy-mission-control-5 (1:5.4.3-1) debian-dir only changes

--- telepathy-mission-control-5-5.4.3.orig/debian/README.source
+++ telepathy-mission-control-5-5.4.3/debian/README.source
@@ -0,0 +1,59 @@
+Patches
+=======
+
+This package occasionally uses cdbs simple-patch-system to store
+modifications to the upstream source, although in most uploads no patches
+are needed.
+
+To get the fully patched source: make -f debian/rules patch
+
+To revert to what's in git: make -f debian/rules unpatch
+
+To add a patch: obtain a diff and put it in debian/patches, or see below
+
+To remove an existing patch: delete it from debian/patches
+
+Packaging using git
+===================
+
+The repository contains an appropriate debian/gbp.conf to build this package
+using git-buildpackage. The debian branch contains the latest upstream versions
+(for unstable, or experimental while a freeze is in progress). The
+debian-squeeze branch will contain versions targeted for squeeze, etc.
+
+Here's how to build it:
+
+    git clone git://git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
+    cd telepathy-mission-control-5
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-squeeze:
+
+    git clone git://git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
+    cd telepathy-glib
+    git checkout debian-squeeze
+    git-buildpackage -us -uc --git-debian-branch=debian-squeeze
+
+The branch 'upstream' is a copy of the contents of upstream tarballs. To import
+upstream tarballs use:
+
+    git checkout debian
+    git-import-orig ~/telepathy-mission-control-5.1.x.tar.gz
+
+The branch 'debian-patches' is 'upstream' plus any patches needed for Debian.
+It should be rebased on 'upstream' after each upstream release:
+
+    git checkout debian-patches
+    git rebase upstream
+
+The preferred way of adding patches is to cherry pick from an upstream
+repository:
+
+    git remote add collabora \
+        git+ssh://git.collabora.co.uk/git/telepathy-mission-control.git
+    git fetch
+    git checkout debian-patches
+    git cherry-pick xxxxxxxxxxxxxx
+    git checkout debian
+    fakeroot debian/rules update-patches
--- telepathy-mission-control-5-5.4.3.orig/debian/telepathy-mission-control-5.manpages
+++ telepathy-mission-control-5-5.4.3/debian/telepathy-mission-control-5.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/mission-control-5.8
+debian/tmp/usr/share/man/man1/mc-tool.1
+debian/tmp/usr/share/man/man1/mc-wait-for-name.1
--- telepathy-mission-control-5-5.4.3.orig/debian/copyright
+++ telepathy-mission-control-5-5.4.3/debian/copyright
@@ -0,0 +1,83 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=442
+Upstream-Name: telepathy-mission-control
+Upstream-Maintainer:
+    mailto:telepathy@lists.freedesktop.org
+    irc://irc.freenode.net/telepathy
+    http://telepathy.freedesktop.org/
+Upstream-Source: http://telepathy.freedesktop.org/releases/telepathy-mission-control/
+
+Files: *
+Copyright: Copyright © 2007-2009 Collabora Ltd.
+Copyright: Copyright © 2007-2009 Nokia Corporation
+License: LGPL-2.1
+
+Files:
+   libmcclient/dbus-api.[ch],
+   libmcclient/mc-account.[ch],
+   libmcclient/mc-account-avatar.c,
+   libmcclient/mc-account-compat.c,
+   libmcclient/mc-account-conditions.c,
+   libmcclient/mc-account-priv.h,
+   libmcclient/mc-account-request.c,
+   libmcclient/mc-account-stats.c,
+   libmcclient/mc-account-manager.[ch],
+   libmcclient/mc-dispatch-operation.[ch],
+   libmcclient/mc-errors.c,
+   libmcclient/mc-gtypes.h,
+   libmcclient/mc-svc-client.h,
+   src/mcd-account.h,
+   src/mcd-account-compat.h,
+   src/mcd-account-conditions.h,
+   src/mcd-account-manager.h,
+   src/mcd-account-manager-priv.h,
+   src/mcd-client.c,
+   src/mcd-client-priv.h,
+   src/mcd-dispatch-operation.h,
+   src/mcd-dispatch-operation-priv.h,
+   src/mcd-handler-map-priv.h,
+   src/mcd-handler-map.c,
+   src/mcd-plugin.h,
+   test/twisted/test-plugin.c,
+   util/wait-for-name.c,
+   xml/[AC]*.xml
+Copyright: Copyright © 2007-2009 Collabora Ltd.
+Copyright: Copyright © 2007-2009 Nokia Corporation
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: Copyright © 2009 Collabora Ltd.
+License: LGPL-2.1+
+
+License: LGPL-2.1
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+   .
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+   .
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301 USA
+X-Comment: On Debian systems, the complete text of the GNU Lesser General
+   Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-2.1+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   .
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   .
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+X-Comment: On Debian systems, the complete text of the GNU Lesser General
+   Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
--- telepathy-mission-control-5-5.4.3.orig/debian/control
+++ telepathy-mission-control-5-5.4.3/debian/control
@@ -0,0 +1,56 @@
+Source: telepathy-mission-control-5
+Section: net
+Priority: optional
+Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
+Uploaders: Simon McVittie <smcv@debian.org>,
+           Jonny Lamb <jonny@debian.org>,
+           Sjoerd Simons <sjoerd@debian.org>
+Build-Depends: cdbs,
+               debhelper (>= 5),
+               libdbus-1-dev (>= 1.0),
+               libdbus-glib-1-dev (>= 0.80),
+               libglib2.0-dev (>= 2.16),
+               libgnome-keyring-dev,
+               libtelepathy-glib-dev (>= 0.8),
+               pkg-config (>= 0.21),
+               python (>= 2.5),
+               xsltproc
+Standards-Version: 3.8.4
+Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
+Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-mission-control-5.git
+Homepage: http://telepathy.freedesktop.org/wiki/
+
+Package: telepathy-mission-control-5
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+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
+ the Telepathy framework, allowing user interfaces and other clients
+ to share connections to real-time communication services without conflicting.
+ It implements the AccountManager and ChannelDispatcher D-Bus APIs as described
+ by telepathy-spec.
+ .
+ The account manager part stores real time communication account details,
+ connects to the stored accounts on request, and sets the accounts' presence,
+ nickname and avatar according to requests from Telepathy user interfaces and
+ other components.
+ .
+ The channel dispatcher part responds to incoming communication channels
+ (message streams, voice/video calls, file transfers etc.) by dispatching
+ them to suitable user interfaces, and requests outgoing communication
+ channels according to requests from a Telepathy UI.
+ .
+ This is not a compatible replacement for Mission Control 4 (in the
+ telepathy-mission-control package), but they can be installed in parallel.
+
+Package: telepathy-mission-control-5-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: telepathy-mission-control-5 (= ${binary:Version}), ${misc:Depends}
+Description: management daemon for Telepathy (debug symbols)
+ Telepathy Mission Control 5 is an account manager and channel dispatcher for
+ the Telepathy framework. This package contains debug symbols which can be
+ used to debug Mission Control.
--- telepathy-mission-control-5-5.4.3.orig/debian/compat
+++ telepathy-mission-control-5-5.4.3/debian/compat
@@ -0,0 +1 @@
+5
--- telepathy-mission-control-5-5.4.3.orig/debian/watch
+++ telepathy-mission-control-5-5.4.3/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-(5\..*).tar.gz
--- telepathy-mission-control-5-5.4.3.orig/debian/telepathy-mission-control-5-dbg.links
+++ telepathy-mission-control-5-5.4.3/debian/telepathy-mission-control-5-dbg.links
@@ -0,0 +1 @@
+usr/share/doc/telepathy-mission-control-5 usr/share/doc/telepathy-mission-control-5-dbg
--- telepathy-mission-control-5-5.4.3.orig/debian/update-patches.mk
+++ telepathy-mission-control-5-5.4.3/debian/update-patches.mk
@@ -0,0 +1,10 @@
+update-patches:
+	mkdir -p $(CURDIR)/debian/patches
+	rm -f $(CURDIR)/debian/patches/*.patch
+	git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream
+	for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
+	do \
+		lines=$$(cat $$patch | wc -l) ; \
+		head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \
+			mv $${patch}.chomped $$patch ; \
+	done
--- telepathy-mission-control-5-5.4.3.orig/debian/changelog
+++ telepathy-mission-control-5-5.4.3/debian/changelog
@@ -0,0 +1,153 @@
+telepathy-mission-control-5 (1:5.4.3-1) unstable; urgency=high
+
+  * New upstream stable release
+  * Roll back to version 5.4.x for unstable, with an epoch.
+    - doesn't corrupt accounts whose parameters contain tab, newline
+      or backslash (Closes: #586099, LP: #590619)
+    - urgency=high for the RC bug fix
+    - if your ~/.mission-control/accounts.cfg is huge (multiple megabytes)
+      after using 5.5.0, see
+      https://bugs.freedesktop.org/show_bug.cgi?id=28557 for a workaround
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 16 Jun 2010 13:50:15 +0100
+
+telepathy-mission-control-5 (5.5.0-3) unstable; 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@debian.org>  Mon, 31 May 2010 17:11:12 +0100
+
+telepathy-mission-control-5 (5.5.0-2) experimental; urgency=low
+
+  * 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@debian.org>  Thu, 27 May 2010 12:06:46 +0100
+
+telepathy-mission-control-5 (5.5.0-1) experimental; urgency=low
+
+  * New upstream development release, to experimental for now
+  * Add libmission-control-plugins{0,-dev,-doc}
+  * Standards-Version: 3.8.4 (no changes needed)
+  * Explicitly set dpkg-source format to 1.0, consistent with the rest
+    of pkg-telepathy
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 26 May 2010 19:10:43 +0100
+
+telepathy-mission-control-5 (5.4.2-1) unstable; urgency=low
+
+  * New upstream release, fixing potential segfaults on startup
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 26 May 2010 16:44:09 +0100
+
+telepathy-mission-control-5 (5.4.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Simon McVittie <smcv@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@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@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@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@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@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@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@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@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@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@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@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@debian.org>  Wed, 01 Jul 2009 16:33:16 +0100
--- telepathy-mission-control-5-5.4.3.orig/debian/telepathy-mission-control-5.install
+++ telepathy-mission-control-5-5.4.3/debian/telepathy-mission-control-5.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/mc-tool
+debian/tmp/usr/bin/mc-wait-for-name
+debian/tmp/usr/lib/telepathy/mission-control-5
+debian/tmp/usr/share/dbus-1/services
--- telepathy-mission-control-5-5.4.3.orig/debian/gbp.conf
+++ telepathy-mission-control-5-5.4.3/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = debian
+upstream-branch = upstream
+pristine-tar = True
+
+[git-buildpackage]
+tarball-dir = ../tarballs/
+export-dir = ../build-area/
--- telepathy-mission-control-5-5.4.3.orig/debian/rules
+++ telepathy-mission-control-5-5.4.3/debian/rules
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+# The library isn't stable, and shouldn't be used on mainstream distributions.
+#
+# mc-account-convert requires GConf which we don't want to depend on here,
+# so if we were compiled on a non-minimal system, get rid of it.
+common-binary-post-install-arch:: list-missing
+list-missing: remove-cruft
+remove-cruft:
+	rm -rf debian/tmp/usr/include
+	rm -f debian/tmp/usr/lib/libmcclient.a
+	rm -f debian/tmp/usr/lib/libmcclient.la
+	rm -rf debian/tmp/usr/lib/pkgconfig
+	rm -rf debian/tmp/usr/share/gtk-doc
+	rm -f debian/tmp/usr/bin/mc-account-convert
+	rm -f debian/tmp/usr/share/man/man1/mc-account-convert.1
+
+DEB_DH_STRIP_ARGS := --dbg-package=telepathy-mission-control-5-dbg
+
+DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
+
+# Explicitly disable old-style plugins, which has the side-effect of disabling
+# their associated documentation, making their libraries static, and disabling
+# their headers
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--disable-Werror \
+	--disable-gtk-doc \
+	--disable-plugins \
+	--disable-mcd-plugins \
+	--enable-server \
+	--disable-shared \
+	--enable-static \
+	--enable-gnome-keyring
+
+# we symlink some of the doc directories together
+DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --no-act
+DEB_INSTALL_CHANGELOGS_telepathy-mission-control-5-dbg := --no-act
+
+include $(CURDIR)/debian/update-patches.mk
--- telepathy-mission-control-5-5.4.3.orig/debian/source/format
+++ telepathy-mission-control-5-5.4.3/debian/source/format
@@ -0,0 +1 @@
+1.0
telepathy-mission-control-5 (1:5.4.3-1) debian-dir only changes

Summary

Patch contents
