diff -u sugar-0.82.9/debian/control.in sugar-0.82.9/debian/control.in
--- sugar-0.82.9/debian/control.in
+++ sugar-0.82.9/debian/control.in
@@ -1,7 +1,8 @@
 Source: sugar
 Section: x11
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
 Build-Depends: @cdbs@
 Standards-Version: 3.7.3
@@ -12,7 +13,7 @@

 Package: sugar
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${cdbs:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${cdbs:Depends}, gstreamer0.10-alsa
 Recommends: sugar-artwork (>= 0.79.2) | sugar-artwork, network-manager, net-tools, 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/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 <debian-olpc-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
 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}, ${cdbs:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${cdbs:Depends}, gstreamer0.10-alsa
 Recommends: sugar-artwork (>= 0.79.2) | sugar-artwork, network-manager, net-tools, 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,13 @@
+sugar (0.82.9-5ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #), Ubuntu remaining changes:
+    - 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.
+    - Depends on gstreamer0.10-alsa.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 24 Jan 2009 12:07:47 +0100
+
 sugar (0.82.9-5) unstable; urgency=medium

   * Update CDBS snippets:
@@ -42,6 +52,26 @@

  -- Jonas Smedegaard <dr@jones.dk>  Mon, 19 Jan 2009 18:47:45 +0100

+sugar (0.82.9-1ubuntu1) jaunty; urgency=low
+
+  [Alessio Treglia]
+
+  * 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).
+
+  [Devid Antonio Filoni]
+
+  * Fix debhelper-but-no-misc-depends lintian warning.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 17 Jan 2009 01:09:10 +0100
+
 sugar (0.82.9-1) unstable; urgency=high

   * New upstream release.
@@ -76,6 +106,19 @@

  -- Jonas Smedegaard <dr@jones.dk>  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 <right2bhavi@gmail.com>  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
@@ -85,6 +128,18 @@

  -- Jonas Smedegaard <dr@jones.dk>  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 <james.westby@canonical.com>  Wed, 05 Nov 2008 04:59:27 +0000
+
 sugar (0.82.8-2) unstable; urgency=low

   * Update cdbs snippets:
@@ -106,6 +161,31 @@

  -- Jonas Smedegaard <dr@jones.dk>  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 <james.westby@canonical.com>  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 <james.westby@canonical.com>  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 <james.westby@canonical.com>  Fri, 10 Oct 2008 00:49:33 +0100
+
 sugar (0.82.0-1) unstable; urgency=low

   * New upstream release.