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,15 @@ +evolution-rss (0.1.0-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Update Conflicts for evolution 2.24 + *Fix FTBFS due to change on evolution 2.23 (LP: ##263834) + - debian/patches/62_under-gecko-home.patch: + Refreshed to allow debian/patches/66_... to apply cleanly + - debian/patches/66_from_svn_add_evo_23_support.patch + + -- Manny Vindiola Mon, 15 Dec 2008 02:32:59 -0500 + evolution-rss (0.1.0-2) unstable; urgency=low [ Pedro Fragoso ] @@ -8,6 +20,29 @@ -- Heikki Henriksen Wed, 29 Oct 2008 09:43:23 +0100 +evolution-rss (0.1.0-1ubuntu2) intrepid; urgency=low + + * debian/control: + - Update Conflicts as evolution 2.24 is now on intrepid, + really fixes (LP: #272916) + + -- Pedro Fragoso Wed, 24 Sep 2008 23:47:02 +0100 + +evolution-rss (0.1.0-1ubuntu1) intrepid; urgency=low + + * debian/control: + - Update Conflicts for evolution 2.23.x + * debian/patches/64_glue-shutdown.patch: + - Prevent evolution segfaulting on exit and clean glue + * debian/patches/65_firefox-import.patch: + - Fix importing feeds from firefox + * debian/patches/62_under-gecko-home.patch: + - Refreshed to 66 apply cleanly + * debian/patches/66_from_svn_add_evo_23_support.patch + - Fix FTBFS due to change on evolution 2.23 (LP: ##263834) + + -- Pedro Fragoso Fri, 22 Aug 2008 20:08:57 +0100 + evolution-rss (0.1.0-1) unstable; urgency=medium [ Heikki Henriksen ] diff -u evolution-rss-0.1.0/debian/control evolution-rss-0.1.0/debian/control --- evolution-rss-0.1.0/debian/control +++ evolution-rss-0.1.0/debian/control @@ -1,7 +1,8 @@ Source: evolution-rss Section: gnome Priority: optional -Maintainer: Debian Evolution Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Evolution Maintainers Uploaders: Pedro Fragoso , Heikki Henriksen , Oystein Gisnas @@ -29,8 +30,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner (>= 1.9~) | xulrunner-1.9 -Conflicts: evolution (<< 2.22.0), - evolution (>= 2.23.0) +Conflicts: evolution (<< 2.24.0), + evolution (>= 2.25.0) Description: Evolution RSS Reader Plugin This plugin adds RSS Feeds support for evolution mail. . diff -u evolution-rss-0.1.0/debian/patches/62_undef-gecko-home.patch evolution-rss-0.1.0/debian/patches/62_undef-gecko-home.patch --- evolution-rss-0.1.0/debian/patches/62_undef-gecko-home.patch +++ evolution-rss-0.1.0/debian/patches/62_undef-gecko-home.patch @@ -452,16 +452,3 @@ \n \ - \n \ -diff -Nur evolution-rss-0.1.0/src/rss.c evolution-rss-0.1.0.new/src/rss.c ---- evolution-rss-0.1.0/src/rss.c 2008-07-01 21:18:55.000000000 +0200 -+++ evolution-rss-0.1.0.new/src/rss.c 2008-07-04 12:09:29.000000000 +0200 -@@ -1574,7 +1574,9 @@ - rss_mozilla_init(void) - { - GError *err = NULL; -- g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1); -+#ifdef GECKO_HOME -+ g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1); -+#endif - g_unsetenv("MOZILLA_FIVE_HOME"); - + \n \ only in patch2: unchanged: --- evolution-rss-0.1.0.orig/debian/patches/66_from_svn_add_evo_23_support.patch +++ evolution-rss-0.1.0/debian/patches/66_from_svn_add_evo_23_support.patch @@ -0,0 +1,64 @@ +--- evo-rss-0.1.0/src/rss.c 2008-08-28 16:19:02.000000000 -0400 ++++ evolution-rss-0.1.0/src/rss.c 2008-08-28 16:29:46.000000000 -0400 +@@ -332,20 +332,25 @@ + taskbar_op_new(gchar *message) + #endif + { +- static GdkPixbuf *progress_icon = NULL; +- EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); +- progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); +-// progress_icon = NULL; +- char *mcp = g_strdup_printf("%p", mail_component_peek()); +- guint activity_id = +-#if (EVOLUTION_VERSION >= 22200) +- e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail", +- progress_icon, message, TRUE, +- (void (*) (gpointer))abort_all_soup, +- key); ++ EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); ++ char *mcp = g_strdup_printf("%p", mail_component_peek()); ++ guint activity_id = ++#if (EVOLUTION_VERSION >= 22306) ++ e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail", ++ message, TRUE, ++ (void (*) (gpointer))abort_all_soup, ++ key); + #else +- e_activity_handler_operation_started(activity_handler, mcp, +- progress_icon, message, FALSE); ++ static GdkPixbuf *progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); ++ #if (EVOLUTION_VERSION >= 22200) ++ e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail", ++ progress_icon, message, TRUE, ++ (void (*) (gpointer))abort_all_soup, ++ key); ++ #else ++ e_activity_handler_operation_started(activity_handler, mcp, ++ progress_icon, message, FALSE); ++#endif + #endif + + g_free(mcp); +@@ -1574,9 +1579,6 @@ + rss_mozilla_init(void) + { + GError *err = NULL; +- g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1); +- g_unsetenv("MOZILLA_FIVE_HOME"); +- + + gecko_init(); + } +@@ -3109,9 +3111,9 @@ + "rss-24.png", + NULL); + +- GtkWidget *recv_icon = e_icon_factory_get_image ( +- iconfile, E_ICON_SIZE_LARGE_TOOLBAR); +- g_free(iconfile); ++ GtkWidget *recv_icon = gtk_image_new_from_file( ++ iconfile); ++ g_free(iconfile); + + + guint row = t->row;