--- sugar-web-activity-103.orig/debian/copyright +++ sugar-web-activity-103/debian/copyright @@ -0,0 +1,74 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420 +Upstream-Name: Browse +Upstream-Maintainer: Simon Schampijer +Upstream-Source: http://download.sugarlabs.org/sources/sucrose/Browse/ + git://git.sugarlabs.org/browse/mainline + +Files: * +Copyright: © 2007 One Laptop Per Child +License: GPL-2+ + +Files: browser.py + progresslistener.py + webtoolbar.py +Copyright: 2007, One Laptop Per Child + 2006, Red Hat, Inc +License: GPL-2+ + +Files: setup.py + webactivity.py +Copyright: 2006, Red Hat, Inc +License: GPL-2+ + +Files: edittoolbar.py + palettes.py +Copyright: 2008, One Laptop Per Child +License: GPL-2+ + +Files: globalhistory.py + places.py +Copyright: 2008, Red Hat, Inc +License: GPL-2+ + +Files: model.py +Copyright: 2006-2007, One Laptop Per Child +License: GPL-2+ + +Files: linkbutton.py +Copyright: 2007, One Laptop Per Child +License: LGPL-2+ + +Files: debian/* +Copyright: © 2008 Jonas Smedegaard +License: GPL-2+ + The Debian packaging information is under the GPL, version 2 or later. + +Files: debian/cdbs/1/class/python-sugar.mk + debian/cdbs/1/rules/package-relations.mk +Copyright: 2008, Jonas Smedegaard +License: GPL-2+ + +Files: debian/cdbs/1/class/python-vars.mk +Copyright: 2003,2008, Jonas Smedegaard +License: GPL-2+ + +Files: debian/cdbs/1/rules/buildinfo.mk +Copyright: 2004-2007, Jonas Smedegaard +License: GPL-2+ + +Files: debian/cdbs/1/rules/upstream-tarball.mk +Copyright: 2007-2008, Jonas Smedegaard +License: GPL-2+ + +Files: debian/cdbs/1/rules/copyright-check.mk +Copyright: 2005-2008, Jonas Smedegaard +License: GPL-2+ + +License: GPL-2+ + On Debian GNU systems, the complete text of GNU General Public License + (GPL) version 2 can be found at /usr/share/common-licenses/GPL-2. + +License: LGPL-2+ + On Debian GNU systems, the complete text of GNU Library General Public + License (LGPL) version 2 can be found at + /usr/share/common-licenses/LGPL-2. --- sugar-web-activity-103.orig/debian/changelog +++ sugar-web-activity-103/debian/changelog @@ -0,0 +1,119 @@ +sugar-web-activity (103-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #325248) + * Bump standards version to 3.8.0 (no change) + + -- Morgan Collett Wed, 04 Feb 2009 12:45:36 +0200 + +sugar-web-activity (102-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #311745), remaining changes: + + Replace python-xpcom dependency with xulrunner-1.9 + + -- Iain Lane Sat, 27 Dec 2008 15:23:24 +0000 + +sugar-web-activity (102-1) unstable; urgency=low + + * New upstream release. + * Update CDBS snippets: + + Simplify internal variables + + Ignore no files by default in copyright-check.mk + + Correct and update copyright hints of the snippets themselves + * Update debian/copyright and copyright hints: + + Add info on CDBS snippets (new owners, no new licenses) + + Bump to version 413 of new format (no structural changes) + + Add Simon Schampijer as upstream maintainer. + + Refer to LGPL as "GNU Library..." (not Lesser). + + Refer to "Debian GNU systems" (not only GNU/Linux). + + -- Jonas Smedegaard Fri, 19 Dec 2008 13:26:03 +0100 + +sugar-web-activity (101-1) unstable; urgency=low + + [ Luke Faraone ] + * Fix activity install path. + + [ Jonas Smedegaard ] + * New upstream release. + * Update local CDBS snippets: + + python-sugar.mk: Install into right path. Closes: bug#507330. + + python-sugar.mk: Install as non-localized activity name. + + python-sugar.mk: Dynamically update locale entries in MANIFEST. + + -- Jonas Smedegaard Thu, 04 Dec 2008 04:40:32 +0100 + +sugar-web-activity (100-1) unstable; urgency=low + + * New upstream release. + * Depend on ${misc:Depends}. + * Update copyright hints (no new owners or licenses). + * Update danish (da) locale. + * Fix cdbs snippet python-sugar.mk to install activities below + /usr/share/sugar (not /usr/share). + * Several minor improvements to local cdbs snippet upstream- + tarball.mk. + * Update CDBS snippet copyright-check.mk: Compact simple licenses + (those without ' or later'). + * Update upstream source URL in debian/copyright and watch file. + * Fix Homepage in long description. + * Fix cdbs snippet python-sugar.mk to use --prefix option. Tighten + build-dependency to python-sugar-toolkit since that change. + * Semi-auto-update debian/control to tighten build-dependencies. + * Clean auto-generated MANifEST file. + + -- Jonas Smedegaard Thu, 13 Nov 2008 16:41:21 +0100 + +sugar-web-activity (95-1ubuntu1) intrepid; urgency=low + + * Change dependency from python-xpcom to xulrunner-1.9 (LP: #287745) + + -- Morgan Collett Wed, 22 Oct 2008 21:53:37 +0200 + +sugar-web-activity (95-1) unstable; urgency=low + + * New upstream release. + * Upstream package changed name to Browse (from Web). Update watch + file and cdbs hint for get-orig-source target. + * 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 16:36:09 +0200 + +sugar-web-activity (91-1) unstable; urgency=low + + * New upstream release. + * Update local cdbs snippets: + + Relax copyright-check to only warn about its discoveries. Closes: + bug#486975. + * Update debian/copyright (new files, same owners and licenses). + Update debian/copyright-hints. + + -- Jonas Smedegaard Sat, 21 Jun 2008 02:02:48 +0200 + +sugar-web-activity (89-1) unstable; urgency=low + + * New upstream release. + * Add watch file. + * Update debian/copyright: + + Add URL to upstream tarball source. + + Add a few new files (same owner and license). + * Update local cdbs snippets: + + Use upstream-tarball.mk to track upstream source releases. + + Adjust dependency cleanup (upstream-tarball.mk needs newer cdbs). + + 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. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Wed, 11 Jun 2008 12:39:54 +0200 + +sugar-web-activity (78~git.20080311-1) UNRELEASED; urgency=low + + * Initial release. Closes: bug#444021. + + -- Jonas Smedegaard Mon, 28 Apr 2008 12:22:57 +0200 --- sugar-web-activity-103.orig/debian/copyright_hints +++ sugar-web-activity-103/debian/copyright_hints @@ -0,0 +1,165 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX +Upstream-Name: Untrusted draft - double-check copyrights yourself! + +Files: po/Web.pot + po/af.po + po/am.po + po/ar.po + po/ay.po + po/bg.po + po/bn.po + po/bn_IN.po + po/ca.po + po/dz.po + po/el.po + po/en.po + po/fa.po + po/fa_AF.po + po/ff.po + po/gu.po + po/ha.po + po/hi.po + po/ht.po + po/ig.po + po/is.po + po/it.po + po/ja.po + po/km.po + po/ko.po + po/mk.po + po/ml.po + po/mn.po + po/mr.po + po/mvo.po + po/nb.po + po/ne.po + po/nl.po + po/pa.po + po/pap.po + po/pis.po + po/pl.po + po/ps.po + po/pseudo.po + po/pt_BR.po + po/qu.po + po/ro.po + po/ru.po + po/rw.po + po/sd.po + po/si.po + po/sl.po + po/te.po + po/th.po + po/tpi.po + po/tr.po + po/ur.po + po/vi.po + po/yo.po +Copyright: YEAR THE PACKAGE'S HOLDER +License: UNKNOWN + +Files: AUTHORS + activity/activity-web.svg + activity/activity.info + agent-stylesheet.css + browser.dtd + cert8.db + clickToView.xml + debian/README.cdbs-tweaks + debian/README.packaging + debian/compat + debian/control + debian/control.in + debian/patches/README + debian/patches/series + debian/pycompat + debian/watch + icons/add-link.svg + icons/link.svg + po/de.po + po/zh_CN.po + po/zh_TW.po +Copyright: *No copyright* +License: UNKNOWN + +Files: downloadmanager.py + filepicker.py + messenger.py + promptservice.py + securitydialogs.py + sessionhistory.py + sessionstore.py + viewtoolbar.py +Copyright: 2007, One Laptop Per Child +License: GPL-2+ + +Files: browser.py + progresslistener.py + webtoolbar.py +Copyright: 2007, One Laptop Per Child + 2006, Red Hat, Inc +License: GPL-2+ + +Files: debian/cdbs/1/class/python-sugar.mk + debian/cdbs/1/rules/package-relations.mk +Copyright: 2008, Jonas Smedegaard +License: GPL + +Files: setup.py + webactivity.py +Copyright: 2006, Red Hat, Inc +License: GPL-2+ + +Files: edittoolbar.py + palettes.py +Copyright: 2008, One Laptop Per Child +License: GPL-2+ + +Files: globalhistory.py + places.py +Copyright: 2008, Red Hat, Inc +License: GPL-2+ + +Files: po/es.po + po/pt.po +Copyright: 2007, THE PACKAGE'S HOLDER +License: UNKNOWN + +Files: debian/patches/1001_danish_l10n.patch + debian/rules +Copyright: 2008, Jonas Smedegaard +License: UNKNOWN + +Files: debian/cdbs/1/class/python-vars.mk +Copyright: 2003,2008, Jonas Smedegaard +License: GPL + +Files: debian/cdbs/1/rules/buildinfo.mk +Copyright: 2004-2007, Jonas Smedegaard +License: GPL + +Files: debian/cdbs/1/rules/upstream-tarball.mk +Copyright: 2007-2008, Jonas Smedegaard +License: GPL + +Files: debian/cdbs/1/rules/copyright-check.mk +Copyright: \s*(\S.*?)\s*\ +License: GPL + +Files: model.py +Copyright: 2006-2007, One Laptop Per Child +License: GPL-2+ + +Files: linkbutton.py +Copyright: 2007, One Laptop Per Child +License: LGPL-2+ + +Files: COPYING +Copyright: 1989, 1991, Free Software Foundation, Inc. + the software, and +License: UNKNOWN + +Files: po/fr.po +Copyright: 2007, The package's holder +License: UNKNOWN + --- sugar-web-activity-103.orig/debian/rules +++ sugar-web-activity-103/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2008 Jonas Smedegaard + +# NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks +DEB_PYTHON_SYSTEM = pycentral +ifneq (,$(DEB_MAINTAINER_MODE)) + # Enable stuff not policy compliant (eg. unsuitable for build daemons) + DEB_COPYRIGHT_CHECK_STRICT = yes + DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes +endif +include debian/cdbs/1/rules/upstream-tarball.mk +include debian/cdbs/1/class/python-sugar.mk +include debian/cdbs/1/rules/copyright-check.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include debian/cdbs/1/rules/buildinfo.mk + +DEB_UPSTREAM_PACKAGE = Browse +DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/$(DEB_UPSTREAM_PACKAGE) +DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 +DEB_UPSTREAM_TARBALL_MD5 = b1f7e4f4b4b424117690351720aa22a5 + +# Resolve, cleanup and apply CDBS-declared dependencies +include debian/cdbs/1/rules/package-relations.mk --- sugar-web-activity-103.orig/debian/watch +++ sugar-web-activity-103/debian/watch @@ -0,0 +1,3 @@ +# run the "uscan" command to check for upstream updates and more. +version=3 +http://download.sugarlabs.org/sources/sucrose/Browse/Browse-(.*)\.tar\.bz2 --- sugar-web-activity-103.orig/debian/pycompat +++ sugar-web-activity-103/debian/pycompat @@ -0,0 +1 @@ +2 --- sugar-web-activity-103.orig/debian/control.in +++ sugar-web-activity-103/debian/control.in @@ -0,0 +1,24 @@ +Source: sugar-web-activity +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC +Uploaders: Jonas Smedegaard +Build-Depends: @cdbs@ +Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/collab-maint/sugar-web-activity.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-web-activity.git;a=summary +Homepage: http://sugarlabs.org/go/Activities#Browse +XS-Python-Version: all + +Package: sugar-web-activity +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gobject, python-gtk2, python-dbus, python-gnome2-desktop (>= 2.16), python-simplejson, python-xpcom, python-hulahop, python-olpc-datastore, python-sugar, python-sugar-toolkit +Recommends: sugar, sugar-artwork +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: web browsing activity for the Sugar graphical shell + Sugar is a graphical user interface aimed at children. + . + This package contains the Browse activity, providing a simple web + browser based on the Mozilla Gecko engine. --- sugar-web-activity-103.orig/debian/README.packaging +++ sugar-web-activity-103/debian/README.packaging @@ -0,0 +1,126 @@ +Packaging hints +=============== + +This packaging is maintained with the use of Git, using the following +branches: + + upstream-git - master branch of upstream Git source + upstream - unpackaged upstream tarballs + pristine-tar - binary deltas to recreate pristine tarballs + master - Debian packaging + +With the above, we can switch between working from upstream released +tarballs and syncing directly with upstream development, both using +git-buildpackage (with its default branch names). + + +Package sugar-base as example +----------------------------- + +The rest of this document uses sugar-base as sample package, and some +old actual version numbers from that package - replace with your actual +package as needed... + + +Getting packaging source from Git repository +-------------------------------------------- + +The following commands (in an empty dir) fetch and build the package: + +aptitude install git-buildpackage +git clone git://git.debian.org/git/collab-maint/sugar-base +cd sugar-base +git fetch origin upstream:upstream +git-buildpackage + + +Merging with newer upstream Git tree +------------------------------------ + +The following commands (inside Git repository) updates the local mirror +of upstream source, and merges with our packaging branch: + +cd sugar-base +git checkout upstream-git +git pull +git fetch --tags +git checkout master +git pull . upstream-git + +The following command shows upstream changes possibly relevant to +mention in changelog (replace "HEAD^" with a reference to actual sync +commit if not invoked right after sync'ing): + +git log --pretty="format:%h %s" HEAD^..upstream-git + + +Doing a package release from upstream tarball +--------------------------------------------- + +The following command (inside Git repository) imports a downloaded +tarball into the "upstream" and pristine-tarball Git branches (taball +name is recorded too and used later, so make sure to first rename the +tarball to follow Debian naming convention {name}_{version}.orig.{ext}): + +git-import-orig --pristine-tar --sign-tags path/to/sugar-base_0.79.0.orig.tar.gz + +Check that all files are included in "upstream" branch (don't know why +this fails sometimes): + +git status + +If some files are "untracked", then do the following to manually add +untracked files to upstream branch and merge them with master branch +(the stash commands puts changelog update aside and restore it again +afterwards): + +git stash +git checkout upstream +git add * +git commit -m "Add files mysteriously skipped by git-import-orig." +git checkout master +git pull . upstream +git stash apply + +Comment out tarball hash in debian/control, test get-orig-source, and +enable hash line with new hash: + +fakeroot debian/rules get-orig-source + +Adjust changelog and package, and if satisfied with the result then tag +it, push Git sources and release the package: + +git-buildpackage --git-tag --git-sign-tags +[test package...] +git push --all +git push --tags +cd .. +dput sugar-base_0.79.0-1_amd64.changes + + +Doing 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 ".". Normally just tag the latest +upstream commit, to avoid simply including later upstream work in the +debian diff: + +git log --abbrev-commit upstream-git +git tag -s -m "Tag upstream for package release." upstream/0.2.git20080130 61279f8 + +Adjust changelog and package, and if satisfied with the result then tag +it, push Git sources and release the package: + +dch -r -v "0.2~git20080130-0~0jones1" "New upstream Git snapshot." +debcommit -r -a +git-buildpackage +[test package...] +git tag -s -m "Tag package release." debian/0.2.git20080130-0.0jones1 +git push --all +git push --tags +cd .. +dput sugar-base_0.2~git20080130-0~0jones1_amd64.changes + + + -- Jonas Smedegaard Sat, 08 Mar 2008 01:08:36 +0100 --- sugar-web-activity-103.orig/debian/control +++ sugar-web-activity-103/debian/control @@ -0,0 +1,24 @@ +Source: sugar-web-activity +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC +Uploaders: Jonas Smedegaard +Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5.0.44), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo +Standards-Version: 3.8.0 +Vcs-Git: git://git.debian.org/git/collab-maint/sugar-web-activity.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-web-activity.git;a=summary +Homepage: http://sugarlabs.org/go/Activities#Browse +XS-Python-Version: all + +Package: sugar-web-activity +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gobject, python-gtk2, python-dbus, python-gnome2-desktop (>= 2.16), python-simplejson, xulrunner-1.9, python-hulahop, python-olpc-datastore, python-sugar, python-sugar-toolkit +Recommends: sugar, sugar-artwork +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: web browsing activity for the Sugar graphical shell + Sugar is a graphical user interface aimed at children. + . + This package contains the Browse activity, providing a simple web + browser based on the Mozilla Gecko engine. --- sugar-web-activity-103.orig/debian/compat +++ sugar-web-activity-103/debian/compat @@ -0,0 +1 @@ +6 --- sugar-web-activity-103.orig/debian/README.cdbs-tweaks +++ sugar-web-activity-103/debian/README.cdbs-tweaks @@ -0,0 +1,128 @@ +CDBS tweak +========== + +CDBS is great. In some corner cases, however, some parts of CDBS +sometimes needs a few tweaks to work optimally. + +This is a collection of such tweaks. The goal is for these tweaks to be +absorbed into upstream CDBS. We just haven't found time yet to discuss +them at the CDBS developers' mailinglist. And possible we do not all +agree that the tweaks are so great - therefore this "staging area". + +If you found this file below debian/ subdir in a source package, most +probably only a subset of the below mentioned tweaks are relevant and +have been shipped with the package. The repository of all these tweaks +is here: svn://svn.debian.org/build-common/people/js/overlay/ + +Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/ + + + +New buildinfo rule +------------------ + +See package description for "buildinfo" for more info. + + + +Improved support for multiple compilations +------------------------------------------ + +Create and clean builddir _after_ resolving per-package DEB_BUILDDIR. + +Honour per-package DEB_BUILDDIR in makefile and autotools classes. + +Support multiple build flavors in makefile and autotools classes. + + + +Various improvements to python-distutils class +---------------------------------------------- + +Use full path to Python interpreter (Python Policy section 1.3.2). + +Add CDBS_BUILD_DEPENDS to old policy method. + +Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper +when actually used. + +Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one +of them honouring DEB_PYTHON_COMPILE_VERSION). + +Unify install path using new DEB_PYTHON_DESTDIR. + +Quote install path. + + + +New python-autotools class +-------------------------- + +Handle autotools-based Python packaging. + + + +New python-sugar class +---------------------- + +Handle packaging of Sugar activities. + + + +New perl-build class +-------------------- + +Handle Perl modules using Module::Build. + + + +New copyright-check rule +------------------------ + +Refuse to build if the source is found to contain different copyright +info than earlier builds. + + + +New kernelpatches rule +---------------------- + +Small wrapper around dh-kpatches, taking care of build-dependencies too. + + + +New package-relations rule +-------------------------- + +Improved build-dependency handling (merging multiple dependencies on +same packages), and add dependency handling for binary packages (to ease +maintaining identical build-dependencies and dependencies for eg. Perl +modules meeding runtime stuff for buildtime tests). + + + +New routines for handling upstream tarball +------------------------------------------ + +Rules and variables to help downloading, validating and repackaging +upstream tarball. + +Implements the rules print-version and get-orig-source commonly used +for group-maintained packages with Debian-specific patches maintained in +SVN or some other VCS, and automated fetching virgin upstream tarball +(possibly massaged after download e.g. to strip non-DFSG material). + + + +Support for custom BTS info +--------------------------- + +Include BTS control info found in debian/*.bts files, or alternatively +redirect bug reports to the email address defined in DEB_BTS_EMAIL. + + + +New dict class +-------------- + +Rules for packaging ispell, aspell, myspell and wordlist dictionaries. --- sugar-web-activity-103.orig/debian/patches/README +++ sugar-web-activity-103/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. --- sugar-web-activity-103.orig/debian/patches/series +++ sugar-web-activity-103/debian/patches/series @@ -0,0 +1 @@ +1001_danish_l10n.patch --- sugar-web-activity-103.orig/debian/patches/1001_danish_l10n.patch +++ sugar-web-activity-103/debian/patches/1001_danish_l10n.patch @@ -0,0 +1,147 @@ +diff --git a/po/da.po b/po/da.po +--- /dev/null ++++ b/po/da.po +@@ -0,0 +1,143 @@ ++# This is danish localisation for Sugar Web activity. ++# Copyright (C) 2008 Jonas Smedegaard ++# This file is distributed under the same license as the Sugar Web activity package. ++# Jonas Smedegaard , 2008. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: Sugar Web activity 99\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2008-10-20 13:36+0200\n" ++"PO-Revision-Date: 2008-11-13 11:20+0200\n" ++"Last-Translator: Jonas Smedegaard \n" ++"Language-Team: None\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: activity/activity.info:2 webactivity.py:114 ++msgid "Browse" ++msgstr "Bladr" ++ ++#: browser.py:172 ++msgid "Source" ++msgstr "Kilde" ++ ++#: linkbutton.py:94 ++msgid "Remove" ++msgstr "Fjern" ++ ++#: edittoolbar.py:94 ++msgid "Previous" ++msgstr "Forrige" ++ ++#: edittoolbar.py:101 ++msgid "Next" ++msgstr "Næste" ++ ++#: downloadmanager.py:147 ++msgid "Download started" ++msgstr "Nedhentning startet" ++ ++#: downloadmanager.py:148 downloadmanager.py:161 ++#, python-format ++msgid "%s" ++msgstr "%s" ++ ++#: downloadmanager.py:160 ++msgid "Download completed" ++msgstr "Nedhentning færdig" ++ ++#: downloadmanager.py:164 ++msgid "Show in Journal" ++msgstr "Vis i logbog" ++ ++#: downloadmanager.py:167 ++msgid "Ok" ++msgstr "Ok" ++ ++#: downloadmanager.py:173 ++#, python-format ++msgid "File %s from %s." ++msgstr "Fil %s fra %s." ++ ++#: downloadmanager.py:254 ++#, python-format ++msgid "" ++"Downloading %s from \n" ++"%s." ++msgstr "" ++"Nedhentning %s fra \n" ++"%s." ++ ++#: webtoolbar.py:233 ++msgid "Back" ++msgstr "Tilbage" ++ ++#: webtoolbar.py:240 ++msgid "Forward" ++msgstr "Frem" ++ ++#: webtoolbar.py:263 ++msgid "Bookmark" ++msgstr "Bogmærke" ++ ++#: webtoolbar.py:355 webactivity.py:469 ++msgid "Stop" ++msgstr "Stop" ++ ++#: webtoolbar.py:358 ++msgid "Reload" ++msgstr "Genindlæs" ++ ++#: webactivity.py:110 ++msgid "Edit" ++msgstr "Redigér" ++ ++#: webactivity.py:122 ++msgid "View" ++msgstr "Vis" ++ ++#: webactivity.py:141 webactivity.py:142 ++msgid "blank" ++msgstr "tom" ++ ++#: webactivity.py:464 ++msgid "Download in progress" ++msgstr "Nedhentning er igang" ++ ++#: webactivity.py:465 ++msgid "Stopping now will cancel your download" ++msgstr "Hvis du stopper nu vil din nedhentning blive afbrudt" ++ ++#: webactivity.py:467 ++msgid "Cancel" ++msgstr "Fortryd" ++ ++#: viewtoolbar.py:34 ++msgid "Zoom out" ++msgstr "Formindsk" ++ ++#: viewtoolbar.py:40 ++msgid "Zoom in" ++msgstr "Forstør" ++ ++#: viewtoolbar.py:51 ++msgid "Fullscreen" ++msgstr "Fuldskærm" ++ ++#: viewtoolbar.py:87 ++msgid "Show Tray" ++msgstr "Vis skuffe" ++ ++#: viewtoolbar.py:91 ++msgid "Hide Tray" ++msgstr "Skjul skuffe" ++ ++#: palettes.py:90 ++msgid "Follow link" ++msgstr "Følg henvisning" ++ ++#: palettes.py:95 palettes.py:142 ++msgid "Copy" ++msgstr "Kopiér" --- sugar-web-activity-103.orig/debian/cdbs/1/rules/upstream-tarball.mk +++ sugar-web-activity-103/debian/cdbs/1/rules/upstream-tarball.mk @@ -0,0 +1,137 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2007-2008 Jonas Smedegaard +# Description: Convenience rules for dealing with upstream tarballs +# +# 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. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_upstream-tarball +_cdbs_rules_upstream-tarball := 1 + +include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix) + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39) + +# Prefix for upstream location of all upstream tarballs (mandatory!) +#DEB_UPSTREAM_URL = + +DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE) +DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION)) +DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz +# Checksum to ensure integrity of downloadeds using get-orig-source (optional) +#DEB_UPSTREAM_TARBALL_MD5 = + +DEB_UPSTREAM_WORKDIR = ../tarballs + +# Base filename (without extension) as used in upstream URL +DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION) + +# Perl regexp to change locally used string into that in upstream URL and srcdir +#DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = + +# Base directory within tarball +DEB_UPSTREAM_TARBALL_SRCDIR = $(cdbs_upstream_tarball_basename) + +# Space-delimited list of directories and files to strip (optional) +#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt +DEB_UPSTREAM_REPACKAGE_TAG = dfsg +DEB_UPSTREAM_REPACKAGE_DELIMITER = ~ + +cdbs_upstream_tarball_basename = $(if $(strip $(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_BASENAME)' | perl -pe '$(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)'),$(DEB_UPSTREAM_TARBALL_BASENAME)) +cdbs_upstream_tarball = $(cdbs_upstream_tarball_basename).$(DEB_UPSTREAM_TARBALL_EXTENSION) +cdbs_upstream_received_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION)) +cdbs_upstream_local_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)) +cdbs_upstream_local_srcdir = $(cdbs_upstream_tarball_basename)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)) + +# # These variables are deprecated +_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL DEB_UPSTREAM_TARBALL_VERSION_MANGLE +_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES +DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES) + +print-version: + @@echo "Debian version: $(DEB_VERSION)" + @@echo "Upstream version: $(DEB_UPSTREAM_TARBALL_VERSION)" + +get-orig-source: + @@dh_testdir + @@mkdir -p "$(DEB_UPSTREAM_WORKDIR)" + + @if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \ + if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \ + rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ + fi ; \ + echo "Downloading $(cdbs_upstream_received_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \ + wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \ + else \ + echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ + fi + + @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" | sed -e 's/ .*//'`; \ + if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \ + if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \ + echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \ + echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \ + echo "Purging downloaded file. Try new download." ; \ + rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ + false ; \ + else \ + echo "Upstream tarball is trusted!" ; \ + fi; \ + else \ + echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \ + fi + +# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and +# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2) +# TODO: Add .orig suffix to top folder inside tarball when only +# recompressing (when $uncompress set and ...REPACKAGE_EXCLUDE unset) + @untar="tar -x -C"; \ + case "$(cdbs_upstream_received_tarball)" in \ + *.tar.gz) unpack="gunzip -c";; \ + *.tar.bz2) unpack="bunzip2 -c"; uncompress="bunzip2";; \ + *.tar.Z) unpack="uncompress -c"; uncompress="uncompress";; \ + *.zip) unpack="unzip -q"; uncompress="false"; untar="-d"; nopipe="true";; \ + *.tar) unpack="cat"; uncompress="true";; \ + *) echo "Unknown extension for upstream tarball $(cdbs_upstream_received_tarball)"; false;; \ + esac && \ + if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \ + echo "Repackaging tarball ..." && \ + mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \ + if [ -n "$$nopipe" ]; then \ + $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \ + $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ + else \ + $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \ + | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ + fi && \ + if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_local_srcdir)" ]; then \ + mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_local_srcdir)"; \ + fi && \ + GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_local_srcdir)" && \ + echo "Cleaning up" && \ + rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \ + elif [ -n "$$uncompress" ]; then \ + echo "Recompressing tarball ..." && \ + $$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)"; \ + gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar"; \ + fi + +DEB_PHONY_RULES += print-version get-orig-source + +endif --- sugar-web-activity-103.orig/debian/cdbs/1/rules/copyright-check.mk +++ sugar-web-activity-103/debian/cdbs/1/rules/copyright-check.mk @@ -0,0 +1,113 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2005-2008 Jonas Smedegaard +# Description: Check for changes to copyright notices in source +# +# 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. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_copyright-check +_cdbs_rules_copyright-check := 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7) + +# Set to yes to fail on changed/new hints are found +#DEB_COPYRIGHT_CHECK_STRICT := yes + +# Single regular expression for files to include or ignore +DEB_COPYRIGHT_CHECK_REGEX = .* +#DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$ +DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^debian/(changelog|copyright(|_hints|_newhints))$ + +pre-build:: debian/stamp-copyright-check + +debian/stamp-copyright-check: + @echo 'Scanning upstream source for new/changed copyright notices...' + @echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \ + "| some-output-filtering..." + +# Perl in shell in make requires extra care: +# * Single-quoting ('...') protects against shell expansion +# * Double-dollar ($$) expands to plain dollar ($) in make + @licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \ + | LC_ALL=C perl -e \ + 'print "Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX\n";'\ + 'print "Upstream-Name: Untrusted draft - double-check copyrights yourself!\n\n";'\ + '$$n=0; while (<>) {'\ + ' s/[^[:print:]]//g;'\ + ' if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\ + ' $$files[$$n]{name}=$$1;'\ + ' $$files[$$n]{license}=$$2;'\ + ' };'\ + ' if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\ + ' $$files[$$n]{copyright}=$$1;'\ + ' };'\ + ' /^$$/ and $$n++;'\ + '};'\ + 'foreach $$file (@files) {'\ + ' $$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\ + ' $$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\ + ' $$file->{license} =~ s/\s+\(v([^)]+)\)/-$$1/;'\ + ' $$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\ + ' $$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\ + ' $$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\ + ' $$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\ + ' $$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\ + ' $$file->{copyright} =~ s/\b(\d{4})\s+([\S^\d])/$$1, $$2/g;'\ + ' $$file->{copyright} =~ s/^\W*\s+\/\s+//g;'\ + ' $$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\ + ' $$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\ + ' $$pattern = "$$file->{license} [$$file->{copyright}]";'\ + ' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\ + '};'\ + 'foreach $$pattern ( sort {'\ + ' @{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\ + ' ||'\ + ' $$a cmp $$b'\ + ' } keys %patternfiles ) {'\ + ' ($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\ + ' print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\ + ' print "Copyright: $$copyright\n";'\ + ' print "License: $$license\n\n";'\ + '};'\ + > debian/copyright_newhints + @patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \ + echo "Found $$patterncount different copyright and licensing combinations." + @if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi + @newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \ + if [ -n "$$newstrings" ]; then \ + echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \ + echo; \ + echo "$$newstrings"; \ + echo; \ + echo "To fix the situation please do the following:"; \ + echo " 1) Investigate the above changes and update debian/copyright as needed"; \ + echo " 2) Replace debian/copyright_hints with debian/copyright_newhints"; \ + $(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \ + else \ + echo 'No new copyright notices found - assuming no news is good news...'; \ + rm -f debian/copyright_newhints; \ + fi + touch $@ + +clean:: + rm -f debian/stamp-copyright-check + +endif --- sugar-web-activity-103.orig/debian/cdbs/1/rules/package-relations.mk +++ sugar-web-activity-103/debian/cdbs/1/rules/package-relations.mk @@ -0,0 +1,50 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2008 Jonas Smedegaard +# Description: Resolve, cleanup and apply package relationships +# +# 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. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_package-relations +_cdbs_rules_package-relations = 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +# Merge build-dependencies on same packages +# TODO: rewrite (in perl, probably) to be more generic +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.43)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\|0.4.39\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.44)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.37.2)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.28)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.21)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\)) *,* */, /g') +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.0)/ s/ *,* *\bdebhelper (>= \(4.1.60\)) *,* */, /g') + +# Cleanup superfluous commas +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/ *,/,/g' -e 's/^ *, *//' -e 's/ *, *$$//') + +# Apply CDBS-declared dependencies to binary packages +$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: + echo 'cdbs:Depends=$(CDBS_DEPENDS_ALL), $(or $(CDBS_DEPENDS_$(cdbs_curpkg)),$(CDBS_DEPENDS))' \ + | sed -e 's/ *,/,/g' -e 's/^ *, *//' -e 's/ *, *$$//' \ + >> debian/$(cdbs_curpkg).substvars + +endif --- sugar-web-activity-103.orig/debian/cdbs/1/rules/buildinfo.mk +++ sugar-web-activity-103/debian/cdbs/1/rules/buildinfo.mk @@ -0,0 +1,40 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2004-2007 Jonas Smedegaard +# Description: Generate and include build information +# +# 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. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildinfo +_cdbs_rules_buildinfo = 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo + +common-install-arch common-install-indep:: debian/stamp-buildinfo + +debian/stamp-buildinfo: + dh_buildinfo + touch debian/stamp-buildinfo + +clean:: + rm -f debian/stamp-buildinfo + +endif --- sugar-web-activity-103.orig/debian/cdbs/1/class/python-vars.mk +++ sugar-web-activity-103/debian/cdbs/1/class/python-vars.mk @@ -0,0 +1,109 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003,2008 Jonas Smedegaard +# Description: Defines useful variables for Python packages +# +# 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., 51 Franklin St, Fifth Floor, Boston, MA +# 02111-1307 USA. +# + + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_python-vars +_cdbs_class_python-vars = 1 + +include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix) + +DEB_PYTHON_PACKAGES = $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)) + +DEB_PYTHON_ARCH_PACKAGES = $(filter $(DEB_PYTHON_PACKAGES), $(DEB_ARCH_PACKAGES)) +DEB_PYTHON_INDEP_PACKAGES = $(filter $(DEB_PYTHON_PACKAGES), $(DEB_INDEP_PACKAGES)) + +## FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only +# Avoid including buildcore.mk to not risk breaking when hopefully removing again +cdbs_python_streq = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),,yes) +cdbs_python_packages_pre := $(DEB_PYTHON_ARCH_PACKAGES)$(DEB_PYTHON_INDEP_PACKAGES) +cdbs_python_pkgresolve_check = $(if $(call cdbs_python_streq,$(DEB_PYTHON_ARCH_PACKAGES)$(DEB_PYTHON_INDEP_PACKAGES),$(cdbs_python_packages_pre)),, $(warning Setting DEB_PYTHON_*PACKAGES after python-vars in included is currently unsupported)) +## TODO: Rephrase when DEB_PYTHON_PACKAGES is only resolved in build targets +cdbs_python_pkg_check = $(if $(DEB_PYTHON_ARCH_PACKAGES)$(DEB_PYTHON_INDEP_PACKAGES),, $(warning No Python packages found or declared - either rename binary packages or set DEB_PYTHON_PACKAGES (or one or both of DEB_PYTHON_ARCH_PACKAGES and DEB_PYTHON_INDEP_PACKAGES) before including python-vars.mk)) + +# check python system +cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) +cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) +cdbs_pycompat = $(cdbs_selected_pycompat) +ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) + ifeq (, $(cdbs_selected_pycompat)) + cdbs_pycompat = 2 + endif # use pycompat + # warning pysupport compatibility mode + ifneq (, $(cdbs_use_xs_field)) + $(warning Use of XS-Python-Version and XB-Python-Version fields in 'debian/control' is deprecated with pysupport method, use 'debian/pyversions' if you need to specify specific versions) + endif # use XS field (compat) +else + ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) + ifeq (, $(cdbs_selected_pycompat)) + cdbs_pycompat = 2 + endif # use pycompat + else + ifneq (, $(DEB_PYTHON_SYSTEM)) + $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) + else + ifneq (, $(cdbs_use_xs_field)) + $(error Your package uses the new Python policy; you must set DEB_PYTHON_SYSTEM to "pysupport" or "pycentral".) + endif + ifneq (, $(cdbs_selected_pycompat)) + ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) + $(error Your package uses the new Python policy; you must set DEB_PYTHON_SYSTEM to "pysupport" or "pycentral".) + endif + endif # use pycompat + endif # unknown method + endif # pycentral +endif # pysupport + +# Calculate cdbs_python_build_versions +cdbs_python_current_version := $(shell pyversions -vd) +## FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only +ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES)) + # check if current is in build versions + ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) + cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) + cdbs_python_build_versions := $(cdbs_python_compile_version) + else + cdbs_python_build_versions := $(cdbs_python_current_version) + endif +else +cdbs_python_build_versions := $(shell pyversions -vr) +endif # archall + +# check if build is possible +ifeq (, $(cdbs_python_build_versions)) +ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) +$(error invalid setting in 'debian/pyversions') +else +$(error invalid setting for XS-Python-Version) +endif # system selected +endif # build versions empty + +# TODO: Support multiple python programs built for different python versions +# FIXME: Understand the above sentence and rephrase it +cdbs_python_curpkg_build_versions = $(cdbs_python_build_versions) + +## TODO: Drop this when DEB_PYTHON_PACKAGES is only resolved in build targets +pre-build clean:: + $(cdbs_python_pkgresolve_check) + +endif --- sugar-web-activity-103.orig/debian/cdbs/1/class/python-sugar.mk +++ sugar-web-activity-103/debian/cdbs/1/class/python-sugar.mk @@ -0,0 +1,101 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2008 Jonas Smedegaard +# Description: Class to build and install Sugar packages +# +# 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., 51 Franklin St, Fifth Floor, Boston, MA +# 02111-1307 USA. +# + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_python-sugar +_cdbs_class_python-sugar = 1 + +#include $(_cdbs_class_path)/python-vars.mk$(_cdbs_makefile_suffix) +include debian/cdbs/1/class/python-vars.mk +include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix) + +# Declare Build-Deps for packages using this file +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip +# FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only +ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES)) + ifneq (, $(cdbs_python_compile_version)) + CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) + else + CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) + endif +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) +endif +ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.5.6) +endif + +DEB_PYTHON_SUGAR_PACKAGES = $(filter sugar-%-activity, $(DEB_PACKAGES)) + +# TODO: Move this to buildvars.mk +cdbs_pkgsrcdir = $(if $(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_SRCDIR)) + +pre-build:: + mkdir -p debian/stamps-configure + +$(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%: + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST ] || [ -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv $(cdbs_pkgsrcdir)/MANIFEST $(cdbs_pkgsrcdir)/MANIFEST.upstream + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST + for pythonver in $(cdbs_python_build_versions); do \ + /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \ + done + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ + echo "$$path" | sed 's!^$(cdbs_pkgsrcdir)/!!' >> $(cdbs_pkgsrcdir)/MANIFEST; \ + done + +$(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%: + mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities + for pythonver in $(cdbs_python_build_versions); do \ + LANG=C /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix="$(DEB_DESTDIR)/usr"; \ + done + +$(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%: +ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) + dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) $(DEB_PYTHON_PRIVATE_MODULES_DIRS_$(cdbs_curpkg)) +else + dh_pycentral -p$(cdbs_curpkg) +endif + +reverse-config:: $(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) +$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% : + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv -f $(cdbs_pkgsrcdir)/MANIFEST.upstream $(cdbs_pkgsrcdir)/MANIFEST + +clean:: $(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) +ifeq (, $(cdbs_selected_pycompat)) + echo "$(cdbs_pycompat)" >debian/pycompat +endif # use pycompat + +$(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% : + -IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ + rm -f "$$path"; \ + rmdir --ignore-fail-on-non-empty "`dirname "$$path"`"; \ + done + -rmdir --ignore-fail-on-non-empty "$(cdbs_pkgsrcdir)/locale" + +## TODO: Drop this when DEB_PYTHON_PACKAGES is only resolved in build targets +pre-build clean:: + $(cdbs_python_pkgresolve_check) + +endif