--- telepathy-gabble-0.8.1.orig/debian/watch
+++ telepathy-gabble-0.8.1/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-(.*)\.tar\.gz \
+debian \
+uupdate
--- telepathy-gabble-0.8.1.orig/debian/update-patches.mk
+++ telepathy-gabble-0.8.1/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-gabble-0.8.1.orig/debian/compat
+++ telepathy-gabble-0.8.1/debian/compat
@@ -0,0 +1 @@
+5
--- telepathy-gabble-0.8.1.orig/debian/gbp.conf
+++ telepathy-gabble-0.8.1/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-gabble-0.8.1.orig/debian/changelog
+++ telepathy-gabble-0.8.1/debian/changelog
@@ -0,0 +1,513 @@
+telepathy-gabble (0.8.1-2~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny.
+  * Add myself as an uploader.
+
+ -- Andres Salomon <dilinger@debian.org>  Thu, 15 Oct 2009 18:47:12 +0000
+
+telepathy-gabble (0.8.1-2) unstable; urgency=low
+
+  * debian/update-patches.mk: updated
+  * d/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch
+    + Prevent a crash when a tube capability without a Service or ServiceName
+      property is advertised. Patch from upstream git
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 28 Aug 2009 23:39:42 +0100
+
+telepathy-gabble (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Upped dep on libtelepathy-glib to >= 0.7.34.
+    + Upped Standards-Version. (no changes)
+
+ -- Jonny Lamb <jonny@debian.org>  Tue, 25 Aug 2009 18:25:59 +0100
+
+telepathy-gabble (0.7.32-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Dafydd Harries <daf@debian.org>  Tue, 11 Aug 2009 10:25:56 +0100
+
+telepathy-gabble (0.7.31-1) unstable; urgency=low
+
+  * New upstream version
+  * Standards-Version: 3.8.2 (no changes required)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 22 Jul 2009 17:56:36 +0100
+
+telepathy-gabble (0.7.30-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jonny Lamb <jonny@debian.org>  Mon, 29 Jun 2009 16:51:58 +0100
+
+telepathy-gabble (0.7.29-2) unstable; urgency=low
+
+  * New Debian upload to make sure distribution is correctly set.
+
+ -- Jonny Lamb <jonny@debian.org>  Wed, 24 Jun 2009 18:25:18 +0100
+
+telepathy-gabble (0.7.29-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Jonny Lamb <jonny@debian.org>  Fri, 19 Jun 2009 18:01:01 +0100
+
+telepathy-gabble (0.7.28-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Upped build-dep on libtelepathy-glib-dev to >= 0.7.31.
+
+ -- Jonny Lamb <jonny@debian.org>  Wed, 03 Jun 2009 14:45:10 +0100
+
+telepathy-gabble (0.7.27-1) unstable; urgency=low
+
+  * New Upstream Version
+  * debian/control: Add uuid-dev as a build-dependency
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 May 2009 12:30:55 +0100
+
+telepathy-gabble (0.7.26-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jonny Lamb <jonny@debian.org>  Wed, 08 Apr 2009 20:02:06 +0100
+
+telepathy-gabble (0.7.25-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Upped build-dependency on telepathy-glib.
+  * debian/copyright: Updated copyright years and versioned links to
+    licenses in common-licenses.
+
+ -- Jonny Lamb <jonny@debian.org>  Sat, 04 Apr 2009 12:03:10 +0100
+
+telepathy-gabble (0.7.24-1) unstable; urgency=low
+
+  [ Jonny Lamb ]
+  * debian/control: Changed telepathy-gabble-dbg's Section to debug.
+
+  [ Simon McVittie ]
+  * New upstream version
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 23 Mar 2009 19:41:12 +0000
+
+telepathy-gabble (0.7.23-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * debian/control: Correctly bump tp-glib to >= 0.7.26
+
+  [ Jonny Lamb ]
+  * New upstream release.
+  * debian/control:
+    + Added libsoup2.4-dev Build-Dep.
+    + Upped Standards-Version (no changes).
+
+ -- Jonny Lamb <jonny@debian.org>  Mon, 16 Mar 2009 17:17:22 +0000
+
+telepathy-gabble (0.7.22-1) unstable; urgency=low
+
+  * New Upstream Version
+  * debian/control: Bump tp-glib depend to >= 0.7.24
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 03 Mar 2009 11:23:16 +0000
+
+telepathy-gabble (0.7.21-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/gbp.conf:
+    + Added pristine-tar = True.
+    + Removed no-create-orig line.
+  * debian/control:
+    + Added myself to Uploaders.
+    + Removed XS-Dm-Upload-Allowed field.
+
+ -- Jonny Lamb <jonny@debian.org>  Sat, 21 Feb 2009 14:12:49 +0000
+
+telepathy-gabble (0.7.20-2) unstable; urgency=low
+
+  [ Simon McVittie ]
+  * Bump dbus-glib build dependency to 0.80-2, so we get a runtime dependency
+    on 0.78 (which can deal with all the D-Bus types we need, and consistently
+    unrefs simply-typed hash tables) rather than 0.76 (which can't deal with
+    all D-Bus types, and might unref or destroy hash tables depending on the
+    version of GLib it was built against).
+
+  [ Laurent Bigonville ]
+  * Upload to unstable.
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 17 Feb 2009 20:41:45 +0100
+
+telepathy-gabble (0.7.20-1) experimental; urgency=low
+
+  * New upstream release
+  * Remove both the patches (no longer needed)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 02 Feb 2009 19:05:19 +0000
+
+telepathy-gabble (0.7.19-1) experimental; urgency=low
+
+  * New upstream release
+  * Cherry-pick patch from upstream git to reinstate offline/error/unknown
+    statuses in the GetStatuses return
+  * Cherry-pick patch from upstream git to set actor correctly when
+    terminating Jingle calls
+  * [lintian] debian/control: remove duplicate "Section: net" from binary
+    packages, so they pick it up from the source package
+  * [lintian] debian/control: fix description of the -dbg package
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 30 Jan 2009 19:01:03 +0000
+
+telepathy-gabble (0.7.17-1) experimental; urgency=low
+
+  [ Simon McVittie ]
+  * Add update-patches machinery from libnice packaging
+  * Sync README.source from libnice
+
+  [ Laurent Bigonville ]
+  * New upstream release
+  * Bump libdbus-1-dev and libdbus-glib-1-dev build-dep
+  * Add ${misc:Depends} to telepathy-gabble-dbg depends to please lintian
+
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 18 Dec 2008 10:24:14 +0100
+
+telepathy-gabble (0.7.16-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 03 Dec 2008 21:06:42 +0100
+
+telepathy-gabble (0.7.15-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 06 Nov 2008 09:57:24 +0000
+
+telepathy-gabble (0.7.14-1) experimental; urgency=low
+
+  * New upstream version
+    - require telepathy-glib 0.7.18
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 04 Nov 2008 11:38:16 +0000
+
+telepathy-gabble (0.7.12-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 Oct 2008 16:02:28 +0100
+
+telepathy-gabble (0.7.11-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 22 Oct 2008 16:04:16 +0100
+
+telepathy-gabble (0.7.10-1) experimental; urgency=low
+
+  [ Simon McVittie ]
+  * New upstream version
+    - require telepathy-glib 0.7.17
+  * README.source: talk about the debian-patches branch
+
+  [ Laurent Bigonville ]
+  * Use my debian.org address in Uploaders
+  * Fix Vcs-Git URL
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 15 Oct 2008 14:01:58 +0100
+
+telepathy-gabble (0.7.9-1) experimental; urgency=low
+
+  * New experimental upstream version. This one would be in experimental even
+    if we weren't in freeze for the lenny release.
+    - bump build dependencies to GLib 2.16 and telepathy-glib 0.7.16
+  * Move packaging to git and note this fact in debian/control.
+  * Bump the Standards-Version to 3.8.0 (add a README.source).
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 29 Sep 2008 18:42:50 +0100
+
+telepathy-gabble (0.7.8-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/patches/01fixmarshaller.patch: removed, no longer needed.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 19 Aug 2008 20:35:05 +0100
+
+telepathy-gabble (0.7.7-2) experimental; urgency=low
+
+  * debian/patches/01fixmarshaller.patch: Fix assertion failure when using
+    GLib 2.17's pedantic signal marshallers (patch from upstream darcs,
+    via Ubuntu; fd.o #16963).
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 06 Aug 2008 12:06:58 +0100
+
+telepathy-gabble (0.7.7-1) experimental; urgency=low
+
+  * New upstream release
+    - debian/control: build-depend on telepathy-glib >= 0.7.13
+      and update other dependencies to match configure.ac
+  * Targeting experimental due to the lenny freeze
+  * Wrap long Uploaders, Build-Depends and sort them alphabetically
+  * Make the build-dependency on libdbus-1-dev explicit
+  * Update copyright year in debian/copyright
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 31 Jul 2008 14:45:34 +0100
+
+telepathy-gabble (0.7.6-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: Up telepathy-glib build-depend to 0.7.8
+  * debian/patches/00-no-call-state.diff:
+    + Removed. Not relevant anymore
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 16 May 2008 12:41:16 +0200
+
+telepathy-gabble (0.7.5-2) unstable; urgency=low
+
+  * patches/00-no-call-state.diff: Added, from upstream darcs.
+    Avoid referencing the CallState interface, so we don't have to depend on
+    telepathy-glib >= 0.7.6
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 12 May 2008 09:30:43 +0100
+
+telepathy-gabble (0.7.5-1) unstable; urgency=low
+
+  * New upstream version
+  * Ship the HTML protocol documentation installed by versions >= 0.7.4
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 05 May 2008 12:53:58 +0100
+
+telepathy-gabble (0.7.4-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/patches/00_retry_media_session_initiation_on_stream_removal.patch:
+    removed, applied upstream
+  * Use my Debian email address in Uploaders
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 01 May 2008 19:18:59 +0100
+
+telepathy-gabble (0.7.3-2) unstable; urgency=low
+
+  [ Simon McVittie ]
+  * Instead of shipping documentation in the -dbg package, ship a symlink
+    to the main package's documentation
+  * Update Build-Depends for the 0.7.3 version, which needs
+    telepathy-glib (>= 0.7.0) (in practice, this is easily satisfied by the
+    versions in both lenny and sid, so shouldn't be a problem)
+
+  [ Sjoerd Simons ]
+  * debian/patches/00_retry_media_session_initiation_on_stream_removal.patch
+    - Added. When a media stream is removed before a session initiation is
+    send recheck if an initiation should be send (from upstream darcs)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 12 Apr 2008 17:54:28 +0200
+
+telepathy-gabble (0.7.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Simon McVittie <smcv@ianadd.pseudorandom.co.uk>  Fri, 11 Apr 2008 15:36:28 +0100
+
+telepathy-gabble (0.7.2-1) unstable; urgency=low
+
+  * New upstream release (0.7.2)
+
+ -- Laurent Bigonville <bigon@bigon.be>  Thu, 17 Jan 2008 23:11:41 +0100
+
+telepathy-gabble (0.7.1-1) unstable; urgency=low
+
+  [ Simon McVittie ]
+  * New upstream release
+    - Installs to libexecdir, so set libexecdir to /usr/lib/telepathy/ in
+      debian/rules (we're standardizing on this directory for all
+      Telepathy CMs in Debian)
+    - Has a man page (which was briefly in the Debian packaging, but has now
+      gone upstream)
+  * Upgrade telepathy-glib dependency to 0.6.1 to get predictable behaviour
+    of debug vs persist (note to backporters: 0.5.14 should be sufficient to
+    build this version if you don't want 0.6.1)
+  * Add XS-Dm-Upload-Allowed: yes so I can upload it
+
+  [ Laurent Bigonville ]
+  * Use new Homepage field instead of old pseudo-field
+  * Use now official Vcs-* field
+  * Bump libloudmouth-dev build-dep (>= 1.3.2), only needed to enable some
+    new features
+  * Bump Standards-Version to 3.7.3
+
+ -- Laurent Bigonville <bigon@bigon.be>  Tue, 11 Dec 2007 20:48:36 +0100
+
+telepathy-gabble (0.6.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove Provides: telepathy-connection-manager from the -dbg package
+
+ -- Laurent Bigonville <bigon@bigon.be>  Fri, 28 Sep 2007 20:23:26 +0200
+
+telepathy-gabble (0.5.14-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * Add XS-Vcs-Bzr field
+
+  [ Sjoerd Simons ]
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 06 Sep 2007 22:27:46 +0200
+
+telepathy-gabble (0.5.13-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * Add myself as an Uploaders
+  * Use binary:Version instead of Source-Version to be binNMU safe
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/control: Bump libtelepathy-glib-dev build-dep to >= 0.5.14
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 31 Aug 2007 09:44:51 +0200
+
+telepathy-gabble (0.5.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 09 Jul 2007 22:38:50 +0200
+
+telepathy-gabble (0.5.11-1) unstable; urgency=low
+
+  [ Sjoerd Simons ]
+  * Set the priority of -dbg to extra
+
+  [ Simon McVittie ]
+  * New upstream release
+  * Build-Depend on telepathy-glib 0.5.10 (now separate)
+  * Set -dbg dependencies correctly
+
+ -- Simon McVittie <smcv@ianadd.pseudorandom.co.uk>  Thu, 03 May 2007 17:07:52 +0100
+
+telepathy-gabble (0.5.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 13 Apr 2007 10:03:33 +0200
+
+telepathy-gabble (0.5.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Upload to unstable now that the required version of dbus-glib is in
+    unstable
+  * debian/copyright: Update authors and include licenses/copyright of the
+    included libmd5-rfc and sha1 implementations.
+  * debian/telepathy-gabble.install: Make more strict to prevent the
+    installation of telepathy-glib
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 10 Apr 2007 17:15:58 +0200
+
+telepathy-gabble (0.5.6-1) experimental; urgency=low
+
+  * New upstream release
+  * Correctly upload to experimental (needs new dbus-glib) - 0.5.5-1 in
+    unstable was a mistake
+  * Branch packaging on Alioth to avoid future confusion
+
+ -- Simon McVittie <smcv@ianadd.pseudorandom.co.uk>  Mon, 26 Mar 2007 17:08:06 +0100
+
+telepathy-gabble (0.5.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu,  8 Mar 2007 18:54:41 +0100
+
+telepathy-gabble (0.5.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Add xsltproc to build-depends
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri,  2 Mar 2007 11:40:03 +0100
+
+telepathy-gabble (0.5.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Riccardo Setti <giskard@debian.org>  Thu,  8 Feb 2007 21:18:20 +0100
+
+telepathy-gabble (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed:
+    - 00_only_set_message_if_present.patch applied upstream
+    - 01_first_update_cache_then_use_it.patch applied upstream
+ 
+ -- Riccardo Setti <giskard@debian.org>  Tue, 30 Jan 2007 10:44:01 +0100
+
+telepathy-gabble (0.5.0-2) unstable; urgency=low
+
+  [ Riccardo Setti ]
+  * Added telepathy-gabble-dbg package.
+
+  [ Sjoerd Simons ]
+  * debian/patches/00_only_set_message_if_present.patch
+    - Don't add an optional message property in PresenceUpdate if the contact
+    didn't have a status message (from upstream darcs)
+  * debian/patches/01_first_update_cache_then_use_it.patch
+    - First update the cache and then proccess the information (from upstream
+    darcs)
+
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 25 Jan 2007 15:09:43 +0100
+
+telepathy-gabble (0.5.0-1) unstable; urgency=low
+
+  [ Dafydd Harries ]
+  * Bump build-dependency on Loudmouth to >= 1.1.1.
+  * Bump libglib-dbus-dev dependency to >= 0.71.
+  * List authors in copyright file.
+  * Add Riccardo Setti as uploader.
+  * Add watch file.
+  * Bump standards version to 3.7.2.
+
+  [ Simon McVittie ]
+  * New upstream release.
+  * Merge Ubuntu packaging with Daf's Debian packaging for 0.4.2.
+  * Use plain debhelper (as in Daf's Debian packaging), not CDBS (as in Daniel
+    Holbach's Ubuntu packaging).
+  * Set Daf as maintainer with myself, Daniel Holbach and Riccardo Setti as
+    uploaders.
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Add myself to uploaders
+  * Revert the change to debhelper 
+  * Merge in the latest ubuntu changes
+  * Move the ubuntu changelog to ubuntu.change, so there is some record for it
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 14 Dec 2006 15:11:31 +0000
+
+telepathy-gabble (0.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump build-dependency on Loudmouth to >= 1.1.1.
+  * Bump libglib-dbus-dev dependency to >= 0.71.
+  * List authors in copyright file.
+  * Add Riccardo Setti as uploader.
+
+ -- Dafydd Harries <daf@debian.org>  Tue, 17 Oct 2006 19:06:43 +0100
+
+telepathy-gabble (0.3.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * Add missing libloudmouth1-dev build-dependency.
+
+ -- Dafydd Harries <daf@debian.org>  Tue,  1 Aug 2006 17:49:59 +0100
+
+telepathy-gabble (0.1.42-1) unstable; urgency=low
+
+  * New upstream version.
+  * Provide telepathy-connection-manager virtual package.
+
+ -- Dafydd Harries <daf@debian.org>  Thu, 13 Jul 2006 18:29:35 +0100
+
+telepathy-gabble (0.1.37-1) unstable; urgency=low
+
+  * Initial package.
+
+ -- Dafydd Harries <daf@debian.org>  Fri,  9 Jun 2006 17:53:49 +0100
--- telepathy-gabble-0.8.1.orig/debian/rules
+++ telepathy-gabble-0.8.1/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+DEB_AUTO_CLEANUP_RCS            := yes
+
+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
+
+# List any files which are not installed
+include /usr/share/cdbs/1/rules/utils.mk
+common-binary-post-install-arch:: list-missing
+
+# cdbs defaults to one subdirectory per source package, which is overkill for us
+DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
+
+# this has a tight dependency, so we can symlink the doc directories together
+DEB_INSTALL_DOCS_telepathy-gabble-dbg := --no-act
+DEB_INSTALL_CHANGELOGS_telepathy-gabble-dbg := --no-act
+
+include $(CURDIR)/debian/update-patches.mk
--- telepathy-gabble-0.8.1.orig/debian/telepathy-gabble-dbg.links
+++ telepathy-gabble-0.8.1/debian/telepathy-gabble-dbg.links
@@ -0,0 +1 @@
+usr/share/doc/telepathy-gabble usr/share/doc/telepathy-gabble-dbg
--- telepathy-gabble-0.8.1.orig/debian/changelog.ubuntu
+++ telepathy-gabble-0.8.1/debian/changelog.ubuntu
@@ -0,0 +1,153 @@
+telepathy-gabble (0.5.0-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - bringing avatars and groups to the world.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 11 Dec 2006 20:37:34 +0100
+
+telepathy-gabble (0.4.9-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - Fix up Jingle stream name collisions once and for all by adding support
+      for XEP-0166's newest addition ;), the <content creator=""> attribute,
+      meaning we now have two namespaces for streams belonging to the call
+      initiator, and streams belonging to the recipient. 
+    - Also when doing room listing, batch up information from the server and 
+      emit the signals on a timer so that we don't spam the bus so 
+      ridiculously.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Wed,  6 Dec 2006 23:12:22 +0100
+
+telepathy-gabble (0.4.8-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - google roster support (deciding what is and isn't a JID)
+    - some leak fixes
+    - fixes for assertion errors when you get error at connect time
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 30 Nov 2006 20:08:10 +0100
+
+telepathy-gabble (0.4.7-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+
+ -- Riccardo Setti <giskard@ubuntu.com>  Thu, 23 Nov 2006 20:30:34 +0100
+
+telepathy-gabble (0.4.6-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - fix crash when getting capabilities of offline people
+    - when streams are removed from a call, remove them from the UI
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Wed, 22 Nov 2006 06:44:30 +0100
+
+telepathy-gabble (0.4.5-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - Fix various race conditions in Jingle signalling.
+    - Don't crash if we call the self handle.
+    - Add tests for handle-related code.
+    - Try harder to get aliases for contacts.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 13 Nov 2006 12:34:22 -0800
+
+telepathy-gabble (0.4.4-0ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@ubuntu.com>  Wed, 8 Nov 2006 11:13:43 +0200
+
+telepathy-gabble (0.4.2-0ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@ubuntu.com>  Tue, 31 Oct 2006 11:13:43 +0200
+
+telepathy-gabble (0.3.13-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@ubuntu.com>  Fri, 13 Oct 2006 18:36:23 +0200
+
+telepathy-gabble (0.3.10-0ubuntu2) edgy; urgency=low
+
+  * debian/control:
+    - telepathy-gabble provides telepathy-connection-manager.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Wed, 11 Oct 2006 19:07:57 +0200
+
+telepathy-gabble (0.3.10-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 04 Oct 2006 23:02:23 +0200
+
+telepathy-gabble (0.3.9-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 04 Oct 2006 17:43:51 +0200
+
+
+telepathy-gabble (0.3.8-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 02 Oct 2006 21:40:21 +0200
+
+telepathy-gabble (0.3.7-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 28 Sep 2006 20:36:23 +0200
+
+telepathy-gabble (0.3.6-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 21 Sep 2006 22:09:34 +0200
+
+telepathy-gabble (0.3.5-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 14 Sep 2006 18:26:15 +0200
+
+telepathy-gabble (0.3.4-0ubuntu1) edgy; urgency=low
+
+  *  New upstream release.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 11 Sep 2006 11:19:00 +0200
+
+telepathy-gabble (0.3.2-0ubuntu2) edgy; urgency=low
+
+  * Rebuild against dbus 0.90
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 22:14:16 +0200
+
+telepathy-gabble (0.3.2-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Wed, 30 Aug 2006 08:59:11 +0200
+
+telepathy-gabble (0.3.1-0ubuntu1) edgy; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Tue, 22 Aug 2006 17:28:36 +0200
+
+telepathy-gabble (0.3.0-0ubuntu1) edgy; urgency=low
+
+  * New upstream release:
+  * debian/rules:
+    - drop --disable-loudmouth-versioning.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun,  6 Aug 2006 10:59:43 +0200
+
+telepathy-gabble (0.1.42-0ubuntu1) edgy; urgency=low
+
+  * Initial release.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Tue, 27 Jun 2006 19:09:44 +0200
+
--- telepathy-gabble-0.8.1.orig/debian/copyright
+++ telepathy-gabble-0.8.1/debian/copyright
@@ -0,0 +1,98 @@
+This package was debianized by Daniel Holbach <daniel.holbach@ubuntu.com> on
+Tue, 27 Jun 2006 19:09:44 +0200.
+
+It was downloaded from:
+http://telepathy.freedesktop.org/releases/telepathy-gabble/
+
+The main parts of telepathy-gabble are:
+
+Copyright Holder:
+	 * Copyright (C) 2005-2009 Collabora Ltd.
+	 * Copyright (C) 2005-2009 Nokia Corporation
+
+Upstream Authors:
+							2005-2007
+Ross Burton <ross@burtonini.com>
+Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Dafydd Harries <dafydd.harries@collabora.co.uk>
+Robert McQueen <robert.mcqueen@collabora.co.uk>
+Simon McVittie <simon.mcvittie@collabora.co.uk>
+Mads Chr. Olesen <shiyee@shiyee.dk>
+Senko Rasic <senko.rasic@collabora.co.uk>
+Ole André Ravnaas <ole.andre.ravnaas@collabora.co.uk>
+Olli Salli <olli.salli@collabora.co.uk>
+Sjoerd Simons <sjoerd@luon.net>
+Rob Taylor <rob.taylor@collabora.co.uk>
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+
+src/libmd5-rfc:
+  Copyright holder:
+    1999, 2002 Aladdin Enterprises
+
+  Author:
+     L. Peter Deutsch ghost@aladdin.com
+
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the authors be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you must not
+      claim that you wrote the original software. If you use this software
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original software.
+   3. This notice may not be removed or altered from any source distribution.
+
+src/sha1:
+  Copyright holder:
+    2001-2003 Allan Saddi <allan@saddi.com>
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS CONTRIBUTORS ``AS IS''
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL ALLAN SADDI OR HIS CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+
+The packaging is:
+
+ * Copyright (C) 2006 Daniel Holbach <daniel.holbach@ubuntu.com>
+ * Copyright (C) 2006-2009 Collabora Ltd. <http://www.collabora.co.uk/>
+
+and is licensed under the same terms as the software.
--- telepathy-gabble-0.8.1.orig/debian/control
+++ telepathy-gabble-0.8.1/debian/control
@@ -0,0 +1,46 @@
+Source: telepathy-gabble
+Section: net
+Priority: optional
+Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
+Uploaders: Dafydd Harries <daf@debian.org>,
+           Daniel Holbach <daniel.holbach@ubuntu.com>,
+           Laurent Bigonville <bigon@debian.org>,
+           Riccardo Setti <giskard@debian.org>,
+           Simon McVittie <smcv@debian.org>,
+           Sjoerd Simons <sjoerd@debian.org>,
+           Andres Salomon <dilinger@debian.org>,
+           Jonny Lamb <jonny@debian.org>
+Build-Depends: cdbs,
+               debhelper (>= 5),
+               libdbus-1-dev (>= 1.1.0),
+               libdbus-glib-1-dev (>= 0.80-2),
+               libglib2.0-dev (>= 2.16),
+               libloudmouth1-dev (>= 1.3.2),
+               libsoup2.4-dev,
+               libtelepathy-glib-dev (>= 0.7.34),
+               python,
+               xsltproc,
+               uuid-dev
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-gabble.git
+Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-gabble.git
+Homepage: http://telepathy.freedesktop.org/wiki/
+
+Package: telepathy-gabble
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: telepathy-connection-manager
+Description: Jabber/XMPP connection manager
+ Gabble is a Jabber/XMPP connection manager for the Telepathy framework,
+ currently supporting single user chats, multi user chats and voice/video
+ calls. Install this package to use Telepathy instant messaging clients
+ with Jabber/XMPP servers, including Google Talk.
+
+Package: telepathy-gabble-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: telepathy-gabble (= ${binary:Version}), ${misc:Depends}
+Description: Jabber/XMPP connection manager (debug symbols)
+ Gabble is a Jabber/XMPP connection manager for the Telepathy framework.
+ This package contains debug symbols necessary to debug crashes in Gabble.
--- telepathy-gabble-0.8.1.orig/debian/telepathy-gabble.install
+++ telepathy-gabble-0.8.1/debian/telepathy-gabble.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/telepathy
+debian/tmp/usr/share/man
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/telepathy
+debian/tmp/usr/share/doc/telepathy-gabble
--- telepathy-gabble-0.8.1.orig/debian/README.source
+++ telepathy-gabble-0.8.1/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-lenny
+branch contains versions targeted for lenny, etc.
+
+Here's how to build it:
+
+    git clone git://git.debian.org/git/pkg-telepathy/telepathy-gabble
+    cd telepathy-gabble
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-lenny:
+
+    git clone git://git.debian.org/git/pkg-telepathy/telepathy-gabble
+    cd telepathy-gabble
+    git checkout debian-lenny
+    git-buildpackage -us -uc --git-debian-branch=debian-lenny
+
+The branch 'upstream' is a copy of the contents of upstream tarballs. To import
+upstream tarballs use:
+
+    git checkout debian
+    git-import-orig ~/telepathy-gabble-0.7.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-gabble.git
+    git fetch
+    git checkout debian-patches
+    git cherry-pick xxxxxxxxxxxxxx
+    git checkout debian
+    fakeroot debian/rules update-patches
--- telepathy-gabble-0.8.1.orig/debian/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch
+++ telepathy-gabble-0.8.1/debian/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch
@@ -0,0 +1,48 @@
+From 2305ded1dc04e93b944c95aaabaf5a95efb3302d Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Fri, 28 Aug 2009 21:14:10 +0100
+Subject: [PATCH] Fix a crash when advertising tube caps without Service{,Name}
+
+---
+ src/private-tubes-factory.c |   22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
+index 5a10640..42f9d93 100644
+--- a/src/private-tubes-factory.c
++++ b/src/private-tubes-factory.c
+@@ -888,20 +888,26 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
+       Feature *feat = g_new0 (Feature, 1);
+       gchar *service = g_strdup (tp_asv_get_string (cap,
+           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"));
+-      feat->feature_type = FEATURE_OPTIONAL;
+-      feat->ns = g_strdup_printf ("%s/stream#%s", NS_TUBES, service);
+-      feat->caps = 0;
+-      g_hash_table_insert (caps->stream_tube_caps, service, feat);
++      if (service != NULL)
++        {
++          feat->feature_type = FEATURE_OPTIONAL;
++          feat->ns = g_strdup_printf ("%s/stream#%s", NS_TUBES, service);
++          feat->caps = 0;
++          g_hash_table_insert (caps->stream_tube_caps, service, feat);
++        }
+     }
+   else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
+     {
+       Feature *feat = g_new0 (Feature, 1);
+       gchar *service = g_strdup (tp_asv_get_string (cap,
+           TP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName"));
+-      feat->feature_type = FEATURE_OPTIONAL;
+-      feat->ns = g_strdup_printf ("%s/dbus#%s", NS_TUBES, service);
+-      feat->caps = 0;
+-      g_hash_table_insert (caps->dbus_tube_caps, service, feat);
++      if (service != NULL)
++        {
++          feat->feature_type = FEATURE_OPTIONAL;
++          feat->ns = g_strdup_printf ("%s/dbus#%s", NS_TUBES, service);
++          feat->caps = 0;
++          g_hash_table_insert (caps->dbus_tube_caps, service, feat);
++        }
+     }
+ }
+ 
