r1940 - in /unstable/evolution/debian: changelog control patches/03_port-notify-0.7.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Aug  1 21:21:28 2011
New Revision: 1940

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1940
Log:
* debian/rules:
  - 03_port-notify-0.7 added, fix build with notify 0.7.      closes: #630268
* debian/control:
  - update libnotify-dev build-dep.

Added:
    unstable/evolution/debian/patches/03_port-notify-0.7.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/control
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1940&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Mon Aug  1 21:21:28 2011
@@ -1,3 +1,12 @@
+evolution (2.32.3-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - 03_port-notify-0.7 added, fix build with notify 0.7.      closes: #630268
+  * debian/control:
+    - update libnotify-dev build-dep.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 01 Aug 2011 23:21:08 +0200
+
 evolution (2.32.3-2) unstable; urgency=low
 
   * debian/po:

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1940&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Mon Aug  1 21:21:28 2011
@@ -51,7 +51,7 @@
                libgnome2-dev,
                libdbus-glib-1-dev,
                libnm-glib-dev [linux-any],
-               libnotify-dev (>= 0.3.0),
+               libnotify-dev (>= 0.7.0),
                libsoup2.4-dev,
                libdbus-1-dev,
                libgstreamer0.10-dev,

Added: unstable/evolution/debian/patches/03_port-notify-0.7.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_port-notify-0.7.patch?rev=1940&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_port-notify-0.7.patch (added)
+++ unstable/evolution/debian/patches/03_port-notify-0.7.patch Mon Aug  1 21:21:28 2011
@@ -1,0 +1,42 @@
+Index: evolution-2.32.3/calendar/gui/alarm-notify/alarm-queue.c
+===================================================================
+--- evolution-2.32.3.orig/calendar/gui/alarm-notify/alarm-queue.c	2011-03-29 20:38:46.000000000 +0200
++++ evolution-2.32.3/calendar/gui/alarm-notify/alarm-queue.c	2011-08-01 23:07:03.845066696 +0200
+@@ -1606,7 +1606,7 @@
+ 			body = g_strdup_printf ("%s %s", start_str, time_str);
+ 	}
+ 
+-	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
++	n = notify_notification_new (summary, body, "stock_appointment-reminder");
+ 	if (!notify_notification_show(n, NULL))
+ 	    g_warning ("Could not send notification to daemon\n");
+ 
+Index: evolution-2.32.3/plugins/mail-notification/mail-notification.c
+===================================================================
+--- evolution-2.32.3.orig/plugins/mail-notification/mail-notification.c	2011-03-29 20:38:48.000000000 +0200
++++ evolution-2.32.3/plugins/mail-notification/mail-notification.c	2011-08-01 23:07:47.014006952 +0200
+@@ -564,9 +564,7 @@
+ 
+ 			notify  = notify_notification_new (
+ 				_("New email"), safetext,
+-				"mail-unread", NULL);
+-			notify_notification_attach_to_status_icon (
+-				notify, status_icon);
++				"mail-unread");
+ 
+ 			/* Check if actions are supported */
+ 			if (can_support_actions ()) {
+Index: evolution-2.32.3/plugins/publish-calendar/publish-calendar.c
+===================================================================
+--- evolution-2.32.3.orig/plugins/publish-calendar/publish-calendar.c	2011-03-29 20:38:48.000000000 +0200
++++ evolution-2.32.3/plugins/publish-calendar/publish-calendar.c	2011-08-01 23:07:03.849066780 +0200
+@@ -150,8 +150,7 @@
+ 				return;
+ 			}
+ 
+-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
+-			notify_notification_attach_to_status_icon (notify, status_icon);
++			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
+ 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 			g_timeout_add (500, show_notify_cb, NULL);

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1940&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Mon Aug  1 21:21:28 2011
@@ -1,2 +1,3 @@
 01_let-nss-search-for-nssckbi.patch
 02_remove-disable-deprecated-from-configure.patch
+03_port-notify-0.7.patch