Merge with Ubuntu Desktop

2 files changed, 30 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 65dc907..8f22058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+indicator-messages (0.3.5-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - change the indicator-applet depends to a recommends to let other 
+      desktops use other options rather than having to trigger GNOME
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 30 Mar 2010 10:35:59 +0200
+
+indicator-messages (0.3.5-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.5
+    * Show which applications are running with a small icon
+      next to their entry. (LP: #438526)
+    * Shift command items to line up with application names.
+      (LP: #537312)
+    * Track applications we've seen so that we can show "Set Up"
+      text if we've not seen the app before.
+    * Fix avatar spacing to match other menu items
+    * Use standard libindicator icon handling in panel
+    * Fix translation of non-running applications (LP: #540148)
+    * Handling bools for requesting attention from apps
+    * Changing microblogging to broadcast to match Me Menu (LP: #534952)
+  * debian/control: 
+    - Updating requirement to libindicator 0.3.5
+    - Increasing dbusmenu-glib dep to 0.2.8
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Mar 2010 10:53:01 -0500
+
 indicator-messages (0.3.5-0ubuntu1~ppa2) lucid; urgency=low
 
   * Upstream merge
diff --git a/debian/control b/debian/control
index b2a013b..0900501 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
 
 Package: indicator-messages
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: indicator-applet | indicator-renderer
 Breaks: indicator-applet (<< 0.3.0)
 Description: GNOME panel indicator applet for messages
  indicator-applet is an applet to display information from