diff -Nru sugar-0.88-0.88.1/debian/changelog sugar-0.88-0.88.1/debian/changelog
--- sugar-0.88-0.88.1/debian/changelog	2010-07-20 16:19:48.000000000 +0530
+++ sugar-0.88-0.88.1/debian/changelog	2010-07-24 12:02:22.000000000 +0530
@@ -1,3 +1,10 @@
+sugar-0.88 (0.88.1-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable(LP: #609412). Remaining changes:
+    - Drop s-browse-a-0.86 as a dependency. (LP: #608762)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 24 Jul 2010 12:01:05 +0530
+
 sugar-0.88 (0.88.1-2) unstable; urgency=low
 
   * Tighten watch file to track only 0.88 branch.
@@ -26,6 +33,12 @@
 
  -- Jonas Smedegaard <dr@jones.dk>  Fri, 25 Jun 2010 10:59:22 +0200
 
+sugar-0.88 (0.88.0-3ubuntu1) maverick; urgency=low
+
+  * Dropped s-browse-a-0.86 as a dependency. (LP: #608762) 
+
+ -- Neeraj Gupta <neeraj@seeta.in>  Fri, 23 Jul 2010 21:37:34 +0530
+
 sugar-0.88 (0.88.0-3) unstable; urgency=low
 
   * Update copyright file:
@@ -745,3 +758,4 @@
   * Initial unofficial release.
 
  -- Jonas Smedegaard <dr@jones.dk>  Sat, 24 Nov 2007 12:54:48 +0100
+
diff -Nru sugar-0.88-0.88.1/debian/control sugar-0.88-0.88.1/debian/control
--- sugar-0.88-0.88.1/debian/control	2010-07-20 16:26:38.000000000 +0530
+++ sugar-0.88-0.88.1/debian/control	2010-07-24 12:00:23.000000000 +0530
@@ -1,7 +1,8 @@
 Source: sugar-0.88
 Section: x11
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
+Maintainer:  Ubuntu SugarTeam <ubuntu-sugarteam@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>, Luke Faraone <luke@faraone.cc>
 DM-Upload-Allowed: yes
 Build-Depends: devscripts (>= 2.10.7~),
diff -Nru sugar-0.88-0.88.1/debian/control.in sugar-0.88-0.88.1/debian/control.in
--- sugar-0.88-0.88.1/debian/control.in	2010-07-20 16:26:14.000000000 +0530
+++ sugar-0.88-0.88.1/debian/control.in	2010-07-24 12:00:58.000000000 +0530
@@ -1,7 +1,8 @@
 Source: sugar-0.88
 Section: x11
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
+Maintainer:  Ubuntu SugarTeam <ubuntu-sugarteam@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>, Luke Faraone <luke@faraone.cc>
 DM-Upload-Allowed: yes
 Build-Depends: @cdbs@
diff -Nru sugar-0.88-0.88.1/debian/rules sugar-0.88-0.88.1/debian/rules
--- sugar-0.88-0.88.1/debian/rules	2010-07-20 16:17:01.000000000 +0530
+++ sugar-0.88-0.88.1/debian/rules	2010-07-24 01:43:34.000000000 +0530
@@ -65,7 +65,7 @@
 # $(3): fallback flag (if non-empty unversioned fallback is added)
 sugar_expand_activities = $(foreach stem,$(1),$(comma) $(patsubst %,sugar-$(stem)-activity-%$(if $(3), | ),$(2))$(if $(if $(2),,true)$(3),sugar-$(stem)-activity))
 
-session_expand_activities = $(call sugar_expand_activities,read browse,0.86,$(1))
+session_expand_activities = $(call sugar_expand_activities,read ,0.86,$(1))
 session_expand_activities_missing = $(call sugar_expand_activities,pippy,,$(1))
 session_expand_activities_missing += $(call sugar_expand_activities,write imageviewer jukebox,$(pkgbranch),$(1))