debian/0000755000000000000000000000000012167053152007170 5ustar debian/compat0000644000000000000000000000000211455036003010361 0ustar 6 debian/rules0000755000000000000000000000461312167053221010251 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2008-2010 Jonas Smedegaard # Description: Main Debian packaging script for sugar-presence-service # # This program 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, or (at # your option) any later version. # # This program 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 program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. DEB_BUILDDIR = build DEB_PYTHON2_MODULE_PACKAGES = sugar-presence-service-0.88 include /usr/share/cdbs/1/rules/upstream-tarball.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/python-autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk # Suppress unneeded auto-resolved build-dependency on python-dev CDBS_BUILD_DEPENDS_class_python-autotools_python = python$(cdbs_python_nondefault_version) pkgbase = sugar-presence-service pkgbranch = 0.88 pkg = $(pkgbase)-$(pkgbranch) DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE:%-$(pkgbranch)=%) DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/glucose/$(DEB_UPSTREAM_PACKAGE) DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 DEB_UPSTREAM_TARBALL_MD5 = f50a666c4e1f55b8fc7650258da0c539 DEB_MAKE_CHECK_TARGET = check # Needed by upstream unittests # openssh-client contains ssh-keygen # pygtk << 2.9 contained gobject CDBS_BUILD_DEPENDS += , python-dbus, python-gobject | python-gtk2 (<< 2.9), openssh-client # Needed (always/often) at runtime # net-tools (route) needed as fallback for NetworkManager 0.7 CDBS_DEPENDS_DEFAULT = python-sugar-toolkit-$(pkgbranch) CDBS_DEPENDS_DEFAULT += , python-gobject, python-dbus (>= 0.82.0), python-telepathy CDBS_DEPENDS_DEFAULT += , telepathy-gabble, telepathy-salut, net-tools CDBS_RECOMMENDS_DEFAULT = sugar-$(pkgbranch), avahi-daemon, network-manager (>= 0.7) # Ensure only one variant is installed at a time (Debian Policy 7.6.2) CDBS_PROVIDES_DEFAULT = $(pkgbase) CDBS_CONFLICTS_DEFAULT = $(pkgbase) CDBS_REPLACES_DEFAULT = $(pkgbase) debian/control0000644000000000000000000000230012167053206010566 0ustar Source: sugar-presence-service-0.88 Section: x11 Priority: optional Maintainer: Debian OLPC Uploaders: Jonas Smedegaard Build-Depends: devscripts (>= 2.10.7~), cdbs (>= 0.4.90~), python (>= 2.6.6-3~), debhelper (>= 6), dh-buildinfo, python-dbus, python-gobject | python-gtk2 (<< 2.9), openssh-client Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-presence-service Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-presence-service.git;a=shortlog;h=refs/heads/master-0.88 Homepage: http://wiki.sugarlabs.org/go/Sugar Package: sugar-presence-service-0.88 Architecture: all Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends} Recommends: ${cdbs:Recommends} Provides: ${python:Provides}, ${cdbs:Provides} Conflicts: ${cdbs:Conflicts} Replaces: ${cdbs:Replaces} Description: Sugar graphical shell - presence service Sugar is a graphical user interface aimed at children. . Originating as intregral part of the OLPC "XO" a.k.a. the $100 laptop, Sugar has since grown into a more widely usable low-ressource desktop environment for kids. . This package contains the presence service. debian/changelog0000644000000000000000000002363212167053147011054 0ustar sugar-presence-service-0.88 (0.88.0-3.1) unstable; urgency=low * Non-maintainer upload. * Convert to dh_python2 (Closes: #617105). -- Luca Falavigna Tue, 09 Jul 2013 20:28:35 +0200 sugar-presence-service-0.88 (0.88.0-3) unstable; urgency=low * Ease building with git-buildpackage: Git-ignore quilt .pc dir, and add source local-options. * Bump Policy compliance to standards-version 3.9.1. * Append _DEFAULT to deprecated CDBS variables in rules file. * Shorten Vcs-Git stanza. -- Jonas Smedegaard Tue, 12 Oct 2010 14:58:57 +0200 sugar-presence-service-0.88 (0.88.0-2) unstable; urgency=low * Improve copyright file: + Fix replace license section MIT with Expat and other-X. + Add comment on Expat variation. + Rename and tighten other-GAP-* sections. * Suppress unneeded auto-resolved build-dependency on python-dev. * Bump Policy compliance to standards-version to 3.9.0. * Branch off upstream 0.88 branch in git: Update Vcs-Browser stanza and git-buildpackage config. * Tighten watch file to track only 0.88 branch. -- Jonas Smedegaard Wed, 21 Jul 2010 12:06:02 +0200 sugar-presence-service-0.88 (0.88.0-1) unstable; urgency=low * New upstream stable release. * Drop all local CDBS snippets: included with main cdbs package now. * Switch to source format "3.0 (quilt)". * Relax build-dependencies on python-central and python-dev. * Relax build-dependency on devscripts slightly, to ease backporting. * Tighten build-dependency on cdbs. * Add git-buildpackage hint about use of bzip2-compressed tarballs. * Bump standards-version to 3.8.4. * Update copyright file: + Reformat to conform to draft DEP5 rev. 135. + Add GPL disclaimers. + Adjust some years. -- Jonas Smedegaard Tue, 30 Mar 2010 19:22:10 +0200 sugar-presence-service-0.88 (0.87.1-1) unstable; urgency=low * New upstream development release. * Switch packaging to branch 0.88. -- Jonas Smedegaard Tue, 01 Dec 2009 16:01:15 +0100 sugar-presence-service-0.86 (0.86.0-1) unstable; urgency=low * New upstream stable release. -- Jonas Smedegaard Fri, 02 Oct 2009 11:31:06 +0200 sugar-presence-service-0.86 (0.85.3-1) unstable; urgency=low * New upstream development release. * Update md5sum hint for new upstream v0.85.3 release. -- Jonas Smedegaard Sat, 19 Sep 2009 22:52:09 +0200 sugar-presence-service-0.86 (0.85.2-1) unstable; urgency=low * New upstream development release. * Build-depend on openssh-client (not depend: needed for regression test only). * Depend on net-tools. * Update OLPC relation (now historic) in long description. * Bump up policy compliance to standards version 3.8.3. * Update CDBS snippets: + Enhance package-relations.mk to support all binary package relations (except -indep ones). + Improve package-relation.mk cleanup to cover debhelper 6 and 7, strip more whitespace and cover mixture of unversioned+versioned dependencies. + Silence applying dependencies in package-relation.mk. + Implement fail-source-not-repackaged rule in upstream-tarball.mk. + Update URL to draft DEP5 format in copyright-check.mk output. * Bump binary and source package to major version 0.86. * Relax watch file to track all releases. * Update debian/control format to DEP5 rev54. Include automade files (GPL-2+ or GAP). -- Jonas Smedegaard Fri, 11 Sep 2009 23:45:10 +0200 sugar-presence-service-0.84 (0.84.0-3) unstable; urgency=low * Really provide, conflict with and replace sugar-presence-service. -- Jonas Smedegaard Fri, 29 May 2009 20:38:12 +0200 sugar-presence-service-0.84 (0.84.0-2) unstable; urgency=low * Provide, conflict with and replace sugar-presence-service. -- Jonas Smedegaard Fri, 29 May 2009 20:30:06 +0200 sugar-presence-service-0.84 (0.84.0-1) unstable; urgency=low * New upstream release. * Add README.source (and drop CDBS hints and README.packaging). * Update CDBS snippets: + Minor updates to buildinfo.mk and copyright-check.mk + Enhance package-relations.mk to support all binary package relations (except -indep ones) + Extend package-relation.mk to handle debhelper 6 and 7.0.1 * Add git-buildpackage configfile, enabling signed tags and use of pristine-tar. * Use sugarlabs.org (not laptop.org) as upstream URLs. * Restrict watch file to current stable release (0.84). * Handle binary (not only source) dependencies in rules file. * Append major version (0.84) to binary and source package. * Update debian/copyright: + Rewrite to use DEP5 r48 proposed machine-readable format + Add/update authors of files below debian/* (no new licenses) + Merge copyright entries with only differing years. * Bump policy compliance to Standards-Version 3.8.1. * Stop depending on unneeded telepathy-stream-engine. Closes: bug#526891, thanks to Sjoerd Simons. * Recommend recent network-manager. -- Jonas Smedegaard Fri, 29 May 2009 19:55:16 +0200 sugar-presence-service (0.82.2-1) unstable; urgency=low * New upstream release. * Depend on ${misc:Depends}. * Update cdbs snippets: + Run dh_py* scripts before dh_installinit in python-autotools.mk (see bug#494288) + Cleanup check stamp dir for flavored builds in makefile.mk, fixing failure to build twice in a row. + Compact simple licenses too (those without ' or later') in copyright-check.mk + Various improvements to update-tarball.mk (none important here) -- Jonas Smedegaard Tue, 11 Nov 2008 17:26:46 +0100 sugar-presence-service (0.82.0-1) unstable; urgency=low * New upstream release. * Update cdbs snippets: + Move dependency cleanup to new local snippet package-relations.mk. + Update copyright-check output to more closely match proposed new copyright file format. Update copyright-hints. + Internal restructuring of flavor-enhanced autotools- and makefile- snippets. + Update README.cdbs-tweaks. * Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis). -- Jonas Smedegaard Sat, 16 Aug 2008 20:30:08 +0200 sugar-presence-service (0.81.2-1) unstable; urgency=low * New upstream release. * Update local cdbs snippets: + Relax copyright-check to only warn about its discoveries. Closes: bug#486999. * Update debian/copyright-hints. -- Jonas Smedegaard Sat, 21 Jun 2008 01:27:39 +0200 sugar-presence-service (0.81.1-1) unstable; urgency=low * New upstream release. * Reorganize debian/copyright to only mention each license once. -- Jonas Smedegaard Mon, 09 Jun 2008 12:43:04 +0200 sugar-presence-service (0.79.3-2) unstable; urgency=low * Have python-gobject build-dependency fallback to python-gtk2 older than 2.9 (it provided gobject back then). -- Jonas Smedegaard Thu, 24 Apr 2008 12:10:02 +0200 sugar-presence-service (0.79.3-1) unstable; urgency=low * New upstream release. Highlights: + always reset the reconnect timer when disconnected * Bump debhelper compatibility level to 6 (was 5). * Update local cdbs snippets: + Relax python-central and python-support build-dependencies in python-autotools.mk. + Strip any non-printable characters in copyright-check.mk. * Mention exact upstream Git source in debian/copyright. * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Thu, 24 Apr 2008 11:50:22 +0200 sugar-presence-service (0.79.2-1) unstable; urgency=low * New upstream release. * Update local cdbs snippets: + Update copyright-check cdbs snippet to store newline-delimited hints. Update hints. + Drop wget options broken with recent versions of wget in update-tarball.mk. -- Jonas Smedegaard Tue, 08 Apr 2008 05:02:41 +0200 sugar-presence-service (0.79.0-4) unstable; urgency=low * Update CDBS tweaks: + Add local python-autotools.mk (and drop py-compile.mk). + Update python-vars.mk and makefile.mk for improved DEB_*PACKAGES and build-dependency resolving. + Cosmetic updates to README.cdbs-tweaks. * Fix email address of OLPC Alioth team. * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Sun, 16 Mar 2008 13:52:04 +0100 sugar-presence-service (0.79.0-3) unstable; urgency=low * Pass over maintenance of the package to the OLPC team: Change Maintainer, and add myself to Uploaders. * Build-depend on python-all-dev (not python-dev). * Fix README.packaging to use "pull; fetch --tags" (not "pull -t"). * Depend on python-sugar-toolkit (not sugar-toolkit). * Update CDBS tweaks: + Add local py-compile.mk and python-vars.mk to handle autotools- based Python compilation. + Add local autotools.mk, autotools-vars.mk, makefile.mk and makefile-vars.mk providing multi-flavor build support needed by py-compile.mk. + README.cdbs-tweaks updated to mention the above. * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Fri, 14 Mar 2008 12:43:27 +0100 sugar-presence-service (0.79.0-2) unstable; urgency=low * Build binary package as arch-all. * Depend on python-gobject, python-dbus (new enough for reliable PS), python-telepathy, sugar-toolkit, telepathy-gabble, telepathy-salut, telepathy-stream-engine and openssh-client. * Recommend sugar and avahi-daemon. * Fix watch file. -- Jonas Smedegaard Tue, 11 Mar 2008 02:59:38 +0100 sugar-presence-service (0.79.0-1) unstable; urgency=low * Initial release. Closes: bug#444021. -- Jonas Smedegaard Sat, 08 Mar 2008 21:51:42 +0100 debian/control.in0000644000000000000000000000213011455055551011200 0ustar Source: sugar-presence-service-0.88 Section: x11 Priority: optional Maintainer: Debian OLPC Uploaders: Jonas Smedegaard Build-Depends: @cdbs@ Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-presence-service Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-presence-service.git;a=shortlog;h=refs/heads/master-0.88 Homepage: http://wiki.sugarlabs.org/go/Sugar XS-Python-Version: all Package: sugar-presence-service-0.88 Architecture: all Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends} Recommends: ${cdbs:Recommends} Provides: ${python:Provides}, ${cdbs:Provides} Conflicts: ${cdbs:Conflicts} Replaces: ${cdbs:Replaces} XB-Python-Version: ${python:Versions} Description: Sugar graphical shell - presence service Sugar is a graphical user interface aimed at children. . Originating as intregral part of the OLPC "XO" a.k.a. the $100 laptop, Sugar has since grown into a more widely usable low-ressource desktop environment for kids. . This package contains the presence service. debian/gbp.conf0000644000000000000000000000031211455055434010607 0ustar # Configuration file for git-buildpackage and friends [DEFAULT] upstream-branch = upstream-0.88 debian-branch = master-0.88 pristine-tar = True sign-tags = True [git-buildpackage] compression = bzip2 debian/copyright_hints0000644000000000000000000000524211455055605012337 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 X-Draft: Autogenerated by CDBS snippet copyright-check.mk Files: ./Makefile.am, ./NEWS, ./configure.ac, ./debian/README.source, ./debian/compat, ./debian/control, ./debian/control.in, ./debian/gbp.conf, ./debian/pycompat, ./debian/source/format, ./debian/source/local-options, ./debian/watch, ./src/Makefile.am, ./src/__init__.py, ./src/config.py, ./src/config.py.in, ./src/test_psutils.py Copyright: *No copyright* License: UNKNOWN FIXME Files: ./src/activity.py, ./src/buddy.py, ./src/buddyiconcache.py, ./src/linklocal_plugin.py, ./src/server_plugin.py, ./src/telepathy_plugin.py Copyright: 2007, Collabora Ltd 2007, Red Hat, Inc License: GPL-2+ FIXME Files: ./src/presenceservice.py, ./src/pstest.py Copyright: 2007, Collabora Ltd. 2007, Red Hat, Inc License: GPL-2+ FIXME Files: ./src/main.py, ./src/sugar-presence-service.in Copyright: 2006, Red Hat, Inc 2008, Red Hat, Inc License: GPL-2+ FIXME Files: ./Makefile.in, ./src/Makefile.in Copyright: 1994-2002 License: UNKNOWN FIXME Files: ./aclocal.m4, ./configure Copyright: 1992-1996, 1998-2001 1996, 1998, 2000-2005, 2008 1996-1997, 2000-2001, 2003, 2005, 2008 1996-2004, 1997, 1999-2001, 2003-2005, 2008 1997, 2000-2001, 2003-2006, 2008 1999-2005, 2008-2009, 2001, 2003, 2005, 2008 Free Software Foundation, Inc 2001, 2003, 2005, Free Software Foundation, Inc 2001-2003, 2005, 2008, Free Software Foundation, Inc 2002-2003, 2005-2008, Free Software Foundation, Inc 2003, 2005 Free Software Foundation, Inc 2003-2006, Free Software Foundation, Inc 2004-2005, Free Software Foundation, Inc 2006, 2008 Free Software Foundation, Inc 2008, Free Software Foundation, Inc License: UNKNOWN FIXME Files: ./missing Copyright: 1996-1997, 1999-2000, 2002-2006 License: GPL FIXME Files: ./py-compile Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software License: GPL FIXME Files: ./debian/rules Copyright: 2008-2010, Jonas Smedegaard License: GPL FIXME Files: ./COPYING Copyright: 1989, 1991 Free Software Foundation, Inc. HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR HOLDERS AND/OR OTHER PARTIES disclaimer" for the program, if holder saying it may be distributed holder who places the Program under this License interest in the program law: the software, and year name of author License: GPL-2+ FIXME Files: ./src/psutils.py Copyright: 2007, Collabora Ltd. 2007, Red Hat, Inc 2008, One Laptop Per Child License: GPL-2+ FIXME Files: ./install-sh Copyright: 1994, X Consortium License: MIT/X11 (BSD like) FIXME debian/copyright0000644000000000000000000001047511455055434011136 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 Name: sugar-presence-service Maintainer: Sugarlabs http://lists.sugarlabs.org/listinfo/sugar-devel irc://irc.freenode.net/sugar Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/ git://git.sugarlabs.org/sugar-presence-service/mainline Copyright: 2007, Red Hat, Inc. 2007, Collabora Ltd. License: GPL-2+ Files: Makefile.in Copyright: 1994-2009, Free Software Foundation, Inc. License: other-GAP-FSF-notice Files: ./missing ./py-compile Copyright: 1996-1997,1999-2006, 2008-2009, Free Software Foundation, Inc. License: GPL-2+ or other-SA-Autoconf Files: ./src/sugar-presence-service.in, ./src/main.py Copyright: 2006,2008, Red Hat, Inc. License: GPL-2+ Files: ./src/psutils.py Copyright: 2007, Red Hat, Inc 2007, Collabora Ltd. 2008, One Laptop Per Child License: GPL-2+ Files: install-sh Copyright: 1994, X Consortium License: Expat and other-X Files: ./configure Copyright: 1992-1996,1998-2008, Free Software Foundation, Inc. License: other-GAP-FSF Files: ./aclocal.m4 Copyright: 1996-2009, Free Software Foundation, Inc. License: other-GAP-FSF-notice Files: ./debian/* Copyright: 2008-2010, Jonas Smedegaard License: GPL-2+ License: GPL-2+ This program 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 program 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. . On Debian systems, the complete text of a recent version of the GNU General Public License (GPL) can be found in the file "/usr/share/common-licenses/GPL". . You should have received a copy of the GNU General Public License along with this program. If not, see . License: other-SA-Autoconf As a special exception to the GNU General Public License, if you distribute this file as part of a program that contains a configuration script generated by Autoconf, you may include it under the same distribution terms that you use for the rest of that program. License: other-GAP-FSF This file is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. . Some files differ from above by replacing "this file" with more specific term. License: other-GAP-FSF-notice This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. . Some files differ from above by replacing "this file" with more specific term. License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. . Some files differ from above by replacing "The authors or copyright holders" with more specific term. License: other-X Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. debian/source/0000755000000000000000000000000011455055470010474 5ustar debian/source/format0000644000000000000000000000001411455036003011671 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000030611455055434010224 0ustar # run the "uscan" command to check for upstream updates and more. version=3 http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-(0\.88\..*)\.tar\.bz2 debian/README.source0000644000000000000000000001473711455036003011356 0ustar Building this package for Debian -------------------------------- This source package uses quilt to apply and remove its patches. Please refer to /usr/share/doc/quilt/README.source for information about how to use quilt for source packages. Developing this package for Debian ---------------------------------- The source of this package is developed using git and the helper tool git-buildpackage, with all official releases tagged and signed and binary diffs of tarballs stored using pristine-tar. This is documented below /usr/share/doc/git-buildpackage/manual-html/ . Upstream development is tracked both in the Git branch "upstream-git" and using upstream tarballs. A custom build target shows current upstream and packaging versions: debian/rules print-version Current upstream tarball can be prepared using this other build target: debian/rules get-orig-source To switch to newer upstream source, first add a dummy changelog entry and comment out DEB_UPSTREAM_TARBALL_MD5 before getting the source: dch -v ${new_upstream_version}-1 "Dummy changelog entry" sed -i -e 's/^\(DEB_UPSTREAM_TARBALL_MD5\b\)/#\1/' debian/rules debian/rules get-orig-source Store new md5sum to help ensure identical source is received later. Before injecting a newer upstream tarball, use below commands to sync with upstream Git, to adopt upstream commit messages and to minimize size of our Git. The following commands updates the local mirror of upstream source: git checkout upstream-git git pull git fetch --tags The following command shows upstream changes possibly relevant to merge or cherry-pick (replace leading "upstream" with "HEAD^" and invoke immediately after syncing to show recently merged changes possibly relevant to mention in our changelog): git log --pretty="format:%h %s" upstream..upstream-git The following commands merges all upstream changes with our packaging branches (to skip newest upstream changes, replace dot in first pull command with either a tag or an explicit commit hash): git checkout upstream git pull . upstream-git git checkout master git pull . upstream If git-import-orig fails complaining about no changes, revert both pulls (using "git reset --hard HEAD^" in both master and upstream branches), and try again skipping the very newest changes to cheat git-import-orig. To do a package release from upstream Git snapshot, first look at upstream development for a good place to release, and tag by its date, replacing "~" with "." to mimic git-buildpackage logic (replace timestamp and commit hash below with real ones based on chosen commit). git log --abbrev-commit upstream-git git tag -s -m "Upstream snapshot" upstream/0.2.git20080130 61279f8 dch -r -v "0.2~git20080130-1" "New upstream Git snapshot." Setting DEB_MAINTAINER_MODE=1 enables additional build routines helpful during development of the package, but unfit for normal builds. This typically includes the CDBS feature of auto-updating debian/control with CDBS-related build-dependencies, which is forbidden by Debian Policy as build environment must not change during automated builds. Developing this package for Debian ---------------------------------- The source of this package is developed using git and the helper tool git-buildpackage, with all official releases tagged and signed and binary diffs of tarballs stored using pristine-tar. This is documented below /usr/share/doc/git-buildpackage/manual-html/ . Upstream development is tracked both in the Git branch "upstream-git" and using upstream tarballs. A custom build target shows current upstream and packaging versions: debian/rules print-version Current upstream tarball can be prepared using this other build target: debian/rules get-orig-source To switch to newer upstream source, first add a dummy changelog entry and comment out DEB_UPSTREAM_TARBALL_MD5 before getting the source: dch -v ${new_upstream_version}-1 "Dummy changelog entry" sed -i -e 's/^\(DEB_UPSTREAM_TARBALL_MD5\b\)/#\1/' debian/rules debian/rules get-orig-source Store new md5sum to help ensure identical source is received later. Before injecting a newer upstream tarball, use below commands to sync with upstream Git, to adopt upstream commit messages and to minimize size of our Git. The following commands updates the local mirror of upstream source: git checkout upstream-git git pull git fetch --tags The following command shows upstream changes possibly relevant to merge or cherry-pick (replace leading "upstream" with "HEAD^" and invoke immediately after syncing to show recently merged changes possibly relevant to mention in our changelog): git log --pretty="format:%h %s" upstream..upstream-git The following commands merges all upstream changes with our packaging branches (to skip newest upstream changes, replace dot in first pull command with either a tag or an explicit commit hash): git checkout upstream git pull . upstream-git git checkout master git pull . upstream If git-import-orig fails complaining about no changes, revert both pulls (using "git reset --hard HEAD^" in both master and upstream branches), and try again skipping the very newest changes to cheat git-import-orig. To do a package release from upstream Git snapshot, first look at upstream development for a good place to release, and tag by its date, replacing "~" with "." to mimic git-buildpackage logic (replace timestamp and commit hash below with real ones based on chosen commit). git log --abbrev-commit upstream-git git tag -s -m "Upstream snapshot" upstream/0.2.git20080130 61279f8 dch -r -v "0.2~git20080130-1" "New upstream Git snapshot." Setting DEB_MAINTAINER_MODE=1 enables additional build routines helpful during development of the package, but unfit for normal builds. This typically includes the CDBS feature of auto-updating debian/control with CDBS-related build-dependencies, which is forbidden by Debian Policy as build environment must not change during automated builds. Maintaining packaging build routines ------------------------------------ This source package wraps debhelper commands and other tedious parts of the build routines using the CDBS framework. Please refer to the actual makefile snippets included from debian/rules for details on their purpose and ways to override defaults. Additionally, makefile snippets included from below /usr/share/cdbs may also be documented in /usr/share/doc/cdbs/cdbs-doc.pdf.gz . -- Jonas Smedegaard Sun, 29 Mar 2009 16:02:47 +0200