debian/0000755000000000000000000000000012167047643007200 5ustar debian/compat0000644000000000000000000000000211460140666010370 0ustar 6 debian/patches/0000755000000000000000000000000011460144576010625 5ustar debian/patches/1001_danish_l10n.patch0000644000000000000000000000251211460144576014407 0ustar --- /dev/null +++ b/po/da.po @@ -0,0 +1,58 @@ +# Translation into danish of Sugar Chat activity +# Copyright (C) 2008 Jonas Smedegaard +# This file is distributed under the same license as the Sugar package. +# Jonas Smedegaard , 2008. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Sugar Chat activity 35\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-12-23 20:36+0000\n" +"PO-Revision-Date: 2008-02-26 17:45+0100\n" +"Last-Translator: Jonas Smedegaard \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: activity/activity.info:2 +msgid "Chat" +msgstr "Snak" + +#: activity.py:26 +#, python-format +msgid "%s Source" +msgstr "%s kilde" + +#: pippy_app.py:84 +msgid "Off-line" +msgstr "Passiv" + +#: pippy_app.py:84 +msgid "Share, or invite someone." +msgstr "Del, eller invitér nogen." + +#: pippy_app.py:93 +msgid "On-line" +msgstr "Aktiv" + +#: pippy_app.py:93 +msgid "Connected" +msgstr "Forbundet" + +#: pippy_app.py:134 +msgid "joined the chat" +msgstr "har tilslut sig snakken" + +#: pippy_app.py:145 +msgid "left the chat" +msgstr "har forladt snakken" + +#: pippy_app.py:156 +msgid "is here" +msgstr "er her" + +#: pippy_app.py:452 +msgid "Copy to Clipboard" +msgstr "Kopiér til udklipsholder" debian/patches/README0000644000000000000000000000021111460140666011473 0ustar 0xxx: Grabbed from upstream development. 1xxx: Possibly relevant for upstream adoption. 2xxx: Only relevant for official Debian release. debian/patches/series0000644000000000000000000000002711460140666012035 0ustar 1001_danish_l10n.patch debian/rules0000755000000000000000000000355412167047620010262 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2008-2009 Jonas Smedegaard # Description: Main Debian packaging script for Chat # # 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, see . DEB_PYTHON2_MODULE_PACKAGES = sugar-chat-activity-0.84 DEB_SUGAR_BRANCHES = 0.84 include /usr/share/cdbs/1/rules/upstream-tarball.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/python-sugar.mk include /usr/share/cdbs/1/rules/debhelper.mk # Suppress unneeded auto-resolved build-dependency on python-dev CDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version) DEB_UPSTREAM_PACKAGE = Chat DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/fructose/$(DEB_UPSTREAM_PACKAGE) DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 DEB_UPSTREAM_TARBALL_MD5 = 8926e848ff40e178a47de49ac6049b1f # Needed (always/often) at runtime CDBS_DEPENDS = $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit) CDBS_DEPENDS += , python-hippocanvas, python-telepathy, python-gtk2, python-cjson CDBS_RECOMMENDS = $(call cdbs_sugar_anybranchdeps,sugar) # Ensure only one variant is installed at a time (Debian Policy 7.6.2) CDBS_PROVIDES = $(DEB_SUGAR_SOURCE_PKGBASE) CDBS_CONFLICTS = $(DEB_SUGAR_SOURCE_PKGBASE) CDBS_REPLACES = $(DEB_SUGAR_SOURCE_PKGBASE) debian/control0000644000000000000000000000317112167047522010601 0ustar Source: sugar-chat-activity-0.84 Section: x11 Priority: optional Maintainer: Debian OLPC Uploaders: Jonas Smedegaard Build-Depends: cdbs (>= 0.4.90~), devscripts (>= 2.10.7~), debhelper (>= 6), dh-buildinfo, python (>= 2.6.6-3~), python-sugar-0.84, python-sugar-toolkit-0.84, unzip Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-chat-activity.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-chat-activity.git;a=shortlog;h=refs/heads/master-0.84 Homepage: http://wiki.laptop.org/go/Chat Package: sugar-chat-activity-0.84 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: chat activity for the Sugar graphical shell 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 Chat activity, providing a simple interface for collaborative discussion, be it between two individuals or among a group as large as an entire classroom. While a lightweight and "impermanent" chat will be provided in a layer above all activities and the various mesh levels, this activity devoted to textual communication will keep detailed records of the conversation within the journal and provide a means of searching through the conversation to locate important comments. debian/stamps-configure/0000755000000000000000000000000011437257031012457 5ustar debian/changelog0000644000000000000000000002356112167047643011061 0ustar sugar-chat-activity-0.84 (65-5.1) unstable; urgency=low * Non-maintainer upload. * Convert to dh_python2 (Closes: #617086). -- Luca Falavigna Tue, 09 Jul 2013 19:59:49 +0200 sugar-chat-activity-0.84 (65-5) 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. * Update README.source to not mention quilt: Source format 3.0 use it internally, but there it is standard and thus need no mention here. * Refer to FSF website (not postal address) in rules file licensing header. * Suppress unneeded auto-resolved build-dependency on python-dev. -- Jonas Smedegaard Fri, 22 Oct 2010 01:17:43 +0200 sugar-chat-activity-0.84 (65-4) unstable; urgency=low * Drop no longer used pkgbase variable in debian/rules. * Update python-sugar.mk to replace superfluous COPYING files with symlinks. * Drop all local CDBS snippets: included with main cdbs package now. * Switch to source format "3.0 (quilt)". * Drop patchsys-quilt.mk snippet: superfluous with source format "3.0 (quilt)". * Refresh patch. * Drop build-dependencies on quilt and patchutils. * Relax build-dependencies on python-central and python-dev. * Relax build-dependency on devscripts slightly, to ease backporting. * Tighten build-dependency on cdbs. * Include debhelper.mk (do not rely on python-sugar.mk including it). * Bump standards-version to 3.8.4. * Update copyright file: + Reformat to conform to draft DEP5 rev. 135. + Add GPL disclaimers. + Adjust years for debian/*. -- Jonas Smedegaard Tue, 30 Mar 2010 23:31:59 +0200 sugar-chat-activity-0.84 (65-3) unstable; urgency=low * Use branch shortlog in Vcs-Browser stanza. * Update CDBS snippets: + Fix copyright years. + Fix use underscore (not dash) for internal variables. + Fix build-depend unversioned on python-sugar-toolkit, to allow branched packages. + Fix include branched activities in python-sugar.mk. + Build-depend branched/unbranched on python-sugar-toolkit based on new variable DEB_SUGAR_BRANCHES in python-sugar.mk. * Fix build-depend on branched python-sugar-toolkit. * Update debian/copyright: Adjust copyright years. -- Jonas Smedegaard Sat, 19 Sep 2009 11:58:09 +0200 sugar-chat-activity-0.84 (65-2) unstable; urgency=low * Add note on OLPC origin in long description. * Update debian/control format to DEP5 rev54. * Bump up policy compliance to standards version 3.8.3. * Append major version (0.84) to binary and source package. * Provide, conflict with and replace unbranched package. * Set versioned upstream and debian branches in gbp.conf. * 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. * Fix double build-dependency on cdbs. * Disable watch file. Add note on lack of upstream namespace. -- Jonas Smedegaard Fri, 11 Sep 2009 22:01:22 +0200 sugar-chat-activity (65-1) unstable; urgency=low * New upstream release. * Update dependencies: + Handle binary (not only source) dependencies in rules file + Tighten Sugar-related dependencies to 0.84 branch + Depend on python-cjson * 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 + Internal rewrite of upstream-tarball.mk * Add git-buildpackage configfile, enabling signed tags and use of pristine-tar. * Use sugarlabs.org (not laptop.org) as upstream URLs. * Update debian/copyright: + Rewrite to use DEP5 r48 proposed machine-readable format + Fix copyright years * Bump policy compliance to Standards-Version 3.8.1. -- Jonas Smedegaard Sat, 30 May 2009 12:48:40 +0200 sugar-chat-activity (48-2) unstable; urgency=low * Adjust upstream source in debian/copyright and in watch file. -- Jonas Smedegaard Thu, 04 Dec 2008 04:06:54 +0100 sugar-chat-activity (48-1) unstable; urgency=low * New Upstream Version * Depend on ${misc:Depends}. * Update local CDBS snippets: + python-sugar.mk: Install into right path. Closes: bug#507326. + python-sugar.mk: Install as non-localized activity name. + python-sugar.mk: Dynamically update locale entries in MANIFEST. * Semi-auto-update debian/control to tighten build-dependencies. -- Jonas Smedegaard Thu, 04 Dec 2008 03:15:19 +0100 sugar-chat-activity (45-1) unstable; urgency=low * New upstream release. * Install setup.py again (does no harm, and simplifies our rules). * 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. + Update README.cdbs-tweaks. * Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis). -- Jonas Smedegaard Sat, 16 Aug 2008 21:48:48 +0200 sugar-chat-activity (41-1) unstable; urgency=low * New upstream release. * Fix upstream URL in debian/copyright to point to Chat (not Journal). * Update local cdbs snippets: + Fix python-sugar.mk to work with recent python-sugar-toolkit where MANIFEST files are ignored and an internal hardcoded exception list is used instead. Tighten build-dependency. Drop use of (now irrelevant) DEB_PYTHON_SUGAR_MANIFEST. + Relax copyright-check to only warn about its discoveries. Closes: bug#486961. * Update debian/copyright-hints. * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Fri, 20 Jun 2008 19:42:34 +0200 sugar-chat-activity (40-1) unstable; urgency=low * New upstream release. * Drop patch 0001 applied upstream. * Fix upstream URL in watch file. * Update debian/copyright: + Add URL to upstream tarball source. + Use exact URL for upstream Git source. + Reorganize to only mention each license once. * Update local cdbs snippets: + Use upstream-tarball.mk to track upstream source releases. + Adjust dependency cleanup (upstream-tarball.mk needs newer cdbs). * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Mon, 09 Jun 2008 13:28:57 +0200 sugar-chat-activity (37~git-6) unstable; urgency=low * Update cdbs tweaks: + Relax python-sugar-toolkit build-dependency in python-sugar.mk to ease backports. -- Jonas Smedegaard Sat, 26 Apr 2008 01:19:38 +0200 sugar-chat-activity (37~git-5) unstable; urgency=low * Update cdbs tweaks: + Clean *.xo and locale in python-sugar.mk (based on initial work by Santiago Ruano Rincón). + Fix preserve upstream MANIFEST files only once in python-sugar.mk. + Support multiple activity packages from one source in python-sugar.mk. + Tighten python-sugar.mk build-dependency on python-sugar-toolkit to versions properly installing zip-based bundles (*.xo files). * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Fri, 25 Apr 2008 16:58:23 +0200 sugar-chat-activity (37~git-4) unstable; urgency=low * Update cdbs tweaks: + Update copyright-check cdbs snippet to store newline-delimited hints and strip any non-printable characters. Update copyright-hints. + Drop wget options broken with recent versions of wget in update-tarball.mk. * Bump debhelper compatibility level to version 6. * 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 09:40:55 +0200 sugar-chat-activity (37~git-3) unstable; urgency=low * Updated patch 1001 (danish locale). -- Jonas Smedegaard Sat, 19 Apr 2008 12:07:24 +0200 sugar-chat-activity (37~git-2) unstable; urgency=low * Avoid installing setup.py. * Update local cdbs snippets: + Use full path in python-sugar.mk, and tighten python-sugar-toolkit build-dependency to at least 0.79.2 changing this. + Fix simultanously setting DEB_PYTHON_SUGAR_MANIFEST and DEB_PYTHON_SUGAR_MANIFEST_REGEX in python-sugar.mk. + Relax python-central and python-support build-dependencies in python-sugar.mk. * Semi-auto-update debian/control to update build-dependencies: DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -- Jonas Smedegaard Thu, 17 Apr 2008 21:27:09 +0200 sugar-chat-activity (37~git-1) unstable; urgency=low * New upstream (Git-based) release. Highlights: + UI Change: Merge multiple sequential messages from same author + Updated translation: ar + Fix RTL message alignment This is first official release. Closes: bug#444021. * Add patch 0001 to sync with upstream Git as of today. Highlights: + Updated translation: zh_TW -- Jonas Smedegaard Mon, 07 Apr 2008 18:32:50 +0200 sugar-chat-activity (35~git.20080326-1) UNRELEASED; urgency=low * Initial release. -- Jonas Smedegaard Wed, 26 Mar 2008 16:24:39 +0100 debian/pycompat0000644000000000000000000000000211460140666010741 0ustar 2 debian/control.in0000644000000000000000000000304011460144711011172 0ustar Source: sugar-chat-activity-0.84 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-chat-activity.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-chat-activity.git;a=shortlog;h=refs/heads/master-0.84 Homepage: http://wiki.laptop.org/go/Chat XS-Python-Version: all Package: sugar-chat-activity-0.84 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: chat activity for the Sugar graphical shell 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 Chat activity, providing a simple interface for collaborative discussion, be it between two individuals or among a group as large as an entire classroom. While a lightweight and "impermanent" chat will be provided in a layer above all activities and the various mesh levels, this activity devoted to textual communication will keep detailed records of the conversation within the journal and provide a means of searching through the conversation to locate important comments. debian/gbp.conf0000644000000000000000000000024211460144576010613 0ustar # Configuration file for git-buildpackage and friends [DEFAULT] upstream-branch = upstream-0.84 debian-branch = master-0.84 pristine-tar = True sign-tags = True debian/copyright_hints0000644000000000000000000000544011460144773012340 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: ./po/Chat.pot, ./po/af.po, ./po/am.po, ./po/ar.po, ./po/ay.po, ./po/bg.po, ./po/bi.po, ./po/bn.po, ./po/bn_IN.po, ./po/ca.po, ./po/cpp.po, ./po/cs.po, ./po/dz.po, ./po/el.po, ./po/en.po, ./po/en_US.po, ./po/es.po, ./po/fa.po, ./po/fa_AF.po, ./po/ff.po, ./po/fi.po, ./po/gu.po, ./po/ha.po, ./po/he.po, ./po/hi.po, ./po/ht.po, ./po/hu.po, ./po/ig.po, ./po/is.po, ./po/it.po, ./po/ja.po, ./po/km.po, ./po/ko.po, ./po/mi.po, ./po/mk.po, ./po/ml.po, ./po/mn.po, ./po/mr.po, ./po/ms.po, ./po/mvo.po, ./po/nb.po, ./po/ne.po, ./po/pa.po, ./po/pap.po, ./po/pis.po, ./po/pl.po, ./po/ps.po, ./po/pt.po, ./po/qu.po, ./po/ro.po, ./po/ru.po, ./po/rw.po, ./po/sd.po, ./po/si.po, ./po/sk.po, ./po/sl.po, ./po/sv.po, ./po/sw.po, ./po/te.po, ./po/th.po, ./po/tpi.po, ./po/tr.po, ./po/ug.po, ./po/ur.po, ./po/vi.po, ./po/wa.po, ./po/yo.po Copyright: YEAR THE PACKAGE'S HOLDER License: UNKNOWN FIXME Files: ./AUTHORS, ./MANIFEST, ./NEWS, ./activity/activity-icon.svg, ./activity/activity.info, ./debian/README.source, ./debian/compat, ./debian/control, ./debian/control.in, ./debian/gbp.conf, ./debian/patches/README, ./debian/patches/series, ./debian/pycompat, ./debian/source/format, ./debian/source/local-options, ./debian/watch, ./po/de.po, ./po/zh_CN.po, ./po/zh_TW.po Copyright: *No copyright* License: UNKNOWN FIXME Files: ./activity.py, ./pippy_app.py Copyright: 2007-2008, One Laptop Per Child License: GPL-2+ FIXME Files: ./debian/patches/1001_danish_l10n.patch, ./po/da.po Copyright: 2008, Jonas Smedegaard License: UNKNOWN FIXME Files: ./debian/rules Copyright: 2008-2009, 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: ./setup.py Copyright: 2006, Red Hat, Inc License: GPL-2+ FIXME Files: ./po/pseudo.po Copyright: License: UNKNOWN FIXME Files: ./po/fr.po Copyright: 2007 la discussion" License: UNKNOWN FIXME Files: ./po/nl.po Copyright: YEAR THE PACKAGE'S HOLDER chat" License: UNKNOWN FIXME Files: ./po/pt_BR.po Copyright: YEAR THE PACKAGE'S HOLDER exata, mas parece ser a melhor para dizer se o utilizador está ligado a uma rede (network) ou não pq. se pode ver o codigo-fonte do chat no pippy, pq ele foi feito pelo pippy. Acho que deverá ficar "Fonte de Bate-Papo" License: UNKNOWN FIXME debian/copyright0000644000000000000000000000251111460140666011124 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 Name: Chat Maintainer: Sugarlabs http://lists.sugarlabs.org/listinfo/sugar-devel irc://irc.freenode.net/sugar Source: http://download.sugarlabs.org/sources/sucrose/fructose/Chat/ git://git.sugarlabs.org/chat/mainline Copyright: 2007-2008, One Laptop Per Child License: GPL-2+ Files: ./setup.py Copyright: 2006, Red Hat, Inc. License: GPL-2+ 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 . debian/source/0000755000000000000000000000000011460144660010470 5ustar debian/source/format0000644000000000000000000000001411460140666011700 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000034011460144576010224 0ustar # run the "uscan" command to check for upstream updates and more. version=3 # Disabled: upstream left no room for updates targeted 0.84 branch #http://download.sugarlabs.org/sources/sucrose/fructose/Chat/Chat-(.*)\.tar\.bz2 debian/README.source0000644000000000000000000000701211460144732011347 0ustar Building this package for Debian -------------------------------- This source package need no special handling for normal package 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