Merge from U. Desktop

3 files changed, 31 insertions, 10 deletions

diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in
index 573a2d6..12e41e6 100644
--- a/data/indicator-messages.service.in
+++ b/data/indicator-messages.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.ayatana.indicator.messages
+Name=com.canonical.indicator.messages
 Exec=@libexecdir@/indicator-messages-service
diff --git a/debian/changelog b/debian/changelog
index bfee8aa..9afd5d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,31 @@
-indicator-messages (0.3.90-0ubuntu1~ppa1) natty; urgency=low
+indicator-messages (0.3.90-0ubuntu1) natty; urgency=low
 
+  [ Ted Gould ]
   * New upstream release.
     * GDBus Port
     * New libindicate and dbusmenu
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 14 Jan 2011 14:25:15 -0600
+  [ Ken VanDine ]
+  * debian/control
+    - Build depends on libindicate-dev to 0.4.91
+    - Build depends on dbusmenu to 0.3.91
+    - Set Vcs to ~ubuntu-desktop
+  * data/indicator-messages.service.in
+    - Fixed dbus interface name
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 14 Jan 2011 14:50:30 -0600
+
+indicator-messages (0.3.11-0ubuntu4) natty; urgency=low
+  * debian/control
+    - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:39:40 -0500
+
+indicator-messages (0.3.11-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control: package description spelling (LP: #658096)
+
+ -- Greg Auger <gregory.auger@googlemail.com> Tue, 09 Nov 2010 18:49:38 +0000
 
 indicator-messages (0.3.11-0ubuntu2) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 0354365..4e28b59 100644
--- a/debian/control
+++ b/debian/control
@@ -11,15 +11,15 @@ Build-Depends: debhelper (>= 5.0),
                gnome-doc-utils,
                scrollkeeper,
                intltool,
-               libindicate-dev (>= 0.3.0),
-               libindicate-gtk-dev (>= 0.3.0),
+               libindicate-dev (>= 0.4.91),
+               libindicate-gtk-dev (>= 0.4.91),
                libindicator-dev (>= 0.3.14),
-               libdbusmenu-gtk-dev (>= 0.2.5),
-               libdbusmenu-glib-dev (>= 0.2.8)
+               libdbusmenu-gtk-dev (>= 0.3.91),
+               libdbusmenu-glib-dev (>= 0.3.91)
 Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-messages
-Vcs-Bzr: http://code.launchpad.net/~indicator-applet-developers/indicator-messages/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-messages/ubuntu/files
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files
 
 Package: indicator-messages
 Architecture: any
@@ -28,6 +28,6 @@ Recommends: indicator-applet | indicator-renderer
 Breaks: indicator-applet (<< 0.3.0)
 Description: indicator that collects messages that need a response
  A place on the user's desktop that collects messages that need a response.
- This menu provides a condenced and collected view of all of those messages
+ This menu provides a condensed and collected view of all of those messages
  for quick access, but without making them annoying in times that you want
  to ignore them.