Dear maintainer,
I've prepared an NMU for mail-notification (versioned as
5.4.dfsg.1-2.3) have requested its sponsorship. Please feel free to
tell me if I should delay it longer.
Regards,
Stephen
diff -Nru mail-notification-5.4.dfsg.1/debian/changelog mail-notification-5.4.dfsg.1/debian/changelog
--- mail-notification-5.4.dfsg.1/debian/changelog 2010-05-26 08:09:41.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/changelog 2011-02-28 00:50:50.000000000 +0100
@@ -1,3 +1,15 @@
+mail-notification (5.4.dfsg.1-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with gmime 2.4 (closes: #549057). Thanks to Götz Watsch for
+ the original patch, adapted here to modify the gob sources.
+ * Build with evolution-data-server 2.32.
+ * Link in libX11 explicitly to build with strict linking dependencies.
+ * Document all patches (minimally).
+ * Standards-Version 3.9.1, no change required.
+
+ -- Stephen Kitt <st...@sk2.org> Mon, 28 Feb 2011 00:14:07 +0100
+
mail-notification (5.4.dfsg.1-2.2) unstable; urgency=low
* Non-maintainer upload.
diff -Nru mail-notification-5.4.dfsg.1/debian/control mail-notification-5.4.dfsg.1/debian/control
--- mail-notification-5.4.dfsg.1/debian/control 2010-05-26 06:55:55.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/control 2011-02-28 00:50:20.000000000 +0100
@@ -2,8 +2,8 @@
Section: gnome
Priority: optional
Maintainer: LIU Qi <liuq...@gmail.com>
-Build-Depends: debhelper (>= 7), scrollkeeper, gnome-pkg-tools, libxml-parser-perl, libglade2-dev (>= 2.6.0), libsasl2-dev (>= 2.0.0), libgmime-2.0-2-dev (>= 2.2.3), evolution-dev (>= 2.11.0), evolution-plugins (>= 2.6.0), evolution-data-server-dev (>= 1.6.0), libgnomeprintui2.2-dev, libnotify-dev (>= 0.4.3), intltool (>= 0.35), gob2 (>= 2.0.16)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), scrollkeeper, gnome-pkg-tools, libxml-parser-perl, libglade2-dev (>= 2.6.0), libsasl2-dev (>= 2.0.0), libgmime-2.4-dev, evolution-dev (>= 2.11.0), evolution-plugins (>= 2.6.0), evolution-data-server-dev (>= 1.6.0), libgnomeprintui2.2-dev, libnotify-dev (>= 0.4.3), intltool (>= 0.35), gob2 (>= 2.0.16), libx11-dev
+Standards-Version: 3.9.1
Package: mail-notification
Architecture: any
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/camel-includes.patch mail-notification-5.4.dfsg.1/debian/patches/camel-includes.patch
--- mail-notification-5.4.dfsg.1/debian/patches/camel-includes.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/camel-includes.patch 2011-02-28 00:47:54.000000000 +0100
@@ -0,0 +1,36 @@
+Include camel/camel.h instead of specific headers; the latter is
+forbidden in evolution-data-server 2.32.
+
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-message.gob
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-message.gob
+@@ -23,7 +23,7 @@
+
+ %{
+ #include <glib/gi18n.h>
+-#include <camel/camel-folder-summary.h>
++#include <camel/camel.h>
+ #include "mn-evolution-mailbox.h"
+ #include "mn-message-private.h"
+ #include "mn-evolution-client.h"
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-plugin.c
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-plugin.c
+@@ -24,7 +24,7 @@
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <dbus/dbus-glib-bindings.h>
+-#include <camel/camel-folder.h>
++#include <camel/camel.h>
+ #include <mail/em-event.h>
+ #include <mail/mail-tools.h>
+ #include "mn-evolution.h"
+--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob
++++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
+@@ -26,7 +26,7 @@
+ #include <libintl.h>
+ #include <gobject/gvaluecollector.h>
+ #include <libedataserver/eds-version.h>
+-#include <camel/camel-folder.h>
++#include <camel/camel.h>
+ #if EDS_CHECK_VERSION(2,29,0)
+ #include <shell/e-shell.h>
+ #include <mail/e-mail-browser.h>
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/mail-notification-5.4-gmime.patch mail-notification-5.4.dfsg.1/debian/patches/mail-notification-5.4-gmime.patch
--- mail-notification-5.4.dfsg.1/debian/patches/mail-notification-5.4-gmime.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/mail-notification-5.4-gmime.patch 2011-02-28 00:47:00.000000000 +0100
@@ -0,0 +1,63 @@
+Build with gmime 2.4. Patch taken from
+http://launchpadlibrarian.net/54265412/mail-notification-5.4-gmime.patch
+and adapted to fix the gob sources rather than the generated C.
+
+--- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c
++++ mail-notification-5.4.dfsg.1/jbsrc/jb.c
+@@ -166,7 +166,7 @@
+ jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
+ jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
+
+- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
++ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
+ "hotmail",
+ "imap",
+ "maildir",
+--- mail-notification-5.4.dfsg.1.orig/src/mn-message-mime.c
++++ mail-notification-5.4.dfsg.1/src/mn-message-mime.c
+@@ -33,12 +33,12 @@
+ g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
+
+ /* SpamAssassin */
+- spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
++ spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
+ if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+ return TRUE;
+
+ /* bogofilter */
+- spam = g_mime_message_get_header(mime_message, "X-Bogosity");
++ spam = g_mime_object_get_header(mime_message, "X-Bogosity");
+ if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+ return TRUE;
+
+@@ -89,7 +89,7 @@
+ {
+ const char *status;
+
+- status = g_mime_message_get_header(mime_message, "Status");
++ status = g_mime_object_get_header(mime_message, "Status");
+ if (status && strchr(status, 'R'))
+ return NULL; /* the message was read */
+ else if (status && strchr(status, 'O'))
+--- mail-notification-5.4.dfsg.1.orig/src/mn-base-mbox-mailbox-backend.gob
++++ mail-notification-5.4.dfsg.1/src/mn-base-mbox-mailbox-backend.gob
+@@ -140,7 +140,7 @@
+ mime_message = g_mime_parser_construct_message(parser);
+ if (mime_message)
+ {
+- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
++ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
+ {
+ #if WITH_MOZILLA
+ type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
+--- mail-notification-5.4.dfsg.1.orig/src/mn-mozilla-mailbox-backend.gob
++++ mail-notification-5.4.dfsg.1/src/mn-mozilla-mailbox-backend.gob
+@@ -69,7 +69,7 @@
+ {
+ const char *header;
+
+- header = g_mime_message_get_header(mime_message, header_name);
++ header = g_mime_object_get_header(mime_message, header_name);
+ if (header && mn_str_ishex(header))
+ return strtol(header, NULL, 16);
+ else
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch
--- mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch 2010-05-26 06:58:09.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/patches/replace-gmail-icon.patch 2011-02-28 00:45:50.000000000 +0100
@@ -1,3 +1,5 @@
+Mention Debian-specific gmail icon.
+
--- mail-notification-5.4.dfsg.1.orig/AUTHORS
+++ mail-notification-5.4.dfsg.1/AUTHORS
@@ -34,9 +34,12 @@
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/series mail-notification-5.4.dfsg.1/debian/patches/series
--- mail-notification-5.4.dfsg.1/debian/patches/series 2010-05-26 07:22:05.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/patches/series 2011-02-28 00:31:11.000000000 +0100
@@ -4,3 +4,6 @@
update-gob2-2.0.16.patch
update-eds-2.29.patch
update-icons.patch
+mail-notification-5.4-gmime.patch
+camel-includes.patch
+strict-libs.patch
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/strict-libs.patch mail-notification-5.4.dfsg.1/debian/patches/strict-libs.patch
--- mail-notification-5.4.dfsg.1/debian/patches/strict-libs.patch 1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/strict-libs.patch 2011-02-28 00:45:18.000000000 +0100
@@ -0,0 +1,13 @@
+Link with libX11 explicitly.
+
+--- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c
++++ mail-notification-5.4.dfsg.1/jbsrc/jb.c
+@@ -445,6 +445,8 @@
+
+ jb_compile_options_add_libs(object->compile_options, "-lm");
+
++ jb_compile_options_add_libs(object->compile_options, "-lX11");
++
+ jb_compile_options_add_package(object->compile_options, "gettext");
+ jb_compile_options_add_package(object->compile_options, "gnome");
+ jb_compile_options_add_package(object->compile_options, "dbus");
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch
--- mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch 2010-05-26 06:58:56.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/patches/typo-fixes.patch 2011-02-28 00:45:01.000000000 +0100
@@ -1,3 +1,5 @@
+Fix a typo in the German translation.
+
--- mail-notification-5.4.dfsg.1.orig/po/de.po
+++ mail-notification-5.4.dfsg.1/po/de.po
@@ -1275,7 +1275,7 @@
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch
--- mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch 2010-05-26 07:19:44.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/patches/update-eds-2.23.5.patch 2011-02-28 00:44:33.000000000 +0100
@@ -1,3 +1,5 @@
+Build with versions of evolution-data-server newer than 2.23.5.
+
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
@@ -25,6 +25,7 @@
