Merge Ubuntu up to 0.3.92-0ubuntu3

* Merge new upstream from Ubuntu.
* debian/patches/lp_690668.patch
  - Memory leak fixes (LP: #690668)
* debian/control
  - Bump standards version to 3.9.1
* debian/source/format
  - Use source format 3.0 (quilt)
* src/launcher-menu-item.c
  - Make sure menu entries are displayed for launchers that aren't running (LP: #723873)
* New upstream release.
  * Adding in accessible description support
* debian/control: libindicator version 0.3.19
* New upstream release.
  * Fixing the service file
  * Adding a log domain
  * Fixing type handler for dbusmenu 0.3.94
* debian/control: dbusmenu to 0.3.94
[ Ted Gould ]
* New upstream release.
  * GDBus Port
  * New libindicate and dbusmenu
[ 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
* debian/control
  - Bump build depends for libdbusmenu-* to >= 0.3.90
* debian/control: package description spelling (LP: #658096)
* Rebuild for libindicator ABI change (LP: #637692)
* debian/control: depends on latest libindicator-dev 
* New upstream release.
  * Fixing triangles by passing data to callback (LP: #623453)
* New upstream release.
  * Shifting icons into the gutter and adjusting the arrow
    padding.
* New upstream release.
  * Remove parens from counts
* New upstream release.
  - running apps triangle indicator overlay
  - message counters are now rendered with a nice rounded background

5 files changed, 164 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 32663ae..5c9118d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,113 @@
+indicator-messages (0.3.92-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 31 Mar 2011 14:02:12 +0200
+
+indicator-messages (0.3.92-0ubuntu3) natty; urgency=low
+
+  * debian/patches/lp_690668.patch
+    - Memory leak fixes (LP: #690668)
+  * debian/control
+    - Bump standards version to 3.9.1
+  * debian/source/format
+    - Use source format 3.0 (quilt)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 24 Feb 2011 12:13:33 -0500
+
+indicator-messages (0.3.92-0ubuntu2) natty; urgency=low
+
+  * src/launcher-menu-item.c
+    - Make sure menu entries are displayed for launchers that aren't running (LP: #723873)
+ 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 23 Feb 2011 16:06:37 -0500
+
+indicator-messages (0.3.92-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Adding in accessible description support
+  * debian/control: libindicator version 0.3.19
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 12:18:32 -0600
+
+indicator-messages (0.3.91-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Fixing the service file
+    * Adding a log domain
+    * Fixing type handler for dbusmenu 0.3.94
+  * debian/control: dbusmenu to 0.3.94
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 17:01:34 -0600
+
+indicator-messages (0.3.90-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * GDBus Port
+    * New libindicate and dbusmenu
+
+  [ 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
+
+  * Rebuild for libindicator ABI change (LP: #637692)
+  * debian/control: depends on latest libindicator-dev 
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 22 Sep 2010 18:39:27 +0200
+
+indicator-messages (0.3.11-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing triangles by passing data to callback (LP: #623453)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 13:24:13 -0500
+
+indicator-messages (0.3.10-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Shifting icons into the gutter and adjusting the arrow
+      padding.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 26 Aug 2010 15:08:31 -0500
+
+indicator-messages (0.3.9-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Remove parens from counts
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 13:10:10 -0500
+
+indicator-messages (0.3.8-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    - running apps triangle indicator overlay
+    - message counters are now rendered with a nice rounded background
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 29 Jul 2010 13:33:14 -0400
+
 indicator-messages (0.3.7-1) unstable; urgency=low
 
   * Merge from Ubuntu.
@@ -360,3 +470,4 @@ indicator-messages (0.1-0ubuntu1) jaunty; urgency=low
   * debian/copyright: Properly describe license.
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Feb 2009 11:35:38 +0100
+
diff --git a/debian/control b/debian/control
index c671c35..fba48e2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Build-Depends: debhelper (>= 5.0),
                gnome-doc-utils,
                scrollkeeper,
                intltool,
-               libindicate-dev (>= 0.3.0),
-               libindicate-gtk-dev (>= 0.3.0),
-               libindicator-dev (>= 0.3.5),
-               libdbusmenu-gtk-dev (>= 0.2.5),
-               libdbusmenu-glib-dev (>= 0.2.8)
-Standards-Version: 3.8.4
+               libindicate-dev (>= 0.4.91),
+               libindicate-gtk-dev (>= 0.4.91),
+               libindicator-dev (>= 0.3.19),
+               libdbusmenu-gtk-dev (>= 0.3.94),
+               libdbusmenu-glib-dev (>= 0.3.94)
+Standards-Version: 3.9.1
 Homepage: https://launchpad.net/indicator-messages
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/indicator-messages/debian
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/indicator-messages/debian
@@ -27,6 +27,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.
diff --git a/debian/patches/lp_690668.patch b/debian/patches/lp_690668.patch
new file mode 100644
index 0000000..48ee7f5
--- /dev/null
+++ b/debian/patches/lp_690668.patch
@@ -0,0 +1,44 @@
+=== modified file 'src/indicator-messages.c'
+--- old/src/indicator-messages.c	2011-01-14 19:10:10 +0000
++++ new/src/indicator-messages.c	2011-01-21 20:08:53 +0000
+@@ -571,6 +571,7 @@
+ 				                                         width,
+ 				                                         height,
+ 				                                         GDK_INTERP_BILINEAR);
++				g_object_unref(pixbuf);
+ 			} else {
+ 				g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+ 				resized_pixbuf = pixbuf;
+@@ -578,10 +579,7 @@
+ 	  
+ 			gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
+ 
+-			/* The other pixbuf should be free'd by the dbusmenu. */
+-			if (resized_pixbuf != pixbuf) {
+-				g_object_unref(resized_pixbuf);
+-			}
++			g_object_unref(resized_pixbuf);
+ 
+ 			gtk_widget_show(mi_data->icon);
+ 		} else {
+@@ -633,6 +631,7 @@
+ 			                                         width,
+ 			                                         height,
+ 			                                         GDK_INTERP_BILINEAR);
++			g_object_unref(pixbuf);
+ 		} else {
+ 			g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+ 			resized_pixbuf = pixbuf;
+@@ -640,10 +639,7 @@
+   
+ 		gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
+ 
+-		/* The other pixbuf should be free'd by the dbusmenu. */
+-		if (resized_pixbuf != pixbuf) {
+-			g_object_unref(resized_pixbuf);
+-		}
++		g_object_unref(resized_pixbuf);
+ 	}
+ 	gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
+ 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6badc75
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp_690668.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)