r29310 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/17_libnotify_0.7.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul 31 22:57:15 2011
New Revision: 29310

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29310
Log:
* debian/patches/17_libnotify_0.7.patch
  - Update gweather and battstat applet for the API changes in libnotify
    0.7. Bump the Build-Depends on libnotify-dev accordingly.

Added:
    desktop/unstable/gnome-applets/debian/patches/17_libnotify_0.7.patch
Modified:
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/patches/series

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=29310&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Sun Jul 31 22:57:15 2011
@@ -27,6 +27,9 @@
     - Remove debian/patches/98_autoreconf.patch.
   * debian/patches/16_link_dbus-glib.patch
     - Link gweather and cpufreq applet against dbus-glib. Closes: #554646
+  * debian/patches/17_libnotify_0.7.patch
+    - Update gweather and battstat applet for the API changes in libnotify
+      0.7. Bump the Build-Depends on libnotify-dev accordingly.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 31 Jul 2011 23:40:11 +0200
 

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=29310&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Sun Jul 31 22:57:15 2011
@@ -22,7 +22,7 @@
                libxklavier-dev (>= 4.0),
                libwnck-dev (>= 2.9.3),
                libgnome-desktop-dev (>= 2.11.1),
-               libnotify-dev (>= 0.3.2),
+               libnotify-dev (>= 0.7.0),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
                python-gtk2-dev (>= 2.6),

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=29310&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Sun Jul 31 22:57:15 2011
@@ -17,7 +17,7 @@
                libxklavier-dev (>= 4.0),
                libwnck-dev (>= 2.9.3),
                libgnome-desktop-dev (>= 2.11.1),
-               libnotify-dev (>= 0.3.2),
+               libnotify-dev (>= 0.7.0),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
                python-gtk2-dev (>= 2.6),

Added: desktop/unstable/gnome-applets/debian/patches/17_libnotify_0.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/17_libnotify_0.7.patch?rev=29310&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/17_libnotify_0.7.patch (added)
+++ desktop/unstable/gnome-applets/debian/patches/17_libnotify_0.7.patch [utf-8] Sun Jul 31 22:57:15 2011
@@ -1,0 +1,27 @@
+Index: gnome-applets-2.30.0/gweather/gweather-applet.c
+===================================================================
+--- gnome-applets-2.30.0.orig/gweather/gweather-applet.c	2011-08-01 00:14:18.687129336 +0200
++++ gnome-applets-2.30.0/gweather/gweather-applet.c	2011-08-01 00:14:47.410768230 +0200
+@@ -465,8 +465,7 @@
+ 			 if (icon == NULL)
+ 				 icon = "stock-unknown";
+ 	           	 
+-			 n = notify_notification_new (message, detail, icon,
+-					 gw_applet->container);
++			 n = notify_notification_new (message, detail, icon);
+ 	
+ 		   	 notify_notification_show (n, &error);
+ 			 if (error)
+Index: gnome-applets-2.30.0/battstat/battstat_applet.c
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/battstat_applet.c	2011-08-01 00:15:26.590275678 +0200
++++ gnome-applets-2.30.0/battstat/battstat_applet.c	2011-08-01 00:16:27.133514547 +0200
+@@ -430,7 +430,7 @@
+ 			GTK_ICON_LOOKUP_USE_BUILTIN,
+ 			NULL);
+ 	
+-	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
++	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL);
+ 
+ 	/* XXX: it would be nice to pass this as a named icon */
+ 	notify_notification_set_icon_from_pixbuf (n, icon);

Modified: desktop/unstable/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/series?rev=29310&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/series [utf-8] Sun Jul 31 22:57:15 2011
@@ -2,4 +2,6 @@
 09_modemlights_use_new_gst.patch
 10_network-manager.patch
 15_path-max.patch
+16_link_dbus-glib.patch
+17_libnotify_0.7.patch
 99_ltmain_as-needed.patch