--- telepathy-sunshine-0.1.8.orig/debian/rules +++ telepathy-sunshine-0.1.8/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +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 + +#%: +# dh $@ +prefix='/usr' +# Upstream releases are going to move CMs to libexecdir soon... +DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy" +# but haven't done so yet, so let's give Debian a head start +#DEB_CONFIGURE_NORMAL_ARGS := --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-silent-rules +DEB_CONFIGURE_EXTRA_FLAGS := --bindir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-silent-rules + + +include $(CURDIR)/debian/update-patches.mk + +install/telepathy-sunshine:: + find $(DEB_DESTDIR) -name '*.pyc' -exec rm '{}' ';' --- telepathy-sunshine-0.1.8.orig/debian/compat +++ telepathy-sunshine-0.1.8/debian/compat @@ -0,0 +1 @@ +7 --- telepathy-sunshine-0.1.8.orig/debian/changelog +++ telepathy-sunshine-0.1.8/debian/changelog @@ -0,0 +1,16 @@ +telepathy-sunshine (0.1.8-1) unstable; urgency=low + + [ Krzysztof Klinikowski ] + * New upstream release + + [ Sjoerd Simons] + * debian/patches/0001-Use-python-2.6.patch + + Added, sunshine doesn't seem to want to work with python 2.5 + + -- Sjoerd Simons Sun, 16 May 2010 12:58:34 +0100 + +telepathy-sunshine (0.1.7-1) unstable; urgency=low + + * Initial release + + -- Krzysztof Klinikowski Thu, 22 Apr 2010 20:27:09 +0200 --- telepathy-sunshine-0.1.8.orig/debian/copyright +++ telepathy-sunshine-0.1.8/debian/copyright @@ -0,0 +1,51 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: telepathy-sunshine +Source: http://git.collabora.co.uk/?p=telepathy-sunshine.git + +Upstream Author: Krzysztof Klinikowski + +Copyright: + Copyright © 2005-2007 Ali Sabil + Copyright © 2007 Johann Prieur + Copyright © 2009 Olivier Le Thanh Duong + Copyright © 2009 Łukasz Rekucki + Copyright © 2010 Krzysztof Klinikowski + Copyright © 2009-2010 Collabora Ltd. + +License: GPL-2+ + 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. + +Files: debian/* +Copyright: 2010, Krzysztof Klinikowski +License: GPL-2+ + 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. --- telepathy-sunshine-0.1.8.orig/debian/update-patches.mk +++ telepathy-sunshine-0.1.8/debian/update-patches.mk @@ -0,0 +1,11 @@ +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-sunshine-0.1.8.orig/debian/README.source +++ telepathy-sunshine-0.1.8/debian/README.source @@ -0,0 +1,60 @@ +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-sunshine + cd telepathy-sunshine + 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-sunshine + cd telepathy-sunshine + 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-sunshine-1.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-sunshine.git + git fetch + git checkout debian-patches + git cherry-pick xxxxxxxxxxxxxx + git checkout debian + fakeroot debian/rules update-patches + --- telepathy-sunshine-0.1.8.orig/debian/gbp.conf +++ telepathy-sunshine-0.1.8/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-sunshine-0.1.8.orig/debian/control +++ telepathy-sunshine-0.1.8/debian/control @@ -0,0 +1,26 @@ +Source: telepathy-sunshine +Section: net +Priority: optional +XS-Python-Version: 2.6 +Maintainer: Debian Telepathy maintainers +Uploaders: Krzysztof Klinikowski , Sjoerd Simons +Build-Depends: debhelper (>= 7), + cdbs, + python-dbus, + python-gobject, + python-telepathy (>= 0.15.11), + libdbus-glib-1-dev (>= 0.51), + python-twisted (>= 0.8.0), + python2.6 +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/pkg-telepathy/telepathy-sunshine.git +Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-sunshine.git +Homepage: http://telepathy.freedesktop.org/wiki/ + +Package: telepathy-sunshine +Architecture: all +Provides: telepathy-connection-manager +Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.15.17), python-twisted (>= 0.8.2), python2.6 +XB-Python-Version: ${python:Versions} +Description: Gadu Gadu connection manager for Telepathy + A full-featured Gadu Gadu connection manager for the Telepathy project. --- telepathy-sunshine-0.1.8.orig/debian/patches/0001-Use-python-2.6.patch +++ telepathy-sunshine-0.1.8/debian/patches/0001-Use-python-2.6.patch @@ -0,0 +1,83 @@ +From 25aae215791f2e4a9adcdfa9ab4c214dce8cfc74 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Sat, 8 May 2010 13:17:21 +0100 +Subject: [PATCH] Use python 2.6 + +--- + configure | 15 ++++++++------- + configure.in | 3 ++- + telepathy-sunshine | 2 +- + 3 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/configure b/configure +index 6a9f419..53dde0c 100755 +--- a/configure ++++ b/configure +@@ -2177,15 +2177,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + ++ + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5 +-$as_echo_n "checking whether $PYTHON version >= 2.5... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.6" >&5 ++$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; } + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros + # because we need at least 4 digits for the hex conversion. + # map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0] ++minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] + minverhex = 0 + # xrange is not present in Python 3.0 and range returns an iterator + for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +@@ -2204,19 +2205,19 @@ fi + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.5" >&5 +-$as_echo_n "checking for a Python interpreter with version >= 2.5... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.6" >&5 ++$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; } + if test "${am_cv_pathless_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do ++ for am_cv_pathless_PYTHON in python2.6 python none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros + # because we need at least 4 digits for the hex conversion. + # map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0] ++minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] + minverhex = 0 + # xrange is not present in Python 3.0 and range returns an iterator + for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +diff --git a/configure.in b/configure.in +index 4077b0d..e3f8931 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,8 @@ + AC_INIT(telepathy-sunshine, 0.1.8) + AM_INIT_AUTOMAKE + +-AM_PATH_PYTHON(2.5) ++m4_define([_AM_PYTHON_INTERPRETER_LIST],[python2.6 python]) ++AM_PATH_PYTHON(2.6) + + AC_OUTPUT([ + Makefile +diff --git a/telepathy-sunshine b/telepathy-sunshine +index 40d401d..0594140 100755 +--- a/telepathy-sunshine ++++ b/telepathy-sunshine +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2.6 + + import gobject + import dbus.glib