--- sugar-base-0.83.3.orig/debian/copyright +++ sugar-base-0.83.3/debian/copyright @@ -0,0 +1,135 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=428 +Upstream-Name: sugar-base +Upstream-Maintainer: sugar-devel@lists.sugarlabs.org + irc://irc.freenode.net/sugar +Upstream-Maintainer: Sugarlabs + http://lists.sugarlabs.org/listinfo/sugar-devel + irc://irc.freenode.net/sugar +Upstream-Source: http://dev.laptop.org/pub/sugar/sources/sugar-base/ + git://dev.laptop.org/sugar-base + http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base + git://git.sugarlabs.org/sugar-base/mainline.git + +Files: * +Copyright: 2006-2007, Red Hat, Inc + 2007-2008, One Laptop Per Child +License: LGPL-2+ + +Files: src/sugar/xdgmime* +Copyright: 2003-2004, Jonathan Blandford + 2003-2004, Red Hat, Inc + 2004-2005, Matthias Clasen +License: other-Academic | LGPL-2+ + +Files: Makefile.in +Copyright: 1994-2008, Free Software Foundation, Inc. +License: GAP + This Makefile.in 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. + +Files: ./config.* + ./depcomp + ./intltool-* + ./ltmain.sh + ./missing + ./py-compile + m4/intltool.m4 +Copyright: 1992-2007, Free Software Foundation + 2000-2001, Eazel, Inc +License: GPL-2+ | other-Autoconf + +Files: ./install-sh +Copyright: 1994, X Consortium +License: other + 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 + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + 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 deal- + ings in this Software without prior written authorization from the X Consor- + tium. + . + FSF changes to this file are in the public domain. + +Files: ./configure +Copyright: 1992-1996, 1998-2006, Free Software Foundation, Inc. +License: GAP + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +Files: ./aclocal.m4 +Copyright: 1994-2008, Free Software Foundation, Inc. + 1995-2002, Free Software Foundation, Inc + 2001-2004, Red Hat, Inc + 1996-2004, Free Software Foundation, Inc +License: GPL-2+ | other-Autoconf + Some parts of the file is not copyright protected, some parts are + licensed as Public Domain (PD), but one part has the more restrictive + licensing terms of GPLv2+ or the license of a surrounding + autoconf-using project. + +Files: po/Makefile.in.in +Copyright: 1995-1997, Ulrich Drepper + 2004-2008, Rodney Dawes +License: PD + This file may be copied and used freely without restrictions. It may + be used in projects which are not available under a GNU Public License, + but which still want to provide support for the GNU gettext functionality. + +Files: debian/* +Copyright: © 2003-2008 Jonas Smedegaard +License: GPL-2+ + +Files: debian/cdbs/1/class/autotools* + debian/cdbs/1/class/makefile* +Copyright: 2002-2003, Colin Walters + 2003,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". + +License: LGPL-2.1+ + On Debian GNU systems, the complete text of GNU Library General Public + License (LGPL) version 2.1 can be found at + "/usr/share/common-licenses/LGPL". + +License: GAP + 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. + +License: other-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-Academic + Licensed under the Academic Free License version 2.0 + . + No actual license is included with upstream source, and even if it is + quite likely http://opensource-definition.org/licenses/afl-2.0.html no + attempt has been done to resolve this as it has in all cases been dual- + licensed with GPL-2+ which in reality is used with with Debian. --- sugar-base-0.83.3.orig/debian/changelog +++ sugar-base-0.83.3/debian/changelog @@ -0,0 +1,267 @@ +sugar-base (0.83.3-0ubuntu1) jaunty; urgency=low + + * New upstream release. + + Provides NetworkManager 0.7 support (LP: #295113) + * Update debian/control*: + + Remove Vcs-Git and Vcs-Browser since they are debian-specific + and we're not yet using git for packaging in Ubuntu + * Remove 0000 patch - merged in upstream release + * Add sugarlabs URL to watch file, update to 0.83.x + * Update debian/copyright and copyright hints (from Debian 0.82.2-5): + + Bump to version 428 of new format (no structural changes) + + Set Sugarlabs (not Redhat) as upstream maintainer, and add both + old laptop.org and new sugarlabs.org source URLs. + + Merge entries with same authors and licensing (varying only in + copyright years). + + Update copyright years + + Include GAP licenses verbatim. + + -- Morgan Collett Mon, 02 Feb 2009 13:30:16 +0200 + +sugar-base (0.82.2-4) unstable; urgency=low + + * Add patch 0000 to sync with upstream stable head: + + Update aymara (ay) and turkish (tr) translations + * Limit watch file to track stable 0.82 branch. + * Update CDBS snippets: + + Fix use underscore (not dash) in internal variable + + Ignore only debian changelog and copyright-related 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 420 of new format (no structural changes) + + Add sugar-devel mailinglist as upstream maintainer. + + Update upstream source URLs. + + Refer to LGPL as "GNU Library..." (not Lesser). + + Refer to "Debian GNU systems" (not only GNU/Linux). + * Update Homebase URL. + + -- Jonas Smedegaard Sun, 21 Dec 2008 00:06:38 +0100 + +sugar-base (0.82.2-3) unstable; urgency=low + + * Update CDBS snippet copyright-check.mk: Compact simple licenses + (those without ' or later'). + * Update CDBS snippet makefile.mk: Cleanup check stamp dir for + flavored builds. Fixing failure to build twice in a row. + + -- Jonas Smedegaard Tue, 11 Nov 2008 19:07:54 +0100 + +sugar-base (0.82.2-2) unstable; urgency=low + + * Update cdbs snippets: + + Fix python-autotools.mk to run dh_py* scripts before + dh_installinit. See bug#494288. + + Fix makefile.mk to create check stamp dir for flavored builds. + + Several minor improvements to upstream-tarball.mk. + + -- Jonas Smedegaard Sun, 19 Oct 2008 20:52:04 +0200 + +sugar-base (0.82.2-1) unstable; urgency=low + + * New upstream release. + * Depend on ${misc:Depends}. + + -- Jonas Smedegaard Sun, 19 Oct 2008 13:59:30 +0200 + +sugar-base (0.82.1-1) unstable; urgency=low + + * New upstream release. + * Add patch 1001 adding danish l10n. + * Add patch 2991 to enable danish l10n in configure. + * Build-depend on intltool. + * Update local cdbs snippets: + + Restructure output of copyright-check.mk to match new proposed + copyright-format at + http://wiki.debian.org/Proposals/CopyrightFormat . + + Improved multiflavor handling in makefile and autotools snippets. + + Add new local package-relations.mk to merge duplicate + build-dependencies and more. Drop cleanup in debian/rules. + + Update README.cdbs-tweaks. + * Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis). + + -- Jonas Smedegaard Thu, 07 Aug 2008 20:08:04 +0200 + +sugar-base (0.81.1-2) unstable; urgency=low + + * Update local cdbs snippets: + + Relax copyright-check to only warn about its discoveries. Closes: + bug# #486966. + + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1). + * Update debian/copyright-hints. + + -- Jonas Smedegaard Fri, 20 Jun 2008 21:51:02 +0200 + +sugar-base (0.81.1-1) unstable; urgency=low + + * New upstream release. + * Update cdbs tweaks: + + Strip any non-printable characters in copyright-check.mk. + * Reorganize debian/copyright: only mention each license once. + * Update copyright-hints (new copyright years for automade files). + + -- Jonas Smedegaard Mon, 09 Jun 2008 11:42:42 +0200 + +sugar-base (0.79.1-1) unstable; urgency=low + + * New upstream release. + Highlights: + + Use the right gettext domain + + Coding style improvements thanks to pylint + * Use chrpath to fix hardcoded rpath. + * Drop all patches: + + patch 0001 included in new upstream release. + + patch 2991 unneeded when using chrpath. + * Bump debhelper compatibility level to 6. + * 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. + + Relax python-central and python-support build-dependencies in + python-autotools.mk. + * Stop using patchsystem-quilt.mk (no patches applied) + * Stop Regenerate automade files (irrelevant when using chrpath) + * 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 Tue, 22 Apr 2008 21:35:45 +0200 + +sugar-base (0.79.0-6) unstable; urgency=low + + * Have python-gobject-dev build-dependency fallback to python-gtk2-dev + older than 2.9 (it provided gobject back then). + + -- Jonas Smedegaard Tue, 15 Apr 2008 00:09:06 +0200 + +sugar-base (0.79.0-5) unstable; urgency=low + + * Sync with upstream Git as of today. + Main changes: + + Use the right gettext domain + * Revert earlier non-isolated patch applying the gettext fix. + + -- Jonas Smedegaard Wed, 26 Mar 2008 10:03:04 +0100 + +sugar-base (0.79.0-4) unstable; urgency=low + + * Drop no longer needed automake1.10 -> automake build-dependency fix + in debian/rules. + * Only clean builddir if it exists (just cosmetic, to avoid noise). + * 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. + + -- Jonas Smedegaard Sun, 16 Mar 2008 13:57:04 +0100 + +sugar-base (0.79.0-3) unstable; urgency=low + + * Pass over maintenance of the package to the OLPC team: Change + Maintainer, and add myself to Uploaders. + * Fix README.packaging to use "pull; fetch --tags" (not "pull -t"). + * Rename binary package sugar-base -> python-sugar, to comply with + Python policy. + * Change binary package to section python. + * Update CDBS tweaks: + + Add py-compile.mk and python-vars.mk to handle autotools-based + Python compilation. This fixes completely broken packaging. + + Add 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. + * Use quilt to handle patches. + * Regenerate patched automade files only explicitly (not at every + build), and apply as patch 2991. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Thu, 13 Mar 2008 15:32:37 +0100 + +sugar-base (0.79.0-2) unstable; urgency=low + + * Sync with upstream Git. Highlights: + + 56da6b0 Use the right gettext domain. + * Update CDBS tweaks: + + Replace virtual automake1.10 build-dependency with automake + + Strip no longer relevant notes on cdbs-autoupdate.mk from + README.cdbs-tweaks + * Add section on packaging from upstream tarball to README.packaging. + * Add upstream source (in addition to Git source) to debian/copyright. + * Fix typo and mention XO in long description. + * Fix Git commands in README.packaging: Cannot push all+tags in 1 go. + * Update debian/copyright: + + Bump copyright years for src/sugar/__init__.py + + Bump copyright years for debian/* files + * Add watch file. + * Recommend sugar. + * Suggest ipython (for better debugging in logger). + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Tue, 11 Mar 2008 01:20:56 +0100 + +sugar-base (0.79.0-1) unstable; urgency=low + + * First official release. Closes: bug#444021. + * New Upstream Version + * Update CDBS tweaks: + + Add upstream-tarball.mk to implement get-orig-source target. + Pristine-tar Git branch is maintained too, but git-buildpackage + does not yet support recreating the bz2 tarball + + Update copyright-check.mk to parse licensecheck using perl: + + No longer randomly drops newlines + + More compact hint file (and ordered more like wiki-proposed new + copyright syntax). + + No longer ignore files without copyright. + * Fix duplicate build-dependency cleanup in debian/rules + (upstream-tarball.mk needs tightened cdbs dependency). + * Relibtoolize to avoid hardcoded rpath. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Sat, 08 Mar 2008 00:13:58 +0100 + +sugar-base (0.2~git20080130-0~0jones1) UNRELEASED; urgency=low + + * New upstream Git snapshot. + * Add section to README.packaging about doing a package release. + * Update debian/copyright_hints (no real copyright or licensing + changes). + + -- Jonas Smedegaard Sat, 09 Feb 2008 02:12:58 +0100 + +sugar-base (0.2~git20080111-0~0jones2) UNRELEASED; urgency=low + + * Improved copyright-check.mk cdbs snippet to use licensecheck script. + * Update debian/copyright: + + "Fix" copyright for xdgmime{alias,parent}.h (year 200 seems to be + a typo for 2004). + + Add separate copyright for logger.py (default license and + copyright holder, but only year 2007). + * Semi-auto-update debian/control: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Mon, 14 Jan 2008 03:17:31 +0100 + +sugar-base (0.2~git20080111-0~0jones1) UNRELEASED; urgency=low + + * New upstream snapshot. + + -- Jonas Smedegaard Fri, 11 Jan 2008 16:47:34 +0100 + +sugar-base (0.2~git20071211-0~0jones~snapshot0) UNRELEASED; urgency=low + + * Add Homepage, Vcs-Git and Vcs-Browser fields to debian/control. + + -- Jonas Smedegaard Tue, 11 Dec 2007 16:27:17 +0100 + +sugar-base (0.2~git20071211-0~0jones1) jones; urgency=low + + * Initial unofficial release. + + -- Jonas Smedegaard Sat, 24 Nov 2007 12:54:48 +0100 --- sugar-base-0.83.3.orig/debian/copyright_hints +++ sugar-base-0.83.3/debian/copyright_hints @@ -0,0 +1,252 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX +Upstream-Name: Untrusted draft - double-check copyrights yourself! + +Files: debian/patches/0000_upstream_stable_head.patch + 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/de.po + po/dz.po + po/el.po + po/en.po + po/es.po + po/fa.po + po/fa_AF.po + po/ff.po + po/fr.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/pt.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 + po/zh_CN.po + po/zh_TW.po +Copyright: YEAR THE PACKAGE'S HOLDER +License: UNKNOWN + +Files: Makefile.am + NEWS + configure.ac + debian/README.cdbs-tweaks + debian/README.packaging + debian/compat + debian/control + debian/control.in + debian/patches/2991_enable_danish_l10n.patch + debian/patches/README + debian/patches/series + debian/pycompat + debian/watch + m4/python.m4 + po/ChangeLog + po/POTFILES.in + src/Makefile.am + src/sugar/Makefile.am + src/sugar/_sugarbaseext.defs + src/sugar/_sugarbaseext.override +Copyright: *No copyright* +License: UNKNOWN + +Files: src/sugar/xdgmime.h + src/sugar/xdgmimeglob.c + src/sugar/xdgmimeglob.h + src/sugar/xdgmimeint.c + src/sugar/xdgmimeint.h + src/sugar/xdgmimemagic.c + src/sugar/xdgmimemagic.h +Copyright: 2003, Jonathan Blandford + 2003, Red Hat, Inc +License: LGPL-2+ + +Files: Makefile.in + src/Makefile.in + src/sugar/Makefile.in +Copyright: 1994-2002 +License: UNKNOWN (GENERATED FILE) + +Files: debian/cdbs/1/class/autotools-vars.mk + debian/cdbs/1/class/makefile.mk +Copyright: 2002-2003, Colin Walters + 2003,2008, Jonas Smedegaard +License: GPL + +Files: debian/cdbs/1/class/autotools.mk + debian/cdbs/1/class/makefile-vars.mk +Copyright: 2002-2003, Colin Walters + 2008, Jonas Smedegaard +License: GPL + +Files: debian/cdbs/1/class/python-autotools.mk + debian/cdbs/1/rules/package-relations.mk +Copyright: 2008, Jonas Smedegaard +License: GPL + +Files: src/sugar/xdgmimealias.h + src/sugar/xdgmimeparent.h +Copyright: 200 Matthias Clasen + 2004, Red Hat, Inc +License: LGPL-2+ + +Files: src/sugar/xdgmimealias.c + src/sugar/xdgmimeparent.c +Copyright: 2004, Matthias Clasen + 2004, Red Hat, Inc +License: LGPL-2+ + +Files: src/sugar/xdgmimecache.c + src/sugar/xdgmimecache.h +Copyright: 2005, Matthias Clasen +License: LGPL-2+ + +Files: missing +Copyright: 1996-1997, 1999-2000, 2002-2006 +License: GPL (GENERATED FILE) + +Files: depcomp +Copyright: 1999-2000, 2003-2007, Free Software +License: GPL (GENERATED FILE) + +Files: py-compile +Copyright: 2000-2001, 2003-2005, Free Software Foundation, Inc +License: GPL (GENERATED FILE) + +Files: intltool-merge.in +Copyright: 2000-2001, Eazel, Inc + 2000, 2003, Free Software Foundation +License: GPL (GENERATED FILE) + +Files: intltool-update.in +Copyright: 2000-2003, Free Software Foundation +License: GPL (GENERATED FILE) + +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: config.guess +Copyright: 1992-1999, + 1992-2005 +License: GPL-2+ (GENERATED FILE) + +Files: config.sub +Copyright: 1992-1999 +License: GPL-2+ (GENERATED FILE) + +Files: ltmain.sh +Copyright: 1996-2001, 2003-2006 +License: GPL-2+ (GENERATED FILE) + +Files: intltool-extract.in +Copyright: 2000-2001, 2003, Free Software Foundation +License: GPL-2+ (GENERATED FILE) + +Files: m4/intltool.m4 +Copyright: 2001, Eazel, Inc +License: GPL-2+ (GENERATED FILE) + +Files: src/sugar/xdgmime.c +Copyright: 2003-2004, Red Hat, Inc + 2003-2004, Jonathan Blandford +License: LGPL-2+ + +Files: src/sugar/__init__.py +Copyright: 2006-2007, Red Hat, Inc + 2007-2008, One Laptop Per Child +License: LGPL-2+ + +Files: src/sugar/_sugarbaseextmodule.c +Copyright: 2006-2007, Red Hat, Inc +License: LGPL-2+ + +Files: src/sugar/mime.py +Copyright: 2007, One Laptop Per Child + 2006-2007, Red Hat, Inc +License: LGPL-2+ + +Files: src/sugar/logger.py +Copyright: 2007, Red Hat, Inc +License: LGPL-2+ + +Files: install-sh +Copyright: 1994, X Consortium +License: MIT/X11 (BSD like) + +Files: configure +Copyright: 1992-1996, 1998-2001 +License: UNKNOWN (GENERATED FILE) + +Files: aclocal.m4 +Copyright: 1995-2002, Free Software Foundation, Inc + 2001-2004, Red Hat, Inc + 1996-2004 +License: UNKNOWN (GENERATED FILE) + +Files: po/Makefile.in.in +Copyright: 1995-1997, by Ulrich Drepper + 2004-2008, Rodney Dawes +License: UNKNOWN + +Files: debian/rules +Copyright: 2007-2008, Jonas Smedegaard +License: UNKNOWN + +Files: debian/patches/1001_enable_danish_l10n.patch +Copyright: 2008, Jonas Smedegaard +License: UNKNOWN + +Files: COPYING +Copyright: the + 1991, 1999, Free Software Foundation, Inc +License: UNKNOWN + --- sugar-base-0.83.3.orig/debian/rules +++ sugar-base-0.83.3/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2007-2008 Jonas Smedegaard + +# NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks +DEB_BUILDDIR = build +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/rules/copyright-check.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/1/class/python-autotools.mk +include debian/cdbs/1/rules/buildinfo.mk + +pkg = python-sugar + +DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE) +DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 +DEB_UPSTREAM_TARBALL_MD5 = c5790a18fd9ee86a49ffa727505294f5 + +# Strip hardcoded rpath +binary-strip/$(pkg):: + find $(DEB_DESTDIR)/usr/lib -type f -name '*.so' -exec chrpath -d '{}' ';' + +# Cleanup a few empty subdirs missed by py-compile.mk cleanup routines +clean:: + -[ ! -d $(DEB_BUILDDIR) ] || for flavor in $(cdbs_python_curpkg_build_versions); do \ + (cd $(DEB_BUILDDIR) && rmdir -p $$flavor/src/sugar); \ + done + -[ ! -d $(DEB_BUILDDIR) ] || rmdir $(DEB_BUILDDIR) + +# Needed by upstream build process +# pygtk << 2.9 contained gobject +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9), intltool + +# Needed for our packaging +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), chrpath + +# Merge duplicate build-dependencies +include debian/cdbs/1/rules/package-relations.mk --- sugar-base-0.83.3.orig/debian/watch +++ sugar-base-0.83.3/debian/watch @@ -0,0 +1,4 @@ +# run the "uscan" command to check for upstream updates and more. +version=3 +http://dev.laptop.org/pub/sugar/sources/sugar-base/sugar-base-(0\.83\..*)\.tar\.bz2 +http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-(0\.83\..*)\.tar\.bz2 --- sugar-base-0.83.3.orig/debian/pycompat +++ sugar-base-0.83.3/debian/pycompat @@ -0,0 +1 @@ +2 --- sugar-base-0.83.3.orig/debian/control.in +++ sugar-base-0.83.3/debian/control.in @@ -0,0 +1,24 @@ +Source: sugar-base +Section: python +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC +Build-Depends: @cdbs@ +Standards-Version: 3.7.3 +Homepage: http://sugarlabs.org/ +XS-Python-Version: all + +Package: python-sugar +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Recommends: sugar +Suggests: ipython +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Sugar graphical shell - core functionality + Sugar is a graphical user interface aimed at children. + . + Sugar is mainly used as the interface for One Laptop Per Child (OLPC) + XO machines. + . + This package contains the base modules for Sugar. --- sugar-base-0.83.3.orig/debian/README.packaging +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/control +++ sugar-base-0.83.3/debian/control @@ -0,0 +1,24 @@ +Source: sugar-base +Section: python +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC +Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), debhelper (>= 5.0.44), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), dh-buildinfo, python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9), intltool, chrpath +Standards-Version: 3.7.3 +Homepage: http://sugarlabs.org/ +XS-Python-Version: all + +Package: python-sugar +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Recommends: sugar +Suggests: ipython +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Sugar graphical shell - core functionality + Sugar is a graphical user interface aimed at children. + . + Sugar is mainly used as the interface for One Laptop Per Child (OLPC) + XO machines. + . + This package contains the base modules for Sugar. --- sugar-base-0.83.3.orig/debian/compat +++ sugar-base-0.83.3/debian/compat @@ -0,0 +1 @@ +6 --- sugar-base-0.83.3.orig/debian/README.cdbs-tweaks +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/patches/2991_enable_danish_l10n.patch +++ sugar-base-0.83.3/debian/patches/2991_enable_danish_l10n.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 4c66748..798f974 100755 +--- a/configure ++++ b/configure +@@ -19852,7 +19852,7 @@ fi + + # Setup GETTEXT + # +-ALL_LINGUAS="af am ar ay bg bn bn_IN ca de dz el en es fa fa_AF ff fr gu ha hi ht ig is it ja km ko mk ml mn mr mvo nb ne nl pa pap pis pl ps pt pt_BR qu ro ru rw sd si sl te th tpi tr ur vi yo zh_CN zh_TW" ++ALL_LINGUAS="af am ar ay bg bn bn_IN ca da de dz el en es fa fa_AF ff fr gu ha hi ht ig is it ja km ko mk ml mn mr mvo nb ne nl pa pap pis pl ps pt pt_BR qu ro ru rw sd si sl te th tpi tr ur vi yo zh_CN zh_TW" + + GETTEXT_PACKAGE=sugar-base + --- sugar-base-0.83.3.orig/debian/patches/README +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/patches/1001_enable_danish_l10n.patch +++ sugar-base-0.83.3/debian/patches/1001_enable_danish_l10n.patch @@ -0,0 +1,44 @@ +diff --git a/po/da.po b/po/da.po +new file mode 100644 +index 0000000..8c815ea +--- /dev/null ++++ b/po/da.po +@@ -0,0 +1,38 @@ ++# Danish translations for sugar-base package ++# Danske oversættelser for pakke sugar-base. ++# Copyright (C) 2008 Jonas Smedegaard ++# This file is distributed under the same license as the sugar-base package. ++# Jonas Smedegaard , 2008. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: sugar-base 0.82.1\n" ++"Report-Msgid-Bugs-To: None\n" ++"POT-Creation-Date: 2008-08-07 20:41+0200\n" ++"PO-Revision-Date: 2008-08-07 20:42+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" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: /home/jonas/src/GITauth/collab-maint/sugar-base/./po/../src/sugar/mime.py:32 ++msgid "Text" ++msgstr "Tekst" ++ ++#: /home/jonas/src/GITauth/collab-maint/sugar-base/./po/../src/sugar/mime.py:40 ++msgid "Image" ++msgstr "Billede" ++ ++#: /home/jonas/src/GITauth/collab-maint/sugar-base/./po/../src/sugar/mime.py:45 ++msgid "Audio" ++msgstr "Lyd" ++ ++#: /home/jonas/src/GITauth/collab-maint/sugar-base/./po/../src/sugar/mime.py:50 ++msgid "Video" ++msgstr "Video" ++ ++#: /home/jonas/src/GITauth/collab-maint/sugar-base/./po/../src/sugar/mime.py:55 ++msgid "Link" ++msgstr "Henvisning" --- sugar-base-0.83.3.orig/debian/patches/series +++ sugar-base-0.83.3/debian/patches/series @@ -0,0 +1,2 @@ +1001_enable_danish_l10n.patch +2991_enable_danish_l10n.patch --- sugar-base-0.83.3.orig/debian/cdbs/1/rules/upstream-tarball.mk +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/cdbs/1/rules/copyright-check.mk +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/cdbs/1/rules/package-relations.mk +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/cdbs/1/rules/buildinfo.mk +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/cdbs/1/class/python-autotools.mk +++ sugar-base-0.83.3/debian/cdbs/1/class/python-autotools.mk @@ -0,0 +1,76 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2008 Jonas Smedegaard +# Description: Class to configure + build GNU autoconf+automake+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_autotools +_cdbs_class_python_autotools = 1 + +#include $(_cdbs_class_path)/python-vars.mk$(_cdbs_makefile_suffix) +include debian/cdbs/1/class/python-vars.mk + +# Flavors are used in implicit rules, so must be set before including makefile +DEB_MAKE_FLAVORS = $(cdbs_python_curpkg_build_versions) + +#include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include debian/cdbs/1/class/autotools.mk + +# Declare Build-Deps for packages using this file +# 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_CONFIGURE_SCRIPT_ENV += PYTHON="python$(cdbs_make_curflavor)" + +# This class can optionally use debhelper's commands. +# (if not, this build target should simply be ignored) +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: binary-install-python/% +$(patsubst %,binary-install-python/%,$(DEB_PACKAGES)) :: binary-install-python/%: +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 + +clean:: +ifeq (, $(cdbs_selected_pycompat)) + echo "$(cdbs_pycompat)" >debian/pycompat +endif # use pycompat + rm -rf python-build-stamp + +## TODO: Drop this when DEB_PYTHON_PACKAGES is only resolved in build targets +pre-build clean:: + $(cdbs_python_pkgresolve_check) + +endif --- sugar-base-0.83.3.orig/debian/cdbs/1/class/autotools.mk +++ sugar-base-0.83.3/debian/cdbs/1/class/autotools.mk @@ -0,0 +1,55 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 2008 Jonas Smedegaard +# Description: A class to configure and build GNU autoconf+automake 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., 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_class_autotools +_cdbs_class_autotools = 1 + +include debian/cdbs/1/class/autotools-vars.mk +include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix) + +cdbs_configure_stamps = $(if $(cdbs_make_multibuilds),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_multibuilds)),debian/stamp-autotools) + +# Overriden from makefile-vars.mk. We pass CFLAGS and friends to ./configure, so +# no need to pass them to make. +DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(cdbs_make_curbuilddir) + +pre-build:: + $(if $(cdbs_make_multibuilds),mkdir -p debian/stamp-autotools) + +common-configure-arch common-configure-indep:: common-configure-impl +common-configure-impl:: $(cdbs_configure_stamps) +$(cdbs_configure_stamps): + chmod a+x $(DEB_CONFIGURE_SCRIPT) + $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,mkdir -p $(cdbs_make_curbuilddir)) + $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) + $(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),if [ -e $(cdbs_make_curbuilddir)/libtool ]; then cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; fi) + touch $@ + +makefile-clean:: + $(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-autotools,rm -f debian/stamp-autotools) + +$(cdbs_make_clean_nonstamps):: + $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,-rmdir --ignore-fail-on-non-empty $(cdbs_make_curbuilddir)) + $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-autotools%)) +endif --- sugar-base-0.83.3.orig/debian/cdbs/1/class/autotools-vars.mk +++ sugar-base-0.83.3/debian/cdbs/1/class/autotools-vars.mk @@ -0,0 +1,114 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003,2008 Jonas Smedegaard +# Description: Common variables for GNU autoconf+automake 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., 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_class_autotools_vars +_cdbs_class_autotools_vars = 1 + +#include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) +include debian/cdbs/1/class/makefile.mk + +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_curpkgdestdir) +DEB_MAKE_CLEAN_TARGET = distclean +#DEB_MAKE_CHECK_TARGET = check + +DEB_AC_AUX_DIR = $(DEB_SRCDIR) + +DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/configure +DEB_CONFIGURE_SCRIPT_ENV = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" +DEB_CONFIGURE_NORMAL_ARGS = --build=$(DEB_BUILD_GNU_TYPE) --prefix=$(DEB_CONFIGURE_PREFIX) --includedir=$(DEB_CONFIGURE_INCLUDEDIR) --mandir=$(DEB_CONFIGURE_MANDIR) --infodir=$(DEB_CONFIGURE_INFODIR) --sysconfdir=$(DEB_CONFIGURE_SYSCONFDIR) --localstatedir=$(DEB_CONFIGURE_LOCALSTATEDIR) --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-maintainer-mode --disable-dependency-tracking + +# Provide --host only if different from --build, as recommended in +# autotools-dev README.Debian: When provided (even if equal) autotools +# 2.52+ switches to cross-compiling mode. + +ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) +DEB_CONFIGURE_NORMAL_ARGS += --host=$(DEB_HOST_GNU_TYPE) +endif + +### TODO: Fix the above to also handle 2.13 which needs other tweaks +### (read autotools-dev README.Debian!). For now we conflict with +### autoconf2.13! + +# This magic is required because otherwise configure wants to analyse +# $0 to see whether a VPATH build is needed. This tells it with +# absolute certainly that this is NOT a VPATH build. +DEB_CONFIGURE_NORMAL_ARGS += $(if $(subst $(DEB_SRCDIR),,$(cdbs_make_curbuilddir)),,--srcdir=.) + +DEB_CONFIGURE_INVOKE = cd $(cdbs_make_curbuilddir) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) +DEB_CONFIGURE_PREFIX =/usr +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_CONFIGURE_MANDIR ="\$${prefix}/share/man" +DEB_CONFIGURE_INFODIR ="\$${prefix}/share/info" +DEB_CONFIGURE_SYSCONFDIR =/etc +DEB_CONFIGURE_LOCALSTATEDIR =/var +DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/lib/$(DEB_SOURCE_PACKAGE)" +DEB_CONFIGURE_EXTRA_FLAGS = + +ifneq (, $(DEB_AUTO_UPDATE_LIBTOOL)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtool +endif + +ifneq (:, $(DEB_AUTO_UPDATE_ACLOCAL):$(DEB_AUTO_UPDATE_AUTOMAKE)) +ifeq ($(DEB_AUTO_UPDATE_ACLOCAL), $(DEB_AUTO_UPDATE_AUTOMAKE)) +# avoid duped build-dependencies +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_ACLOCAL) +else +# either only one of them is required, or different versions are +ifneq (, $(DEB_AUTO_UPDATE_ACLOCAL)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_ACLOCAL) +endif +ifneq (, $(DEB_AUTO_UPDATE_AUTOMAKE)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_AUTOMAKE) +endif +endif +endif + +ifneq (:, $(DEB_AUTO_UPDATE_AUTOCONF):$(DEB_AUTO_UPDATE_AUTOHEADER)) +ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), $(DEB_AUTO_UPDATE_AUTOHEADER)) +# avoid duped build-dependencies +ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf +endif +else +# either only one of them is required, or different versions are +ifneq (, $(DEB_AUTO_UPDATE_AUTOCONF)) +ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf +endif +endif +ifneq (, $(DEB_AUTO_UPDATE_AUTOHEADER)) +ifeq ($(DEB_AUTO_UPDATE_AUTOHEADER), 2.13) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 +else +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf +endif +endif +endif +endif + +endif --- sugar-base-0.83.3.orig/debian/cdbs/1/class/makefile.mk +++ sugar-base-0.83.3/debian/cdbs/1/class/makefile.mk @@ -0,0 +1,83 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003,2008 Jonas Smedegaard +# Description: Builds and cleans packages which have a Makefile +# +# 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_class_makefile +_cdbs_class_makefile = 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) +#include $(_cdbs_class_path)/makefile-vars.mk$(_cdbs_makefile_suffix) +include debian/cdbs/1/class/makefile-vars.mk + +# TODO: Move these to buildcore.mk +cdbs_curpkgbuilddir = $(if $(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_BUILDDIR)) +cdbs_curpkgdestdir = $(if $(DEB_DESTDIR_$(cdbs_curpkg)),$(DEB_DESTDIR_$(cdbs_curpkg)),$(DEB_DESTDIR)) + +cdbs_make_multibuilds = $(sort $(DEB_MAKE_FLAVORS)) +cdbs_make_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),$(error DEB_MAKE_FLAVORS in use: DEB_BUILDDIR must be different from DEB_SRCDIR, and needs to be declared before including makefile.mk)) +cdbs_make_build_stamps = $(if $(cdbs_make_multibuilds),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-build/%,$(cdbs_make_multibuilds)),debian/stamp-makefile-build) +cdbs_make_install_stamps = $(if $(cdbs_make_multibuilds),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-install/%,$(cdbs_make_multibuilds)),debian/stamp-makefile-install) +cdbs_make_check_stamps = $(if $(cdbs_make_multibuilds),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-check/%,$(cdbs_make_multibuilds)),debian/stamp-makefile-check) +cdbs_make_clean_nonstamps = $(if $(cdbs_make_multibuilds),$(patsubst %,makefile-clean/%,$(cdbs_make_multibuilds)),makefile-clean) +cdbs_make_curflavor = $(filter-out %/,$(subst /,/ ,$@)) +cdbs_make_curbuilddir = $(if $(cdbs_make_multibuilds),$(subst @FLAVOR@,$(cdbs_make_curflavor),$(DEB_MAKE_BUILDDIRSKEL)),$(cdbs_curpkgbuilddir)) + +DEB_PHONY_RULES += makefile-clean $(cdbs_make_clean_nonstamps) + +pre-build:: + $(if $(cdbs_make_multibuilds),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install) + $(and $(cdbs_make_multibuilds),$(DEB_MAKE_CHECK_TARGET),mkdir -p debian/stamp-makefile-check) + +common-build-arch common-build-indep:: $(cdbs_make_build_stamps) +$(cdbs_make_build_stamps): + +$(DEB_MAKE_INVOKE) $(DEB_MAKE_BUILD_TARGET) + touch $@ + +cleanbuilddir:: makefile-clean +makefile-clean:: $(if $(cdbs_make_multibuilds),$(cdbs_make_clean_nonstamps)) + $(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-build debian/stamp-makefile-install,rm -f debian/stamp-makefile-build debian/stamp-makefile-install) + +$(cdbs_make_clean_nonstamps):: + $(if $(DEB_MAKE_CLEAN_TARGET),+-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET),@echo "DEB_MAKE_CLEAN_TARGET unset, not running clean") + $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-makefile-build%) $(@:makefile-clean%=debian/stamp-makefile-install%)) + +common-install-arch common-install-indep:: common-install-impl +common-install-impl:: $(cdbs_make_install_stamps) +$(cdbs_make_install_stamps):: + $(if $(DEB_MAKE_INSTALL_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET),@echo "DEB_MAKE_INSTALL_TARGET unset, skipping default makefile.mk common-install target") + $(if $(DEB_MAKE_INSTALL_TARGET),touch $@) + +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) +common-build-arch common-build-indep:: $(cdbs_make_check_stamps) +$(cdbs_make_check_stamps) : debian/stamp-makefile-check% : debian/stamp-makefile-build% + $(if $(DEB_MAKE_CHECK_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_CHECK_TARGET),@echo "DEB_MAKE_CHECK_TARGET unset, not running checks") + $(if $(DEB_MAKE_CHECK_TARGET),touch $@) + +makefile-clean:: + $(if $(DEB_MAKE_CHECK_TARGET),$(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-check,rm -f debian/stamp-makefile-check)) + +$(cdbs_make_clean_nonstamps):: + $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-makefile-check%)) +endif + +endif --- sugar-base-0.83.3.orig/debian/cdbs/1/class/python-vars.mk +++ sugar-base-0.83.3/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-base-0.83.3.orig/debian/cdbs/1/class/makefile-vars.mk +++ sugar-base-0.83.3/debian/cdbs/1/class/makefile-vars.mk @@ -0,0 +1,72 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 2008 Jonas Smedegaard +# Description: Defines useful variables for packages which have a Makefile +# +# 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_class_makefile_vars +_cdbs_class_makefile_vars = 1 + +include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) + +DEB_MAKE_MAKEFILE = +DEB_MAKE_ENVVARS = +DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) $(if $(DEB_MAKE_MAKEFILE), -f $(DEB_MAKE_MAKEFILE),) -C $(cdbs_make_curbuilddir) CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)") CXXFLAGS=$(if $(CXXFLAGS_$(cdbs_curpkg)),"$(CXXFLAGS_$(cdbs_curpkg))","$(CXXFLAGS)") CPPFLAGS=$(if $(CPPFLAGS_$(cdbs_curpkg)),"$(CPPFLAGS_$(cdbs_curpkg))","$(CPPFLAGS)") LDFLAGS=$(if $(LDFLAGS_$(cdbs_curpkg)),"$(LDFLAGS_$(cdbs_curpkg))","$(LDFLAGS)") + +# This variable is deprecated. +DEB_BUILD_MAKE_TARGET = +_cdbs_deprecated_vars += DEB_BUILD_MAKE_TARGET +# New in 0.2.8. +DEB_MAKE_BUILD_TARGET = $(DEB_BUILD_MAKE_TARGET) + +# If your Makefile provides an "install" target, you need to give the requisite commands +# here to install it into the staging directory. For automake-using programs, this +# looks like: install DESTDIR=$(DEB_DESTDIR) +# If you're using automake though, you likely want to be including autotools.mk instead +# of this file. +# For multi-flavored builds (see below) installed per-flavor, it looks like this: +# install DESTDIR=$(cdbs_curpkgdestdir) + +# This variable is deprecated. +DEB_CLEAN_MAKE_TARGET = clean +_cdbs_deprecated_vars += DEB_CLEAN_MAKE_TARGET +_cdbs_deprecated_DEB_CLEAN_MAKE_TARGET_default := $(DEB_CLEAN_MAKE_TARGET) +# New in 0.2.8. +DEB_MAKE_CLEAN_TARGET = $(DEB_CLEAN_MAKE_TARGET) + +# This variable is deprecated. +DEB_MAKE_TEST_TARGET = +_cdbs_deprecated_vars += DEB_MAKE_TEST_TARGET +# New in 0.2.8. +# New in 0.4.2. +DEB_MAKE_CHECK_TARGET = $(DEB_MAKE_TEST_TARGET) + +# If DEB_MAKE_FLAVORS is set compilation is done once per flavor. +# NB! This must be declared _before_ including makefile.mk +#DEB_MAKE_FLAVORS = light normal enhanced + +# If building multiple flavors, skeleton strings are used for +# DEB_BUILDDIR and DEB_DESTDIR, with @FLAVOR@ expanding to actual +# flavor. +DEB_MAKE_BUILDDIRSKEL = $(cdbs_curpkgbuilddir)/@FLAVOR@ +DEB_MAKE_DESTDIRSKEL = $(cdbs_curpkgdestdir)/@FLAVOR@ + +endif