tags 636297 + patch
tags 636297 + pending
thanks

Dear maintainer,

I've prepared an NMU for kerneloops (versioned as 0.12+git20090217-1.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

Cheers,
-- 
Jérémy Bobbio                        .''`. 
lu...@debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   
diff -u kerneloops-0.12+git20090217/Makefile kerneloops-0.12+git20090217/Makefile
--- kerneloops-0.12+git20090217/Makefile
+++ kerneloops-0.12+git20090217/Makefile
@@ -12,13 +12,13 @@
 
 CFLAGS := -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wformat -Wformat-security -Werror=format-security
 
-MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
+MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0 dbus-glib-1`
 #
 # pkg-config tends to make programs pull in a ton of libraries, not all 
 # are needed. -Wl,--as-needed tells the linker to just drop unused ones,
 # and that makes the applet load faster and use less memory.
 #
-LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0`
+LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0 dbus-glib-1`
 LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now" 
 
 all:	kerneloops kerneloops-applet kerneloops.8.gz
diff -u kerneloops-0.12+git20090217/debian/changelog kerneloops-0.12+git20090217/debian/changelog
--- kerneloops-0.12+git20090217/debian/changelog
+++ kerneloops-0.12+git20090217/debian/changelog
@@ -1,3 +1,12 @@
+kerneloops (0.12+git20090217-1.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Fix compatibility with libnotify 0.7 API (closes: #636297)
+  * Add now missing dependencies on libgtk2.0-dev
+  * Add dbus-glib-1 to pkg-config calls in Makefile
+
+ -- Jérémy Bobbio <lu...@debian.org>  Fri, 05 Aug 2011 18:53:41 +0200
+
 kerneloops (0.12+git20090217-1) unstable; urgency=low
 
   * New upstream version (closes: #512174)
diff -u kerneloops-0.12+git20090217/debian/control kerneloops-0.12+git20090217/debian/control
--- kerneloops-0.12+git20090217/debian/control
+++ kerneloops-0.12+git20090217/debian/control
@@ -1,5 +1,5 @@
 Source: kerneloops
-Build-Depends: debhelper (>= 4), libcurl4-gnutls-dev | libcurl-dev, libnotify-dev, desktop-file-utils
+Build-Depends: debhelper (>= 4), libcurl4-gnutls-dev | libcurl-dev, libgtk2.0-dev, libnotify-dev, desktop-file-utils
 Section: utils
 Priority: optional
 Maintainer: Matthew Wilcox <matt...@wil.cx>
only in patch2:
unchanged:
--- kerneloops-0.12+git20090217.orig/kerneloops-applet.c
+++ kerneloops-0.12+git20090217/kerneloops-applet.c
@@ -51,6 +51,10 @@
 #include <gtk/gtk.h>
 
 #include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 
 static DBusConnection *bus;
 
@@ -240,8 +244,13 @@
 	/* if there's a notification active already, close it first */
 	close_notification();
 
+#if NOTIFY_CHECK_VERSION(0,7,0)
+	notify = notify_notification_new(summary, message,
+				"/usr/share/kerneloops/icon.png");
+#else
 	notify = notify_notification_new(summary, message,
 				"/usr/share/kerneloops/icon.png", NULL);
+#endif
 
 	notify_notification_set_timeout(notify, 0);
 	notify_notification_set_urgency(notify, NOTIFY_URGENCY_CRITICAL);
@@ -306,8 +315,13 @@
 
 	url_to_oops[0] = 0;
 
+#if NOTIFY_CHECK_VERSION(0,7,0)
+	notify = notify_notification_new(summary, message,
+				"/usr/share/kerneloops/icon.png");
+#else
 	notify = notify_notification_new(summary, message,
 				"/usr/share/kerneloops/icon.png", NULL);
+#endif
 
 	notify_notification_set_timeout(notify, 5000);
 	notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW);

Attachment: signature.asc
Description: Digital signature

Reply via email to