--- telepathy-ring-2.1.0.orig/debian/telepathy-ring-dbg.links +++ telepathy-ring-2.1.0/debian/telepathy-ring-dbg.links @@ -0,0 +1 @@ +usr/share/doc/telepathy-ring usr/share/doc/telepathy-ring-dbg --- telepathy-ring-2.1.0.orig/debian/compat +++ telepathy-ring-2.1.0/debian/compat @@ -0,0 +1 @@ +5 --- telepathy-ring-2.1.0.orig/debian/changelog +++ telepathy-ring-2.1.0/debian/changelog @@ -0,0 +1,12 @@ +telepathy-ring (2.1.0-1ubuntu1) quantal; urgency=low + + * debian/patches/only-include-glib.h.patch: + Include only instead of individual header files (closes: #665616). + + -- Michael Bienia Mon, 01 Oct 2012 19:48:54 +0200 + +telepathy-ring (2.1.0-1) unstable; urgency=low + + * Initial packaging. + + -- Jonny Lamb Mon, 29 Nov 2010 18:29:00 +0000 --- telepathy-ring-2.1.0.orig/debian/watch +++ telepathy-ring-2.1.0/debian/watch @@ -0,0 +1,4 @@ +version=3 +http://telepathy.freedesktop.org/releases/telepathy-ring/telepathy-ring-(.*)\.tar\.gz \ +debian \ +uupdate --- telepathy-ring-2.1.0.orig/debian/telepathy-ring.install +++ telepathy-ring-2.1.0/debian/telepathy-ring.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/telepathy +debian/tmp/usr/share/dbus-1 +debian/tmp/usr/share/telepathy/managers --- telepathy-ring-2.1.0.orig/debian/copyright +++ telepathy-ring-2.1.0/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Jonny Lamb on +Mon, 29 Nov 2010 14:15:54 +0000. + +It was downloaded from: +http://telepathy.freedesktop.org/releases/telepathy-ring/ + +The main parts of telepathy-ring are: + +Copyright Holder: + * Copyright (C) 2005-2010 Collabora Ltd. + * Copyright (C) 2005-2010 Nokia Corporation + + 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'. --- telepathy-ring-2.1.0.orig/debian/rules +++ telepathy-ring-2.1.0/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 +include /usr/share/cdbs/1/rules/utils.mk + +# List any files which are not installed, except for the useless .la files +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-ring-dbg := --no-act +DEB_INSTALL_CHANGELOGS_telepathy-ring-dbg := --no-act + +include $(CURDIR)/debian/update-patches.mk --- telepathy-ring-2.1.0.orig/debian/control +++ telepathy-ring-2.1.0/debian/control @@ -0,0 +1,41 @@ +Source: telepathy-ring +Section: net +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Telepathy maintainers +Uploaders: Jonny Lamb +Build-Depends: cdbs, + debhelper (>= 5), + libglib2.0-dev (>= 2.4), + check, + libdbus-1-dev (>= 0.60), + libdbus-glib-1-dev (>= 0.88), + uuid-dev, + libtelepathy-glib-dev (>= 0.11.11), + python, + xsltproc +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-ring.git +Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-ring.git +Homepage: http://telepathy.freedesktop.org/wiki/ + +Package: telepathy-ring +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ofono (>= 0.33) +Provides: telepathy-connection-manager +Description: GSM and 3G UMTS Telepathy connection manager + Telepathy-Ring a 3GPP (GSM and 3G UMTS) connection manager for + Telepathy framework using oFono. It supports basic voice calls and + short messages. + +Package: telepathy-ring-dbg +Priority: extra +Section: debug +Architecture: any +Depends: telepathy-ring (= ${binary:Version}), ${misc:Depends} +Description: GSM and 3G UMTS Telepathy connection manager (debug symbols) + Telepathy-Ring a 3GPP (GSM and 3G UMTS) connection manager for + Telepathy framework using oFono. It supports basic voice calls and + short messages. + . + This package contains the debug symbosl for telepathy-ring. --- telepathy-ring-2.1.0.orig/debian/gbp.conf +++ telepathy-ring-2.1.0/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-ring-2.1.0.orig/debian/README.source +++ telepathy-ring-2.1.0/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-ring + cd telepathy-ring + 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-ring + cd telepathy-ring + 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-ring-0.2.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-ring.git + git fetch + git checkout debian-patches + git cherry-pick xxxxxxxxxxxxxx + git checkout debian + fakeroot debian/rules update-patches --- telepathy-ring-2.1.0.orig/debian/update-patches.mk +++ telepathy-ring-2.1.0/debian/update-patches.mk @@ -0,0 +1,10 @@ +update-patches: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + git format-patch -N -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-ring-2.1.0.orig/debian/patches/only-include-glib.h.patch +++ telepathy-ring-2.1.0/debian/patches/only-include-glib.h.patch @@ -0,0 +1,15 @@ +## Description: Include only instead of individual header files +## Origin/Author: Michael Bienia +## Bug: Debian bug #665616 +diff -Nur -x '*.orig' -x '*~' telepathy-ring-2.1.0/sms-glib/errors.c telepathy-ring-2.1.0.new/sms-glib/errors.c +--- telepathy-ring-2.1.0/sms-glib/errors.c 2010-06-07 17:43:54.000000000 +0200 ++++ telepathy-ring-2.1.0.new/sms-glib/errors.c 2012-10-01 19:48:51.000000000 +0200 +@@ -22,7 +22,7 @@ + #include "config.h" + + #include +-#include ++#include + + #include + --- telepathy-ring-2.1.0.orig/debian/source/format +++ telepathy-ring-2.1.0/debian/source/format @@ -0,0 +1 @@ +1.0 \ No newline at end of file