--- telepathy-butterfly-0.5.12.orig/debian/update-patches.mk +++ telepathy-butterfly-0.5.12/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-butterfly-0.5.12.orig/debian/README.source +++ telepathy-butterfly-0.5.12/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-butterfly + cd telepathy-butterfly + 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-butterfly + cd telepathy-butterfly + 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-butterfly-0.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-butterfly.git + git fetch + git checkout debian-patches + git cherry-pick xxxxxxxxxxxxxx + git checkout debian + fakeroot debian/rules update-patches --- telepathy-butterfly-0.5.12.orig/debian/watch +++ telepathy-butterfly-0.5.12/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-(.*).tar.gz --- telepathy-butterfly-0.5.12.orig/debian/changelog +++ telepathy-butterfly-0.5.12/debian/changelog @@ -0,0 +1,210 @@ +telepathy-butterfly (0.5.12-1) unstable; urgency=low + + * New upstream release. + * debian/control: Upped dep on papyon to 0.4.9. + + -- Jonny Lamb Sun, 11 Jul 2010 13:10:01 +0100 + +telepathy-butterfly (0.5.11-1) unstable; urgency=low + + * New upstream release. + + -- Jonny Lamb Tue, 08 Jun 2010 16:04:10 +0100 + +telepathy-butterfly (0.5.10-1) unstable; urgency=low + + * New upstream release. + * Add debian/source/format file with version 1.0 + + -- Laurent Bigonville Sun, 23 May 2010 00:21:14 +0200 + +telepathy-butterfly (0.5.9-1) unstable; urgency=low + + * New upstream release. + * debian/control: Added Recommends: python-libproxy. + + -- Jonny Lamb Sat, 24 Apr 2010 12:46:33 +0100 + +telepathy-butterfly (0.5.8-1) unstable; urgency=low + + * New upstream release. + + -- Jonny Lamb Thu, 08 Apr 2010 15:03:52 +0100 + +telepathy-butterfly (0.5.7-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: Updated. + * debian/rules: Updated now that butterfly uses autoconf and automake. + * debian/control: + + Upped Standards-Version. (no changes) + + Added a conflicts on empathy << 2.30 due to the removal of network + IDs from contact IDs. + + Decreased debhelper build-dep from 7 to 5. + * debian/compat: Move from 7 back to 5 as we don't actually use any dh7 + features. + + -- Jonny Lamb Sun, 04 Apr 2010 00:07:42 +0100 + +telepathy-butterfly (0.5.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Upped dependency on python-telepathy. + + Removed inactive maintainers from Uploaders. + + Removed a/v from description now that it's been disabled. + + -- Jonny Lamb Fri, 12 Mar 2010 23:49:19 +0000 + +telepathy-butterfly (0.5.4-1) unstable; urgency=low + + * New upstream release. + * debian/gbp.conf: Removed no-create-orig line. + * debian/control: Removed python-all-dev build-dep. + + -- Jonny Lamb Sun, 24 Jan 2010 12:03:02 +0000 + +telepathy-butterfly (0.5.3-1) unstable; urgency=low + + * New upstream release + + -- Laurent Bigonville Wed, 28 Oct 2009 22:24:02 +0100 + +telepathy-butterfly (0.5.2-1) unstable; urgency=low + + * New upstream release + - Implement offline messages support (Closes: #534292) + + -- Laurent Bigonville Wed, 21 Oct 2009 20:41:48 +0200 + +telepathy-butterfly (0.5.1-1) unstable; urgency=low + + * New upstream release (Closes: #526376) + * debian/control: + - Bump python-telepathy version + - Bump papyon version + - Add the fact that telepathy-butterfly supports audio/video chat \o/ + + -- Laurent Bigonville Tue, 15 Sep 2009 12:07:19 +0200 + +telepathy-butterfly (0.5.0-1) unstable; urgency=low + + * New upstream release + * debian/control: + - Bump Standards-Version to 3.8.3 (no further changes) + - Replace python-msn by python-papyon + - Bump python-telepathy version + - Bump debhelper version + - Bump minimal python version to 2.5 + + -- Laurent Bigonville Mon, 17 Aug 2009 13:35:49 +0200 + +telepathy-butterfly (0.3.4-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Bump Standards-Version to 3.8.1 + - Drop XS-Dm-Upload-Allowed: yes + * debian/copyright: Update copyright file + + -- Laurent Bigonville Wed, 17 Jun 2009 15:03:35 +0200 + +telepathy-butterfly (0.3.3-2) unstable; urgency=low + + * debian/control: Use my @debian.org email address. + + -- Jonny Lamb Mon, 16 Feb 2009 11:01:09 +0000 + +telepathy-butterfly (0.3.3-1) experimental; urgency=low + + [ Simon McVittie ] + * Standards-Version: 3.8.0 (add README.source) + * Move to git + * Use Laurent's debian.org address in Uploaders + + [ Laurent Bigonville ] + * New Upstream Version + - Bump python-telepathy dependency + + -- Laurent Bigonville Thu, 08 Jan 2009 14:02:44 +0100 + +telepathy-butterfly (0.3.2-1) experimental; urgency=low + + * New upstream release. (Closes: #492172) + + -- Jonny Lamb Thu, 24 Jul 2008 10:43:28 +0100 + +telepathy-butterfly (0.3.1-2) unstable; urgency=low + + [ Simon McVittie ] + * Wrap Uploaders + * Use my debian.org address + * Build the upload with current python-central, moving source files into + /usr/share/pyshared as a result (Closes: #490508) + + [ Laurent Bigonville ] + * debian/control: Depend on python (>= 2.5) | python-ctypes instead of just + python-ctypes + + -- Simon McVittie Sat, 12 Jul 2008 13:36:51 +0100 + +telepathy-butterfly (0.3.1-1) unstable; urgency=low + + [ Jonny Lamb ] + * Added Vcs-Bzr to control. + * Added "XS-Dm-Upload-Allowed: yes" under the request of Sjoerd Simons. + * Upped Standards-Version to 3.7.3. + * Updated copyright. + * Added myself to Uploaders. + * Removed dh_python from rules -- it's now obsolete. + + [ Laurent Bigonville ] + * New upstream release (0.3.1) + * Add watch file + * debian/control: + - Add myself as an Uploaders + - Remove python:Provides, only needed for python modules + - Bump python-msn version + * debian/rules: upstream now uses waf, modifying accordingly + * Remove pycompat file, not needed anymore + + -- Jonny Lamb Sat, 12 Jan 2008 15:20:54 +0000 + +telepathy-butterfly (0.1.4-1) experimental; urgency=low + + * New upstream version + * Upload to Debian, based on the work of the Ubuntu Telepathy packagers + * Target experimental because pymsn isn't in unstable + * Depend on pymsn 0.2.2 + * Make myself the Maintainer, with the same Uploaders as Gabble - once + we have a pkg-telepathy mailing list, that should become the Maintainer + + -- Simon McVittie Sun, 08 Apr 2007 14:29:50 +0100 + +telepathy-butterfly (0.1.2-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Riccardo Setti Sun, 8 Oct 2006 16:45:23 +0200 + +telepathy-butterfly (0.1.1-0ubuntu1) edgy; urgency=low + + * New upstream release + * Fixes bug "Impossible to connect to a msn account" (Malone: #63196) + + -- Samuel Maftoul Mon, 2 Oct 2006 14:28:39 +0200 + + +telepathy-butterfly (0.1.0-0ubuntu2) edgy; urgency=low + + * debian/control: + - added python-msn as Depends. + + -- Daniel Holbach Sat, 30 Sep 2006 00:07:38 +0200 + +telepathy-butterfly (0.1.0-0ubuntu1) edgy; urgency=low + + * Initial release + + -- Samuel Maftoul Thu, 21 Sep 2006 22:51:32 +0200 + --- telepathy-butterfly-0.5.12.orig/debian/control +++ telepathy-butterfly-0.5.12/debian/control @@ -0,0 +1,26 @@ +Source: telepathy-butterfly +Section: net +Priority: optional +XS-Python-Version: >= 2.5 +Maintainer: Debian Telepathy maintainers +Uploaders: Dafydd Harries , + Simon McVittie , + Sjoerd Simons , + Jonny Lamb , + Laurent Bigonville +Build-Depends: cdbs, debhelper (>= 5) +Build-Depends-Indep: pkg-config, python-central (>= 0.5), libdbus-1-dev +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-butterfly.git +Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-butterfly.git + +Package: telepathy-butterfly +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.15.17), python-papyon (>= 0.4.9) +Conflicts: empathy (<< 2.30) +XB-Python-Version: ${python:Versions} +Recommends: python-libproxy (>= 0.3.1) +Provides: telepathy-connection-manager +Description: MSN connection manager for Telepathy + MSN connection manager for telepathy that handles presence, personal + messages, conversations, avatars, and groups. --- telepathy-butterfly-0.5.12.orig/debian/gbp.conf +++ telepathy-butterfly-0.5.12/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-butterfly-0.5.12.orig/debian/copyright +++ telepathy-butterfly-0.5.12/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Samuel Maftoul on +Thu, 21 Sep 2006 22:51:32 +0200. + +It was downloaded from http://telepathy.freedesktop.org/releases/telepathy-butterfly/ + +Upstream Author: + Ali Sabil علي سبيل + Johann Prieur + Jonny Lamb + Louis-Francis Ratté-Boulianne + Olivier Le Thanh Duong + +Copyright: + Copyright © 2005-2007 Ali Sabil + Copyright © 2007 Johann Prieur + Copyright © 2007 Ole André Vadla Ravnås + Copyright © 2009 Olivier Le Thanh Duong + Copyright © 2009-2010 Collabora Ltd. + +License: + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 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 General Public License for more details. + + You should have received a copy of the GNU 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 General Public License can +be found in /usr/share/common-licenses/GPL. + +The Debian packaging is © 2006, Samuel Maftoul and +is licensed under the GPL, see above. --- telepathy-butterfly-0.5.12.orig/debian/rules +++ telepathy-butterfly-0.5.12/debian/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +DEB_AUTO_CLEANUP_RCS := yes +DEB_PYTHON_SYSTEM := pycentral +DEB_COMPRESS_EXCLUDE := .py + +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 + +DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/lib/telepathy + +binary-install/telepathy-butterfly:: + dh_pycentral + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + +include $(CURDIR)/debian/update-patches.mk --- telepathy-butterfly-0.5.12.orig/debian/compat +++ telepathy-butterfly-0.5.12/debian/compat @@ -0,0 +1 @@ +5 --- telepathy-butterfly-0.5.12.orig/debian/source/format +++ telepathy-butterfly-0.5.12/debian/source/format @@ -0,0 +1 @@ +1.0