Dear Devid Antonio,

I've just uploaded an NMU to the DELAYED/5 queue as ircp-tray is currently
blocking the libnotify 0.7 transition [1]. The debdiff for the NMU is attached.

Cheers,
Michael

[1] http://release.debian.org/transitions/html/libnotify.html

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru ircp-tray-0.7.6/debian/changelog ircp-tray-0.7.6/debian/changelog
--- ircp-tray-0.7.6/debian/changelog	2011-06-27 18:10:03.000000000 +0200
+++ ircp-tray-0.7.6/debian/changelog	2011-08-05 02:34:17.000000000 +0200
@@ -1,3 +1,14 @@
+ircp-tray (0.7.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Port to libnotify 0.7 (Closes: #630284)
+    - Add debian/patches/01-libnotify-0.7.patch.
+    - Bump Build-Depends on libnotify-dev to (>= 0.7.0).
+  * Don't look for translatable files in .pc/ as otherwise intltool will fail.
+    - Add debian/patches/03-skip-po.patch.
+
+ -- Michael Biebl <bi...@debian.org>  Fri, 05 Aug 2011 02:24:46 +0200
+
 ircp-tray (0.7.6-1) unstable; urgency=low
 
   * New upstream release (Closes: #630284, #621981).
diff -Nru ircp-tray-0.7.6/debian/control ircp-tray-0.7.6/debian/control
--- ircp-tray-0.7.6/debian/control	2011-06-27 17:56:58.000000000 +0200
+++ ircp-tray-0.7.6/debian/control	2011-08-05 02:24:07.000000000 +0200
@@ -2,7 +2,7 @@
 Section: comm
 Priority: extra
 Maintainer: Devid Antonio Filoni <d.fil...@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libopenobex1-dev, libnotify-dev, intltool
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libopenobex1-dev, libnotify-dev (>= 0.7.0), intltool
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/ircp-tray
 
diff -Nru ircp-tray-0.7.6/debian/patches/01-libnotify-0.7.patch ircp-tray-0.7.6/debian/patches/01-libnotify-0.7.patch
--- ircp-tray-0.7.6/debian/patches/01-libnotify-0.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ ircp-tray-0.7.6/debian/patches/01-libnotify-0.7.patch	2011-08-05 02:23:50.000000000 +0200
@@ -0,0 +1,47 @@
+Index: ircp-tray-0.7.6/src/ircptray_main.c
+===================================================================
+--- ircp-tray-0.7.6.orig/src/ircptray_main.c	2011-08-05 02:21:28.673856762 +0200
++++ ircp-tray-0.7.6/src/ircptray_main.c	2011-08-05 02:22:44.108908415 +0200
+@@ -248,14 +248,12 @@
+ 
+ 	notification = notify_notification_new (g_get_application_name(),
+                                             notify_msg,
+-                                            icon,
+-                                            NULL);
++                                            icon);
+     if (notification == NULL) {
+         g_warning("failed to setup notification");
+         return;
+     }
+ 
+-	notify_notification_attach_to_status_icon (notification, AppTrayIcon);
+ 
+ 	if (!notify_notification_show (notification, NULL))
+ 	    g_warning("failed to send notification");
+@@ -277,11 +275,9 @@
+ 
+ 	notification = notify_notification_new (g_get_application_name(),
+                                        notify_msg,
+-                                       icon,
+-                                       NULL);
++                                       icon);
+ 
+ 	if (notification != NULL) {
+-	    notify_notification_attach_to_status_icon (notification, AppTrayIcon);
+ 
+ 		if (!notify_notification_show (notification, NULL))
+ 			g_warning("failed to send notification\n");
+Index: ircp-tray-0.7.6/src/recvfile.c
+===================================================================
+--- ircp-tray-0.7.6.orig/src/recvfile.c	2011-08-05 02:22:58.192731358 +0200
++++ ircp-tray-0.7.6/src/recvfile.c	2011-08-05 02:23:21.800434566 +0200
+@@ -255,8 +255,7 @@
+ 
+ 				n = notify_notification_new (title,
+                                        msg,
+-                                       MAIN_ICON,
+-                                       GTK_WIDGET(AppTrayIcon));
++                                       MAIN_ICON);
+ 
+ 				if (n != NULL) {
+ 					notify_notification_set_urgency(n, NOTIFY_URGENCY_NORMAL);
diff -Nru ircp-tray-0.7.6/debian/patches/02-skip-po.patch ircp-tray-0.7.6/debian/patches/02-skip-po.patch
--- ircp-tray-0.7.6/debian/patches/02-skip-po.patch	1970-01-01 01:00:00.000000000 +0100
+++ ircp-tray-0.7.6/debian/patches/02-skip-po.patch	2011-08-05 02:33:24.000000000 +0200
@@ -0,0 +1,6 @@
+Index: ircp-tray-0.7.6/po/POTFILES.skip
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ircp-tray-0.7.6/po/POTFILES.skip	2011-08-05 02:33:20.980901851 +0200
+@@ -0,0 +1 @@
++.pc
diff -Nru ircp-tray-0.7.6/debian/patches/series ircp-tray-0.7.6/debian/patches/series
--- ircp-tray-0.7.6/debian/patches/series	2011-06-27 18:09:47.000000000 +0200
+++ ircp-tray-0.7.6/debian/patches/series	2011-08-05 02:44:01.000000000 +0200
@@ -1 +1,3 @@
 00-POTFILES_trayicon
+01-libnotify-0.7.patch
+02-skip-po.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to