diff -u sugar-0.82.9/debian/sugar.install sugar-0.82.9/debian/sugar.install --- sugar-0.82.9/debian/sugar.install +++ sugar-0.82.9/debian/sugar.install @@ -2,0 +3,3 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/share/* +debian/tmp/etc/* diff -u sugar-0.82.9/debian/control sugar-0.82.9/debian/control --- sugar-0.82.9/debian/control +++ sugar-0.82.9/debian/control @@ -1,7 +1,8 @@ Source: sugar Section: x11 Priority: optional -Maintainer: Debian OLPC +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 @@ -12,7 +13,7 @@ Package: sugar Architecture: all -Depends: ${shlibs:Depends}, ${python:Depends}, ${misc: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 +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc: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, gstreamer0.10-alsa 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} @@ -26,0 +28,8 @@ + +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. diff -u sugar-0.82.9/debian/changelog sugar-0.82.9/debian/changelog --- sugar-0.82.9/debian/changelog +++ sugar-0.82.9/debian/changelog @@ -1,3 +1,17 @@ +sugar (0.82.9-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #318102), Ubuntu remaining changes: + - Added /usr/share/activities/ to the search path to work around issue + with the packaging of the activities. This can be dropped when + the activities are fixed. + - Add the sugar-activities package back for people upgrading from Hardy. + Should be kept until after next LTS. + - Actually install things in to the sugar package. + - Add 2005_look_in_usr_share_activities.patch to debian/patches/series. + * Added gstreamer0.10-alsa on sugar Depends field (LP: #317462). + + -- Alessio Treglia Sat, 17 Jan 2009 01:09:10 +0100 + sugar (0.82.9-1) unstable; urgency=high * New upstream release. @@ -32,6 +46,19 @@ -- Jonas Smedegaard Sun, 04 Jan 2009 21:20:18 +0100 +sugar (0.82.8-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #306237) + - Add /usr/share/activities/ to the search path to work around issue + with the packaging of the activities. This can be dropped when + the activities are fixed. + - Add the sugar-activities package back for people upgrading from Hardy. + Should be kept until after next LTS. + - Actually install things in to the sugar package. + - Add 2005_look_in_usr_share_activities.patch to debian/patches/series. + + -- Bhavani Shankar Mon, 08 Dec 2008 20:02:24 +0530 + sugar (0.82.8-3) unstable; urgency=low * Update CDBS snippet makefile.mk: Cleanup check stamp dir for @@ -41,6 +68,18 @@ -- Jonas Smedegaard Tue, 11 Nov 2008 18:47:52 +0100 +sugar (0.82.8-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add /usr/share/activities/ to the search path to work around issue + with the packaging of the activities. This can be dropped when + the activities are fixed (LP: #283194). Thanks to Morgan Collett + and Luke Faraone. + - Add the sugar-activities package back for people upgrading from Hardy. + Should be kept until after next LTS. + + -- James Westby Wed, 05 Nov 2008 04:59:27 +0000 + sugar (0.82.8-2) unstable; urgency=low * Update cdbs snippets: @@ -62,6 +101,31 @@ -- Jonas Smedegaard Sun, 19 Oct 2008 17:07:11 +0200 +sugar (0.82.0-1ubuntu3) intrepid; urgency=low + + * Add /usr/share/activities/ to the search path to work around issue + with the packaging of the activities. This can be dropped when + the activities are fixed, which is probably after the next sync from + Debian (LP: #283194). Thanks to Morgan Collett and Luke Faraone. + + -- James Westby Tue, 14 Oct 2008 13:48:58 +0100 + +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. diff -u sugar-0.82.9/debian/patches/series sugar-0.82.9/debian/patches/series --- sugar-0.82.9/debian/patches/series +++ sugar-0.82.9/debian/patches/series @@ -6,2 +6,3 @@ 2004_strip_dbus_interface_hints.patch +2005_look_in_usr_share_activities.patch 2991_enable_danish_l10n.patch only in patch2: unchanged: --- sugar-0.82.9.orig/debian/patches/2005_look_in_usr_share_activities.patch +++ sugar-0.82.9/debian/patches/2005_look_in_usr_share_activities.patch @@ -0,0 +1,12 @@ +Index: sugar-0.82.0/bin/sugar-shell-service.in +=================================================================== +--- sugar-0.82.0.orig/bin/sugar-shell-service.in 2008-10-14 13:47:18.000000000 +0100 ++++ sugar-0.82.0/bin/sugar-shell-service.in 2008-10-14 13:47:50.000000000 +0100 +@@ -20,6 +20,7 @@ + + if not environ.has_key('SUGAR_ACTIVITIES'): + environ['SUGAR_ACTIVITIES'] = '@prefix@/share/sugar/activities:' \ ++ '@prefix@/share/activities:' \ + '@prefix@/lib64/sugar/activities:' \ + '@prefix@/lib/sugar/activities' +