--- sugar-0.82.0.orig/debian/sugar-emulator.desktop +++ sugar-0.82.0/debian/sugar-emulator.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Sugar Emulator +Exec=/usr/bin/sugar-emulator -x +Type=Application --- sugar-0.82.0.orig/debian/control.in +++ sugar-0.82.0/debian/control.in @@ -0,0 +1,35 @@ +Source: sugar +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.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar.git;a=summary +Homepage: http://wiki.laptop.org/go/Sugar +XS-Python-Version: all + +Package: sugar +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, python-gst0.10 (>= 0.10.6.1), python-hippocanvas, python-gobject, python-gtk2, python-cairo, python-dbus, python-telepathy, python-numpy, python-gnome2-desktop, librsvg2-common, python-simplejson, python-sugar, python-sugar-toolkit (>= 0.81.4), matchbox-window-manager, dbus-x11, telepathy-gabble, telepathy-salut, telepathy-stream-engine +Recommends: sugar-artwork (>= 0.79.2) | sugar-artwork, network-manager, net-tools, gstreamer0.10-plugins-good, xserver-xephyr, x11-xserver-utils | xrandr | xbase-clients +Suggests: openssh-client +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: window manager from the OLPC project + 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. + +Package: sugar-activities +Architecture: all +Depends: sugar-journal-activity, sugar-calculate-activity, sugar-memorize-activity, sugar-turtleart-activity, sugar-chat-activity, sugar-connect-activity, sugar-web-activity, sugar-pippy-activity, sugar-logviewer-activity, sugar-terminal-activity +Description: Activities for the Sugar enviornment + This package depends on all the Sugar Activities packaged in Ubuntu, to give + you a set of preinstalled activities. It is safe to remove this package if + some of the activities are not desired. --- sugar-0.82.0.orig/debian/rules +++ sugar-0.82.0/debian/rules @@ -0,0 +1,31 @@ +#!/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 debian/cdbs/1/class/python-autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/1/rules/buildinfo.mk + +DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE) +DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 +DEB_UPSTREAM_TARBALL_MD5 = 1f26fa4aee57469a0636a70649343fb3 + +# Needed by upstream build process +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libglib2.0-dev, python-gtk2-dev, gettext, intltool, shared-mime-info + +# Needed for our packaging routines +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-empy + +# Resolve, cleanup and apply CDBS-declared dependencies +include debian/cdbs/1/rules/package-relations.mk --- sugar-0.82.0.orig/debian/pycompat +++ sugar-0.82.0/debian/pycompat @@ -0,0 +1 @@ +2 --- sugar-0.82.0.orig/debian/copyright +++ sugar-0.82.0/debian/copyright @@ -0,0 +1,142 @@ +This is sugar packaged for Debian GNU systems. + +Upstream source: http://dev.laptop.org/pub/sugar/sources/sugar/ + +Upstream Git source: http://dev.laptop.org/git/sugar + +Upstream author: Red Hat, Inc. + +Files: debian/* +Copyright: © 2007-2008 Jonas Smedegaard +License: GPL-2+ + +Files: src/*, service/bundleregistry.py +Copyright: © 2006-2007, Red Hat, Inc. +License: GPL-2+ + +Files: src/controlpanel/cmd.py, src/controlpanel/model/datetime.py, + src/controlpanel/model/language.py, src/controlpanel/toolbar.py +Copyright: © 2007-2008 One Laptop Per Child +License: GPL-2+ + +Files: src/model/Owner.py, src/view/devices/network/mesh.py, + src/view/frame/activitiestray.py, src/view/home/favoritesview.py +Copyright: © 2008 One Laptop Per Child + © 2006-2007, Red Hat, Inc. +License: GPL-2+ + +Files: config.py, config.py.in, bin/*, src/session.py, + src/view/home/launchbox.py +Copyright: © 2008, Red Hat, Inc. +License: GPL-2+ + +Files: src/intro/*, src/model/devices/device*.py, + src/view/frame/eventarea.py, src/view/home/proc_smaps.py, + src/view/home/transitionbox.py +Copyright: © 2007, Red Hat, Inc. +License: GPL-2+ + +Files: tests/*, src/view/home/*layout.py, src/logsmanager.py, + src/controlpanel/control.py, src/view/home/spreadlayout.py +Copyright: © 2007, Red Hat, Inc. +License: LGPL-2+ + +Files: src/view/home/snowflakelayout.py +Copyright: © 2006-2007, Red Hat, Inc. +License: LGPL-2+ + +Files: src/view/home/grid.py +Copyright: © 2008 One Laptop Per Child + © 2007 Red Hat, Inc +License: GPL-2+ + +Files: src/model/devices/speaker.py, src/view/devices/speaker.py +Copyright: © 2008 Martin Dengler +License: GPL-2+ + +Files: src/view/tabbinghandler.py +Copyright: © 2008, Benjamin Berg +License: GPL-2+ + +Files: bin/sugar-launch, maint-helper.py +Copyright: © 2007, Red Hat, Inc. +License: GPL-2+ + +Files: bin/sugar-activity, sugar-emulator service/clipboardservice.py +Copyright: © 2006, Red Hat, Inc. +License: GPL-2+ + +Files: service/activityregistryservice.py +Copyright: © 2007, One Laptop Per Child + © 2006-2007, Red Hat, Inc +License: GPL-2+ + +Files: src/view/clipboardicon.py +Copyright: © 2007, One Laptop Per Child + © 2007, Red Hat, Inc +License: GPL-2+ + +Files: service/sugar-shell-service +Copyright: © 2007, One Laptop Per Child + © 2006, Red Hat, Inc +License: GPL-2+ + +Files: src/controlpanel/inlinealert.py, src/controlpanel/sectionview.py, + src/controlpanel/view/aboutme.py, src/controlpanel/view/aboutxo.py, + src/controlpanel/view/datetime.py, src/controlpanel/view/frame.py, + src/controlpanel/view/language.py, src/controlpanel/view/network.py +Copyright: © 2008, OLPC +License: GPL-2+ + +Files: service/__init__.py, service/clipboardobject.py, + src/view/clipboardmenu.py, src/view/frame/clipboardpanelwindow.py, + src/view/frame/clipboardtray.py +Copyright: © 2007, One Laptop Per Child +License: GPL-2+ + +Files: src/controlpanel/control.py, src/view/frame/activitybutton.py +Copyright: © 2007, One Laptop Per Child +License: LGPL-2+ + +Files: data/em.py +Copyright: © 2002-2003 Erik Max Francis +License: GPL-2+ + +Files: src/model/homeactivity.py, src/model/homemodel.py +Copyright: © 2006-2007 Owen Williams. +License: GPL-2+ + +Files: src/view/frame/frameinvoker.py +Copyright: © 2007, Eduardo Silva +License: LGPL-2+ + +Files: po/Makefile.in.in +Copyright: © 1995-1997 by Ulrich Drepper + © 2004-2008 Rodney Dawes +License: GAP + +Files: Makefile.in +Copyright © 1994-2006 Free Software Foundation, Inc. +License: GAP + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + +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. + +On Debian systems, the complete text of the GNU General Public License +can be found in file "/usr/share/common-licenses/GPL", and the complete +text of the GNU Lesser General Public License can be found in file +"/usr/share/common-licenses/LGPL".. --- sugar-0.82.0.orig/debian/copyright_hints +++ sugar-0.82.0/debian/copyright_hints @@ -0,0 +1,375 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX +Upstream-Name: Untrusted draft - double-check copyrights yourself! + +Files: 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/es.po + po/fa.po + po/fa_AF.po + po/ff.po + po/gu.po + po/ha.po + po/hi.po + po/ht.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/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: AUTHORS + Makefile.am + README + bin/Makefile.am + bin/sugar + bin/sugar-backup + bin/sugar-install-bundle + bin/sugar.in + configure.ac + data/Makefile.am + data/activities.defaults + data/gtkrc.em + data/icons/Makefile.am + data/icons/module-about_me.svg + data/icons/module-about_my_xo.svg + data/icons/module-date_and_time.svg + data/icons/module-frame.svg + data/icons/module-language.svg + data/icons/module-network.svg + data/icons/module-power.svg + data/kbdconfig + data/mime.defaults + data/sugar-xo.gtkrc + data/sugar.desktop + data/sugar.gtkrc + data/sugar.xml.in + po/ChangeLog + po/POTFILES.in + po/POTFILES.skip + po/de.po + po/pl.po + service/Makefile.am + service/org.laptop.ActivityRegistry.service.in + service/org.laptop.Clipboard.service.in + src/Makefile.am + src/controlpanel/Makefile.am + src/controlpanel/model/Makefile.am + src/controlpanel/view/Makefile.am + src/hardware/Makefile.am + src/hardware/NetworkManagerInfo.conf + src/hardware/schoolserver.py + src/intro/Makefile.am + src/intro/__init__.py + src/intro/default-picture.png + src/intro/glive.py + src/model/Makefile.am + src/model/devices/Makefile.am + src/model/devices/network/Makefile.am + src/view/Makefile.am + src/view/devices/Makefile.am + src/view/devices/network/Makefile.am + src/view/frame/Makefile.am + src/view/home/Makefile.am +Copyright: *No copyright* +License: UNKNOWN + +Files: service/bundleregistry.py + src/controlpanel/__init__.py + src/hardware/__init__.py + src/hardware/hardwaremanager.py + src/hardware/keydialog.py + src/hardware/nmclient.py + src/hardware/nminfo.py + src/model/BuddyModel.py + src/model/Friends.py + src/model/Invites.py + src/model/MeshModel.py + src/model/__init__.py + src/model/accesspointmodel.py + src/model/devices/__init__.py + src/model/devices/battery.py + src/model/devices/network/__init__.py + src/model/devices/network/mesh.py + src/model/devices/network/wired.py + src/model/devices/network/wireless.py + src/model/shellmodel.py + src/shellservice.py + src/view/ActivityHost.py + src/view/BuddyIcon.py + src/view/BuddyMenu.py + src/view/OverlayWindow.py + src/view/Shell.py + src/view/__init__.py + src/view/devices/__init__.py + src/view/devices/battery.py + src/view/devices/deviceview.py + src/view/devices/network/__init__.py + src/view/devices/network/wired.py + src/view/devices/network/wireless.py + src/view/frame/__init__.py + src/view/frame/frame.py + src/view/frame/framewindow.py + src/view/frame/friendstray.py + src/view/frame/zoomtoolbar.py + src/view/home/FriendView.py + src/view/home/FriendsBox.py + src/view/home/HomeWindow.py + src/view/home/MeshBox.py + src/view/home/MyIcon.py + src/view/home/__init__.py + src/view/home/snowflakelayout.py + src/view/keyhandler.py +Copyright: 2006-2007, Red Hat, Inc +License: GPL-2+ + +Files: Makefile.in + bin/Makefile.in + data/Makefile.in + data/icons/Makefile.in + service/Makefile.in + src/Makefile.in + src/controlpanel/Makefile.in + src/controlpanel/model/Makefile.in + src/controlpanel/view/Makefile.in + src/hardware/Makefile.in + src/intro/Makefile.in + src/model/Makefile.in + src/model/devices/Makefile.in + src/model/devices/network/Makefile.in + src/view/Makefile.in + src/view/devices/Makefile.in + src/view/devices/network/Makefile.in + src/view/frame/Makefile.in + src/view/home/Makefile.in +Copyright: 1994-2002 +License: UNKNOWN (GENERATED FILE) + +Files: src/controlpanel/gui.py + src/controlpanel/model/__init__.py + src/controlpanel/model/aboutme.py + src/controlpanel/model/aboutxo.py + src/controlpanel/model/frame.py + src/controlpanel/model/network.py + src/controlpanel/model/power.py + src/controlpanel/view/__init__.py + src/view/frame/devicestray.py + src/view/frame/notification.py + src/view/home/HomeBox.py + src/view/home/activitieslist.py + src/view/home/favoriteslayout.py + src/view/palettes.py + src/view/pulsingicon.py +Copyright: 2008, One Laptop Per Child +License: GPL-2+ + +Files: bin/sugar-control-panel + bin/sugar-control-panel.in + bin/sugar-emulator + bin/sugar-emulator.in + bin/sugar-shell + bin/sugar-shell-service + bin/sugar-shell-service.in + bin/sugar-shell.in + service/config.py + service/config.py.in + src/config.py + src/config.py.in + src/session.py + src/view/launchwindow.py +Copyright: 2008, Red Hat, Inc +License: GPL-2+ + +Files: bin/sugar-launch + src/intro/colorpicker.py + src/intro/intro.py + src/logsmanager.py + src/model/devices/device.py + src/model/devices/devicesmodel.py + src/view/frame/eventarea.py + src/view/home/proc_smaps.py + src/view/home/spreadlayout.py + src/view/home/transitionbox.py +Copyright: 2007, Red Hat, Inc +License: GPL-2+ + +Files: src/controlpanel/inlinealert.py + src/controlpanel/sectionview.py + src/controlpanel/view/aboutme.py + src/controlpanel/view/aboutxo.py + src/controlpanel/view/datetime.py + src/controlpanel/view/frame.py + src/controlpanel/view/language.py + src/controlpanel/view/network.py + src/controlpanel/view/power.py +Copyright: 2008, OLPC +License: GPL-2+ + +Files: service/__init__.py + service/clipboardobject.py + src/view/clipboardmenu.py + src/view/frame/clipboardpanelwindow.py + src/view/frame/clipboardtray.py +Copyright: 2007, One Laptop Per Child +License: GPL-2+ + +Files: bin/sugar-activity + service/clipboardservice.py + src/emulator.py + src/main.py +Copyright: 2006, Red Hat, Inc +License: GPL-2+ + +Files: src/controlpanel/cmd.py + src/controlpanel/model/datetime.py + src/controlpanel/model/language.py + src/controlpanel/toolbar.py +Copyright: 2007-2008, One Laptop Per Child +License: GPL-2+ + +Files: src/model/Owner.py + src/view/devices/network/mesh.py + src/view/frame/activitiestray.py + src/view/home/favoritesview.py +Copyright: 2008, One Laptop Per Child + 2006-2007, Red Hat, Inc +License: GPL-2+ + +Files: src/model/devices/speaker.py + src/view/devices/speaker.py +Copyright: 2008, Martin Dengler +License: GPL-2+ + +Files: missing +Copyright: 1996-1997, 1999-2000, 2002-2006 +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: intltool-extract.in +Copyright: 2000-2001, 2003, Free Software Foundation +License: GPL-2+ (GENERATED FILE) + +Files: src/model/homemodel.py +Copyright: 2006-2007, Owen Williams +License: GPL-2+ (GENERATED FILE) + +Files: data/em.py +Copyright: 2002-2003, Erik Max Francis' +License: GPL-2+ + +Files: src/model/homeactivity.py +Copyright: 2006-2007, Owen Williams +License: GPL-2+ + +Files: src/view/frame/frameinvoker.py +Copyright: 2007, Eduardo Silva +License: GPL-2+ + +Files: service/main.py +Copyright: 2007, One Laptop Per Child + 2006, Red Hat, Inc +License: GPL-2+ + +Files: service/activityregistryservice.py +Copyright: 2007, One Laptop Per Child + 2006-2007, Red Hat, Inc +License: GPL-2+ + +Files: src/view/clipboardicon.py +Copyright: 2007, Red Hat, Inc + 2007, One Laptop Per Child +License: GPL-2+ + +Files: src/view/tabbinghandler.py +Copyright: 2008, Benjamin Berg +License: GPL-2+ + +Files: src/view/home/grid.py +Copyright: 2008, One Laptop Per Child + 2007, Red Hat, Inc +License: GPL-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: COPYING +Copyright: 1989, 1991, Free Software Foundation, Inc. + the software, and +License: UNKNOWN + +Files: po/Makefile.in.in +Copyright: 1995-1997, by Ulrich Drepper + 2004-2008, Rodney Dawes +License: UNKNOWN + +Files: po/fr.po +Copyright: 2007, the Package Owner +License: UNKNOWN + +Files: po/ig.po +Copyright: YEAR THE PACKAGE'S HOLDER, 2006 +License: UNKNOWN + --- sugar-0.82.0.orig/debian/sugar.install +++ sugar-0.82.0/debian/sugar.install @@ -0,0 +1,5 @@ +debian/sugar.desktop usr/share/xsessions/ +debian/sugar-emulator.desktop usr/share/applications/ +debian/tmp/usr/bin/* +debian/tmp/usr/share/* +debian/tmp/etc/* --- sugar-0.82.0.orig/debian/compat +++ sugar-0.82.0/debian/compat @@ -0,0 +1 @@ +6 --- sugar-0.82.0.orig/debian/control +++ sugar-0.82.0/debian/control @@ -0,0 +1,35 @@ +Source: sugar +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC +Uploaders: Jonas Smedegaard +Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, shared-mime-info, python-empy +Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/collab-maint/sugar.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar.git;a=summary +Homepage: http://wiki.laptop.org/go/Sugar +XS-Python-Version: all + +Package: sugar +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, python-gst0.10 (>= 0.10.6.1), python-hippocanvas, python-gobject, python-gtk2, python-cairo, python-dbus, python-telepathy, python-numpy, python-gnome2-desktop, librsvg2-common, python-simplejson, python-sugar, python-sugar-toolkit (>= 0.81.4), matchbox-window-manager, dbus-x11, telepathy-gabble, telepathy-salut, telepathy-stream-engine +Recommends: sugar-artwork (>= 0.79.2) | sugar-artwork, network-manager, net-tools, gstreamer0.10-plugins-good, xserver-xephyr, x11-xserver-utils | xrandr | xbase-clients +Suggests: openssh-client +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: window manager from the OLPC project + 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. + +Package: sugar-activities +Architecture: all +Depends: sugar-journal-activity, sugar-calculate-activity, sugar-memorize-activity, sugar-turtleart-activity, sugar-chat-activity, sugar-connect-activity, sugar-web-activity, sugar-pippy-activity, sugar-logviewer-activity, sugar-terminal-activity +Description: Activities for the Sugar enviornment + This package depends on all the Sugar Activities packaged in Ubuntu, to give + you a set of preinstalled activities. It is safe to remove this package if + some of the activities are not desired. --- sugar-0.82.0.orig/debian/sugar.desktop +++ sugar-0.82.0/debian/sugar.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Sugar +Exec=/usr/bin/sugar +Type=Application --- sugar-0.82.0.orig/debian/sugar.menu +++ sugar-0.82.0/debian/sugar.menu @@ -0,0 +1,4 @@ +?package(sugar):needs="wm" section="Window Managers" \ + title="Sugar" command="/usr/bin/sugar" +?package(sugar):needs="X11" section="Applications/Emulators" \ + title="Sugar Emulator" command="/usr/bin/sugar-emulator -x" --- sugar-0.82.0.orig/debian/README.cdbs-tweaks +++ sugar-0.82.0/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-0.82.0.orig/debian/README.packaging +++ sugar-0.82.0/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-0.82.0.orig/debian/changelog +++ sugar-0.82.0/debian/changelog @@ -0,0 +1,274 @@ +sugar (0.82.0-1ubuntu2) intrepid; urgency=low + + * Actually install things in to the sugar package. (LP: #281458) + - Since we introduced a second package we need to specify what goes in + the sugar package. + + -- James Westby Sat, 11 Oct 2008 16:49:01 +0100 + +sugar (0.82.0-1ubuntu1) intrepid; urgency=low + + [ Luke Faraone ] + * Merge from Debian. (LP: #277770) + * Add the sugar-activities package back for people upgrading from Hardy. + + -- James Westby Fri, 10 Oct 2008 00:49:33 +0100 + +sugar (0.82.0-1) unstable; urgency=low + + * New upstream release. + * Unfuzz patch 2991. + * Update cdbs snippets: + + Move dependency cleanup to new local snippet package-relations.mk. + + Update copyright-check output to more closely match proposed new + copyright file format. Update copyright-hints. + + Internal restructuring of flavor-enhanced autotools- and makefile- + snippets. + + Update README.cdbs-tweaks. + * Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis). + + -- Jonas Smedegaard Sat, 16 Aug 2008 13:49:57 +0200 + +sugar (0.81.4-1) unstable; urgency=low + + * New upstream release. + * Disable (but keep in source) patch 2003 (refactored upstream). + * Tighten dependency on python-sugar-toolkit (control panel items + moved). + * Update local cdbs snippets: + + Relax copyright-check to only warn about its discoveries. Closes: + bug#486984. + + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1). + * Update debian/copyright (new files, same owners and licenses). + Update debian/copyright-hints. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Fri, 20 Jun 2008 23:11:55 +0200 + +sugar (0.81.2-1) unstable; urgency=low + + * New upstream Release. + + -- Jonas Smedegaard Mon, 26 May 2008 10:06:47 +0200 + +sugar (0.81.1-1) unstable; urgency=low + + * New upstream release. + + Merge activities.default into favorites. Closes: bug#480856. + * Unfuzz patches. + * Update debian/copyright and debian/copyright-hints (new owners but + same licenses). + * Rewrite debian/copyright to only mention each licensing string once. + + -- Jonas Smedegaard Sat, 24 May 2008 22:31:14 +0200 + +sugar (0.79.4-2) unstable; urgency=medium + + * Update cdbs tweaks: + + Strip any non-printable characters in copyright-check.mk. + * Update danish l10n. + * Raise to urgency=medium, as these are small changes that shouldn't + delay the earlier large changes reaching Lenny. + + -- Jonas Smedegaard Tue, 29 Apr 2008 15:29:41 +0200 + +sugar (0.79.4-1) unstable; urgency=low + + [ Santiago Ruano Rincón ] + * Fixed sugar.desktop location + + [ Jonas Smedegaard ] + * New upstream release. + * Highlights: + + Display current activity when its frame icon is clicked + + Add support for adding/removing activities to/from ring + + Coding improvements thanks to pylint + + Improved accesspoint indication + + support battery-charge-state-dependent battery frame icon + * Drop patch 0001 included in new upstream release. + * Depend on python-simplejson (crucial for dbus interaction - possibly + only since 0.79.2). + * Depend on librsvg2-common (SVG support in python-gnome2-desktop is + not enough). Closes: bug#476789, thanks to Shaun Jackman. + * Depend on x11-xserver-utils (xrandr needed for rotation: r). + * Tighten python-artwork recommendation to versions supporting new UI. + Closes: bug#477275, thanks to Ivan Vucica. + * Add patch 2003 to resolve Debian-style timezone config in + sugar-control-panel. + * Add patch 2991 to enable danish l10n in configure. + * Use XO-style in sugar-emulator.desktop (why not?). + * Register sugar and sugar-emulator with the Debian menu system. + * Bump debhelper compatibility level to 6. + * Rewrite short description to not mention sugar, thanks to lintian. + * Mention exact upstream Git source in debian/copyright. + * Update local cdbs snippets: + + Relax python-central and python-support build-dependencies in + python-autotools.mk. + * 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 15:30:34 +0200 + +sugar (0.79.3-2) unstable; urgency=low + + [Santiago Ruano Rincón] + * Added sugar and sugar-emulator .desktop files. Taken from ubuntu + package. + + [ Jonas Smedegaard ] + * Install both .desktop files in sugar package. + * Tighten dependency on python-sugar-toolkit. + + -- Jonas Smedegaard Sun, 13 Apr 2008 02:38:41 +0200 + +sugar (0.79.3-1) unstable; urgency=low + + * New upstream release. + Highlights: + + Remove o shortcut + + Clean up calls to palette constructor + + Use the sugar-xo theme only on the XO + + Fix home view accelerators. + + Don't traceback when stopping an already stopped PulsingIcon. + + Fix the mesh-device pulsing icon + + Add palettes to activities in list view + * Replace patch 0001 syncing with Git as of today. + + Display current activity when its frame icon is clicked. + * Tighten dependency on python-gst0.10 (we need the set_volume + attribute). Closes: bug#475787. + + -- Jonas Smedegaard Sun, 13 Apr 2008 01:51:47 +0200 + +sugar (0.79.2-1) unstable; urgency=low + + * New upstream release. + Highlights: + + New Frame and Home design. + * Replace patch 0001 syncing with Git as of today. + + Fix home view accelerators + + Don't traceback when stopping an already stopped PulsingIcon + + Fix the mesh-device pulsing icon + * Tighten dependency on python-sugar-toolkit. + * 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. + * Update debian/copyright: + Adjust some copyright years. + Add Makefile.in and Makefile.in.in (GNU all-permissive license). + * Drop patch 2991 against no longer provided upstream automade files. + * Merge yet another duplicate cdbs build-dependency. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Sat, 05 Apr 2008 10:54:56 +0200 + +sugar (0.79.0-5) unstable; urgency=low + + * Add patch 1001 adding danish l10n. + * Sync with upstream Git as of today. + Main changes: + + Lots of l10n updates + + Move some LGPL files to GPL + + Fix access rights of clipboardservice + + Hide palettes when switching zoom levels + + -- Jonas Smedegaard Wed, 26 Mar 2008 12:07:25 +0100 + +sugar (0.79.0-4) unstable; urgency=low + + * Update CDBS tweaks: + + Add local python-autotools.mk (and drop py-compile.mk). + + Update python-vars.mk and makefile.mk for improved DEB_*PACKAGES + and build-dependency resolving. + + Cosmetic updates to README.cdbs-tweaks. + * Fix email address of OLPC Alioth team. + + -- Jonas Smedegaard Sun, 16 Mar 2008 14:22:24 +0100 + +sugar (0.79.0-3) unstable; urgency=low + + * Pass over maintenance of the package to the OLPC team: Change + Maintainer, and add myself to Uploaders. + * Build-depend on python-all-dev. + * Build as arch-all. + * Fix README.packaging to use "pull; fetch --tags" (not "pull -t"). + * Recommend xserver-xephyr (not xephyr). Closes: bug#470502. + * Update CDBS tweaks: + + Add local py-compile.mk and python-vars.mk to handle autotools- + based Python compilation. + + Add local autotools.mk, autotools-vars.mk, makefile.mk and + makefile-vars.mk providing multi-flavor build support needed by + py-compile.mk. + + README.cdbs-tweaks updated to mention the above. + + Add patchsys-quilt.mk. + * Add already applied patch 2001 to use empy from system. + * Add already applied patch 2991 to apply empy patch to automade file. + * Add already applied patch 2002 to invoke wpa_passphrase in /usr/bin. + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean + + -- Jonas Smedegaard Fri, 14 Mar 2008 16:13:13 +0100 + +sugar (0.79.0-2) unstable; urgency=low + + * Drop commented out relibtoolize rules from debian/control (claiming + relibtoolizing in 0.79.0-1 was a lie). + * Patch src/hardware/keydialog.py to use /usr/bin/wpa_passphrase (not + /usr/sbin/wpa_passphrase). + * Fix Git commands in README.packaging: Cannot push all+tags in 1 go. + * Update debian/copyright: + + Bump copyright years for debian/* files. + + Drop copyright and licensing info for files moved to sugar-toolkit + + Adjust changed paths: services/shell -> service, shell/ -> src + * Add watch file. + * Use (and build-depend on) separately packaged python-empy. Borrow + timestamps from similar files at build time to avoid triggering + automake. + * Depend on sugar-base, sugar-toolkit, matchbox-window-manager, + dbus-x11, telepathy-gabble, telepathy-salut, + telepathy-stream-engine, python-dbus, python-gst0.10, python-numpy, + python-gobject, python-gtk2, python-telepathy, python-cairo, + python-gnome2-desktop (for wnck), and python-hippocanvas. + * Recommend sugar-artwork, gstreamer0.10-plugins-good, xephyr, + network-manager and net-tools. + * Suggest openssh-client. + + -- Jonas Smedegaard Tue, 11 Mar 2008 02:30:07 +0100 + +sugar (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. + + Strip no longer relevant notes on cdbs-autoupdate.mk from + README.cdbs-tweaks + * Fix invoking dh_pycentral. + * Add sections on packaging to README.packaging. + * Cleanup duplicate build-dependencies in debian/rules + (upstream-tarball.mk needs tightened cdbs dependency). + * Stop generating autotools now included in upstream tarball. + * Relibtoolize to avoid hardcoded rpath. + * Add upstream source (in addition to Git source) to debian/copyright. + * Add Vcs-* and Homepage fields to debian/control. + * Fix typo and mention XO in long description. + * 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 02:04:11 +0100 + +sugar (0.2~git20080111-0~0jones1) jones; urgency=low + + * Initial unofficial release. + + -- Jonas Smedegaard Sat, 24 Nov 2007 12:54:48 +0100 --- sugar-0.82.0.orig/debian/watch +++ sugar-0.82.0/debian/watch @@ -0,0 +1,3 @@ +# run the "uscan" command to check for upstream updates and more. +version=3 +http://dev.laptop.org/pub/sugar/sources/sugar/sugar-(.*)\.tar\.bz2 --- sugar-0.82.0.orig/debian/patches/2002_wpa_passphrase_in_usr-bin.patch +++ sugar-0.82.0/debian/patches/2002_wpa_passphrase_in_usr-bin.patch @@ -0,0 +1,11 @@ +--- sugar-0.79.0.orig/src/hardware/keydialog.py ++++ sugar-0.79.0/src/hardware/keydialog.py +@@ -266,7 +266,7 @@ + elif len(key) >= 8 and len(key) <= 63: + # passphrase + import commands +- command = "/usr/sbin/wpa_passphrase '%s' '%s'" % (ssid, key) ++ command = "/usr/bin/wpa_passphrase '%s' '%s'" % (ssid, key) + (s, o) = commands.getstatusoutput(command) + if s != 0: + raise RuntimeError("Error hashing passphrase: %s" % o) --- sugar-0.82.0.orig/debian/patches/1001_danish_l10n.patch +++ sugar-0.82.0/debian/patches/1001_danish_l10n.patch @@ -0,0 +1,369 @@ +diff --git a/po/da.po b/po/da.po +new file mode 100644 +index 0000000..eee17d7 +--- /dev/null ++++ b/po/da.po +@@ -0,0 +1,363 @@ ++# Translation into danish of Sugar ++# Copyright (C) 2008 Jonas Smedegaard ++# This file is distributed under the same license as the Sugar package. ++# Jonas Smedegaard , 2008. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: Sugar 0.79.0\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2008-02-09 00:30-0500\n" ++"PO-Revision-Date: 2008-03-25 16:37+0100\n" ++"Last-Translator: Jonas Smedegaard \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../src/intro/intro.py:67 ++msgid "Name:" ++msgstr "Navn:" ++ ++#: ../src/intro/intro.py:96 ++msgid "Click to change color:" ++msgstr "Klik for at ændre farve:" ++ ++#: ../src/intro/intro.py:146 ++msgid "Back" ++msgstr "Tilbage" ++ ++#: ../src/intro/intro.py:160 ++msgid "Done" ++msgstr "Færdig" ++ ++#: ../src/intro/intro.py:163 ++msgid "Next" ++msgstr "Næste" ++ ++#: ../src/view/BuddyMenu.py:63 ++msgid "Remove friend" ++msgstr "Fjern ven" ++ ++#: ../src/view/BuddyMenu.py:66 ++msgid "Make friend" ++msgstr "Opret ven" ++ ++#: ../src/view/BuddyMenu.py:96 ++#, python-format ++msgid "Invite to %s" ++msgstr "Invitér til %s" ++ ++#: ../src/view/clipboardmenu.py:59 ++msgid "Remove" ++msgstr "Fjern" ++ ++#: ../src/view/clipboardmenu.py:64 ../src/view/clipboardmenu.py:89 ++msgid "Open" ++msgstr "Åbn" ++ ++#. self._stop_item = MenuItem(_('Stop download'), 'stock-close') ++#. TODO: Implement stopping downloads ++#. self._stop_item.connect('activate', self._stop_item_activate_cb) ++#. self.append_menu_item(self._stop_item) ++#: ../src/view/clipboardmenu.py:74 ++msgid "Keep" ++msgstr "Behold" ++ ++#: ../src/view/clipboardmenu.py:94 ++msgid "Open with" ++msgstr "Åbn med" ++ ++#: ../src/view/clipboardmenu.py:220 ++#, python-format ++msgid "Clipboard object: %s." ++msgstr "Udklipsholderobjekt: %s." ++ ++#: ../src/hardware/keydialog.py:149 ++msgid "Key Type:" ++msgstr "Nøgletype:" ++ ++#: ../src/hardware/keydialog.py:169 ++msgid "Authentication Type:" ++msgstr "Ægthedstype:" ++ ++#: ../src/hardware/keydialog.py:250 ++msgid "Encryption Type:" ++msgstr "Krypteringstype:" ++ ++#: ../src/view/Shell.py:257 ++msgid "Screenshot" ++msgstr "Skærmaftryk" ++ ++#: ../src/view/home/HomeBox.py:142 ++msgid "Ring view" ++msgstr "Ringvisning" ++ ++#: ../src/view/home/HomeBox.py:143 ++msgid "R" ++msgstr "R" ++ ++#: ../src/view/home/HomeBox.py:150 ++msgid "List view" ++msgstr "Listevisning" ++ ++#: ../src/view/home/HomeBox.py:151 ++msgid "L" ++msgstr "L" ++ ++#: ../src/view/home/MeshBox.py:96 ++msgid "Connect" ++msgstr "Forbind" ++ ++#: ../src/view/home/MeshBox.py:105 ++msgid "Disconnect" ++msgstr "Afbryd" ++ ++#: ../src/view/home/MeshBox.py:149 ++msgid "Connecting..." ++msgstr "Forbinder..." ++ ++#: ../src/view/home/MeshBox.py:205 ../src/view/devices/network/mesh.py:38 ++#: ../src/view/devices/network/mesh.py:65 ++#: ../src/view/devices/network/mesh.py:69 ++msgid "Mesh Network" ++msgstr "Vævningsnetværk" ++ ++#: ../src/view/home/MeshBox.py:207 ../src/view/devices/network/wireless.py:115 ++#: ../src/view/devices/network/mesh.py:86 ++msgid "Disconnect..." ++msgstr "Afbryd..." ++ ++#: ../src/view/home/MeshBox.py:294 ../src/view/palettes.py:60 ++msgid "Resume" ++msgstr "Genoptag" ++ ++#: ../src/view/home/MeshBox.py:299 ../src/view/frame/activitiestray.py:160 ++msgid "Join" ++msgstr "Tilslut" ++ ++#: ../src/view/devices/battery.py:42 ++msgid "My Battery" ++msgstr "Mit batteri" ++ ++#: ../src/view/devices/battery.py:109 ++msgid "Charging" ++msgstr "Oplader" ++ ++#: ../src/view/devices/battery.py:112 ++msgid "Very little power remaining" ++msgstr "Meget lidt strøm tilbage" ++ ++#: ../src/view/devices/battery.py:118 ++#, python-format ++msgid "%(hour)d:%(min).2d remaining" ++msgstr "%(hour)d:%(min).2d endnu" ++ ++#: ../src/view/devices/battery.py:122 ++msgid "Charged" ++msgstr "Opladet" ++ ++#: ../src/view/devices/network/wireless.py:63 ++msgid "Disconnected" ++msgstr "Afbrudt" ++ ++#: ../src/view/devices/network/wireless.py:133 ++msgid "Channel" ++msgstr "Kanal" ++ ++#: ../src/view/frame/zoomtoolbar.py:34 ++msgid "Neighborhood" ++msgstr "Nabolag" ++ ++#: ../src/view/frame/zoomtoolbar.py:36 ++msgid "Group" ++msgstr "Gruppe" ++ ++#: ../src/view/frame/zoomtoolbar.py:38 ++msgid "Home" ++msgstr "Hjem" ++ ++#: ../src/view/frame/zoomtoolbar.py:40 ++msgid "Activity" ++msgstr "Aktivitet" ++ ++#: ../src/controlpanel/control.py:217 ++msgid "To apply your changes you have to restart sugar.\n" ++msgstr "For at dine ændringer træder i kraft skal du genstarte sukker.\n" ++ ++#: ../src/controlpanel/control.py:271 ++msgid "Error in specified color modifiers." ++msgstr "Fejl i angivne farvetilrettere." ++ ++#: ../src/controlpanel/control.py:274 ++msgid "Error in specified colors." ++msgstr "Fejl i angivne farver." ++ ++#: ../src/controlpanel/control.py:310 ++msgid "off" ++msgstr "slukket" ++ ++#: ../src/controlpanel/control.py:312 ++msgid "on" ++msgstr "tændt" ++ ++#: ../src/controlpanel/control.py:314 ++msgid "State is unknown." ++msgstr "Tilstand er ukendt" ++ ++#: ../src/controlpanel/control.py:334 ++msgid "Error in specified radio argument use on/off." ++msgstr "Fejl i angivne radioargument brug on/off." ++ ++#: ../src/controlpanel/control.py:338 ++msgid "Permission denied. You need to be root to run this method." ++msgstr "Adgang nægtet. Du skal være root for at afvikle denne metode." ++ ++#: ../src/controlpanel/control.py:368 ++msgid "Error in reading timezone" ++msgstr "Fejl i aflæsning af tidszone" ++ ++#: ../src/controlpanel/control.py:399 ++#, python-format ++msgid "Error copying timezone (from %s): %s" ++msgstr "Fejl ved kopiering af tidszone (fra %s): %s" ++ ++#: ../src/controlpanel/control.py:405 ++#, python-format ++msgid "Changing permission of timezone: %s" ++msgstr "Ændrer rettigheder for tidszone: %s" ++ ++#: ../src/controlpanel/control.py:415 ++msgid "Error timezone does not exist." ++msgstr "Fejl tidszone eksisterer ikke." ++ ++#: ../src/controlpanel/control.py:420 ../src/controlpanel/control.py:438 ++#, python-format ++msgid "Could not access %s. Create standard settings." ++msgstr "Kunne ikke tilgå %s. Opret standardindstillinger." ++ ++#: ../src/controlpanel/control.py:465 ++#, python-format ++msgid "Language for code=%s could not be determined." ++msgstr "Sprog for code=%s kunne ikke afgøres." ++ ++#: ../src/controlpanel/control.py:475 ++#, python-format ++msgid "Sorry I do not speak '%s'." ++msgstr "Desværre jeg taler ikke '%s'." ++ ++#: ../src/controlpanel/cmd.py:24 ++msgid "" ++"Usage: sugar-control-panel [ option ] key [ args ... ] \n" ++" Control for the sugar environment. \n" ++" Options: \n" ++" -h show this help message and exit \n" ++" -l list all the available options \n" ++" -h key show information about this key \n" ++" -g key get the current value of the key \n" ++" -s key set the current value for the key \n" ++" " ++msgstr "" ++"Anvendelse: sugar-control-panel [ valg ] nøgle [ argumenter ... ] \n" ++" Styring af sugar-miljøet. \n" ++" Valg: \n" ++" -h vis denne hjælpebesked og afslut \n" ++" -l vis liste over alle tilgængelige valg \n" ++" -h key vis information om denne nøgle \n" ++" -g key hent den nuværende værdi for nøglen \n" ++" -s key angiv den nuværende værdi for nøglen \n" ++" " ++ ++#: ../src/controlpanel/cmd.py:49 ../src/controlpanel/cmd.py:62 ++#: ../src/controlpanel/cmd.py:70 ++#, python-format ++msgid "sugar-control-panel: key=%s not an available option" ++msgstr "sugar-control-panel: key=%s ikke et tilgængeligt valg" ++ ++#: ../src/controlpanel/cmd.py:77 ++#, python-format ++msgid "sugar-control-panel: %s" ++msgstr "sugar-control-panel: %s" ++ ++#: ../src/view/devices/network/mesh.py:108 ++msgid "Connected to a School Mesh Portal" ++msgstr "Forbundet til en skolevævningsportal" ++ ++#: ../src/view/devices/network/mesh.py:110 ++msgid "Looking for a School Mesh Portal..." ++msgstr "Leder efter en skolevævningsportal..." ++ ++#: ../src/view/devices/network/mesh.py:113 ++msgid "Connected to an XO Mesh Portal" ++msgstr "Forbundet til en XO-vævningsportal" ++ ++#: ../src/view/devices/network/mesh.py:115 ++msgid "Looking for an XO Mesh Portal..." ++msgstr "Leder efter en XO-vævningsportal..." ++ ++#: ../src/view/devices/network/mesh.py:118 ++msgid "Connected to a Simple Mesh" ++msgstr "Forbundet til en simpel vævning" ++ ++#: ../src/view/devices/network/mesh.py:120 ++msgid "Starting a Simple Mesh" ++msgstr "Starter en simpel vævning" ++ ++#: ../src/view/devices/network/mesh.py:127 ++msgid "Unknown Mesh" ++msgstr "Ukendt vævning" ++ ++#: ../src/view/frame/activitiestray.py:165 ++msgid "Decline" ++msgstr "Afslå" ++ ++#: ../src/view/home/activitiesring.py:291 ++#: ../src/view/home/activitiesring.py:354 ++msgid "About this XO" ++msgstr "Om denne XO" ++ ++#: ../src/view/home/activitiesring.py:302 ++msgid "Restart" ++msgstr "Genstart" ++ ++#: ../src/view/home/activitiesring.py:307 ++msgid "Shutdown" ++msgstr "Luk ned" ++ ++#: ../src/view/home/activitiesring.py:313 ++msgid "Register" ++msgstr "Registrér" ++ ++#: ../src/view/home/activitiesring.py:360 ++msgid "Not available" ++msgstr "Ikke tilgængelig" ++ ++#: ../src/view/palettes.py:41 ++msgid "Starting..." ++msgstr "Starter..." ++ ++#: ../src/view/palettes.py:85 ++msgid "Stop" ++msgstr "Stop" ++ ++#: ../src/view/palettes.py:110 ++msgid "Start" ++msgstr "Start" ++ ++#: ../src/view/palettes.py:139 ++msgid "Remove from ring" ++msgstr "Fjern fra ring" ++ ++#: ../src/view/palettes.py:143 ++msgid "Add to ring" ++msgstr "Føj til ring" ++ ++#: ../src/view/palettes.py:189 ++msgid "Show contents" ++msgstr "Vis indhold" ++ ++#: ../src/view/palettes.py:213 ++#, python-format ++msgid "%(free_space)d MB Free" ++msgstr "%(free_space)d MB ledig" --- sugar-0.82.0.orig/debian/patches/2991_enable_danish_l10n.patch +++ sugar-0.82.0/debian/patches/2991_enable_danish_l10n.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 1c17718..7076798 100755 +--- a/configure ++++ b/configure +@@ -2641,7 +2641,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 + DEPDIR="${am__leading_dot}deps" + --- sugar-0.82.0.orig/debian/patches/2003_fix_tz_config_path.patch +++ sugar-0.82.0/debian/patches/2003_fix_tz_config_path.patch @@ -0,0 +1,40 @@ +diff --git a/src/controlpanel/control.py b/src/controlpanel/control.py +index faac689..a6d9d04 100644 +--- a/src/controlpanel/control.py ++++ b/src/controlpanel/control.py +@@ -45,7 +45,7 @@ _COLORS = {'red': {'dark':'#b20008', 'medium':'#e6000a', 'light':'#ffadce'}, + + _MODIFIERS = ('dark', 'medium', 'light') + +-_TIMEZONE_CONFIG = '/etc/sysconfig/clock' ++_TIMEZONE_CONFIG = '/etc/timezone' + + _LANGUAGES = { + 'Afrikaans/South_Africa': 'af_ZA', +@@ -351,13 +351,8 @@ def get_timezone(): + line = line.strip() + if len (line) and line[0] == '#': + continue +- try: +- tokens = line.split("=") +- if tokens[0] == "ZONE": +- timezone = tokens[1].replace('"', '') +- return timezone +- except Exception, e: +- print "get_timezone: %s" % e ++ timezone = line ++ return timezone + except Exception, e: + print "get_timezone: %s" % e + return None +@@ -407,9 +402,7 @@ def set_timezone(timezone): + + # Write info to the /etc/sysconfig/clock file + fd = open(_TIMEZONE_CONFIG, "w") +- fd.write('# use sugar-control-panel to change this\n') +- fd.write('ZONE="%s"\n' % timezone) +- fd.write('UTC=true\n') ++ fd.write(timezone) + fd.close() + else: + print (_("Error timezone does not exist.")) --- sugar-0.82.0.orig/debian/patches/README +++ sugar-0.82.0/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-0.82.0.orig/debian/patches/2001_empy_from_system.patch +++ sugar-0.82.0/debian/patches/2001_empy_from_system.patch @@ -0,0 +1,16 @@ +--- sugar-0.79.0.orig/data/Makefile.am ++++ sugar-0.79.0/data/Makefile.am +@@ -1,11 +1,11 @@ + SUBDIRS = icons + + sugar.gtkrc: gtkrc.em +- $(srcdir)/em.py -D theme=\'sugar\' $(srcdir)/gtkrc.em > \ ++ empy -D theme=\'sugar\' $(srcdir)/gtkrc.em > \ + $(top_builddir)/data/sugar.gtkrc + + sugar-xo.gtkrc: gtkrc.em +- $(srcdir)/em.py -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \ ++ empy -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \ + $(top_builddir)/data/sugar-xo.gtkrc + + sugardir = $(pkgdatadir)/data --- sugar-0.82.0.orig/debian/patches/series +++ sugar-0.82.0/debian/patches/series @@ -0,0 +1,5 @@ +1001_danish_l10n.patch +2001_empy_from_system.patch +2002_wpa_passphrase_in_usr-bin.patch +#2003_fix_tz_config_path.patch +2991_enable_danish_l10n.patch --- sugar-0.82.0.orig/debian/cdbs/1/rules/package-relations.mk +++ sugar-0.82.0/debian/cdbs/1/rules/package-relations.mk @@ -0,0 +1,50 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2004-2006 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-0.82.0.orig/debian/cdbs/1/rules/upstream-tarball.mk +++ sugar-0.82.0/debian/cdbs/1/rules/upstream-tarball.mk @@ -0,0 +1,139 @@ +# -*- 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 + +# Perl regexp to change locally used string into that in upstream URL and srcdir +#DEB_UPSTREAM_TARBALL_VERSION_MANGLE +cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION)) + +# Base filename (without extension) as used in upstream URL +DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled) + +# Base directory within tarball +DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled) + +# 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 = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION) +cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION)) +cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig +cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar + +# # These variables are deprecated +_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL +_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_local_tarball)" ] ; then \ + if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \ + rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \ + fi ; \ + echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \ + wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \ + else \ + echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \ + fi + + @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_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_local_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) + @untar="tar -x -C"; \ + case "$(cdbs_upstream_local_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_local_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_local_tarball)" \ + $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ + else \ + $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \ + | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ + fi && \ + if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \ + mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \ + fi && \ + if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \ + GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \ + else \ + GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \ + fi && \ + 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_local_tarball)"; \ + gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \ + fi + +DEB_PHONY_RULES += print-version get-orig-source + +endif --- sugar-0.82.0.orig/debian/cdbs/1/rules/copyright-check.mk +++ sugar-0.82.0/debian/cdbs/1/rules/copyright-check.mk @@ -0,0 +1,111 @@ +# -*- 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)(\..*)?)$ + +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*(\*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-0.82.0.orig/debian/cdbs/1/rules/buildinfo.mk +++ sugar-0.82.0/debian/cdbs/1/rules/buildinfo.mk @@ -0,0 +1,40 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2004-2006 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-0.82.0.orig/debian/cdbs/1/class/makefile.mk +++ sugar-0.82.0/debian/cdbs/1/class/makefile.mk @@ -0,0 +1,83 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 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),$(not $(findstring nocheck,$(DEB_BUILD_OPTIONS))),$(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),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-0.82.0.orig/debian/cdbs/1/class/python-vars.mk +++ sugar-0.82.0/debian/cdbs/1/class/python-vars.mk @@ -0,0 +1,110 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2008 Jonas Smedegaard +# Copyright © 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-0.82.0.orig/debian/cdbs/1/class/python-autotools.mk +++ sugar-0.82.0/debian/cdbs/1/class/python-autotools.mk @@ -0,0 +1,75 @@ +# -*- 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/%: +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-0.82.0.orig/debian/cdbs/1/class/autotools-vars.mk +++ sugar-0.82.0/debian/cdbs/1/class/autotools-vars.mk @@ -0,0 +1,114 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Copyright © 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-0.82.0.orig/debian/cdbs/1/class/makefile-vars.mk +++ sugar-0.82.0/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 --- sugar-0.82.0.orig/debian/cdbs/1/class/autotools.mk +++ sugar-0.82.0/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