Hello :)
I've uploaded a new version of evolution-rss. This adds two upstream
patches. Upstream has pushed for us to get these two fixes included in
Lenny. Debdiff is attached.
Cheers,
Heikki
Changelog:
Source: evolution-rss
Version: 0.1.0-2
Distribution: unstable
Urgency: low
Maintainer: Heikki Henriksen <heikkih@gmail.com>
Date: Wed, 29 Oct 2008 09:43:23 +0100
Closes: 491703
Changes:
evolution-rss (0.1.0-2) unstable; urgency=low
.
[ Pedro Fragoso ]
* debian/patches/64_glue-shutdown.patch:
- Prevent evolution segfaulting on exit and clean glue (Closes:
#491703)
* debian/patches/65_firefox-import.patch:
- Fix importing feeds from firefox
diff -u evolution-rss-0.1.0/debian/changelog evolution-rss-0.1.0/debian/changelog
--- evolution-rss-0.1.0/debian/changelog
+++ evolution-rss-0.1.0/debian/changelog
@@ -1,3 +1,13 @@
+evolution-rss (0.1.0-2) unstable; urgency=low
+
+ [ Pedro Fragoso ]
+ * debian/patches/64_glue-shutdown.patch:
+ - Prevent evolution segfaulting on exit and clean glue (Closes: #491703)
+ * debian/patches/65_firefox-import.patch:
+ - Fix importing feeds from firefox
+
+ -- Heikki Henriksen <heikkih@gmail.com> Wed, 29 Oct 2008 09:43:23 +0100
+
evolution-rss (0.1.0-1) unstable; urgency=medium
[ Heikki Henriksen ]
only in patch2:
unchanged:
--- evolution-rss-0.1.0.orig/debian/patches/65_firefox-import.patch
+++ evolution-rss-0.1.0/debian/patches/65_firefox-import.patch
@@ -0,0 +1,44 @@
+Index: src/misc.c
+===================================================================
+--- src/misc.c (.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c) (revision 333)
++++ src/misc.c (.../src/misc.c) (working copy)
+@@ -65,6 +65,8 @@
+ {
+ if (strstr(text, "feed//"))
+ text = strextr(text, "feed//");
++ if (strstr(text, "feed:"))
++ text = strextr(text, "feed:");
+ if (strstr(text, "feed://"))
+ text = strextr(text, "feed://");
+ if (!strstr (text, "http://";)
+Index: src/network-soup.c
+===================================================================
+--- src/network-soup.c (.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c) (revision 333)
++++ src/network-soup.c (.../src/network-soup.c) (working copy)
+@@ -488,7 +488,7 @@
+
+ if (!rf->b_session)
+ rf->b_session = soup_sess =
+- soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
++ soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
+ else
+ soup_sess = rf->b_session;
+
+@@ -499,14 +499,14 @@
+ G_CALLBACK (reauthenticate), soup_sess);
+ #endif
+
+- suri = soup_uri_new(url);
+- if (!suri)
++ req = soup_message_new(SOUP_METHOD_GET, url);
++ if (!req)
+ {
+ g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
+ soup_status_get_phrase(2)); //invalid url
+ goto out;
+ }
+- req = soup_message_new_from_uri(SOUP_METHOD_GET, suri);
++ d(g_print("request ok :%d\n", req->status_code));
+ g_signal_connect(G_OBJECT(req), "got-chunk",
+ G_CALLBACK(got_chunk_blocking_cb), &info);
+ for (; headers; headers = headers->next) {
only in patch2:
unchanged:
--- evolution-rss-0.1.0.orig/debian/patches/64_glue-shutdown.patch
+++ evolution-rss-0.1.0/debian/patches/64_glue-shutdown.patch
@@ -0,0 +1,24 @@
+--- src/gecko-utils.cpp (revision 342)
++++ src/gecko-utils.cpp (working copy)
+@@ -39,6 +39,7 @@
+ #include <nsIPrefService.h>
+ #include <nsIServiceManager.h>
+ #include <nsServiceManagerUtils.h>
++#include <nspr.h>
+
+ static nsIPrefBranch* gPrefBranch;
+
+@@ -97,7 +98,13 @@
+ NS_IF_RELEASE (gPrefBranch);
+ gPrefBranch = nsnull;
+
++#ifdef XPCOM_GLUE
++ XPCOMGlueShutdown();
++ NS_ShutdownXPCOM (nsnull);
++ PR_ProcessExit (0);
++#else
+ gtk_moz_embed_pop_startup ();
++#endif
+
+ #ifdef HAVE_GECKO_1_9
+ NS_LogTerm ();
Attachment:
signature.asc
Description: Dette er en digitalt signert meldingsdel