r1426 - in /unstable/evolution-rss/debian: changelog control patches/03_recv_feeds.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Nov 24 12:50:06 2009
New Revision: 1426

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1426
Log:
* 03_recv_feeds.patch: new version of the patch, with a correct 
  version check at version 2.28.1. Uh, API changed in a minor release, 
  this is so insane!
* Require evolution 2.28.1, at both build time and run time, to avoid 
  running into the issue.

Modified:
    unstable/evolution-rss/debian/changelog
    unstable/evolution-rss/debian/control
    unstable/evolution-rss/debian/patches/03_recv_feeds.patch

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1426&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Tue Nov 24 12:50:06 2009
@@ -1,3 +1,13 @@
+evolution-rss (0.1.4-6) unstable; urgency=low
+
+  * 03_recv_feeds.patch: new version of the patch, with a correct 
+    version check at version 2.28.1. Uh, API changed in a minor release, 
+    this is so insane!
+  * Require evolution 2.28.1, at both build time and run time, to avoid 
+    running into the issue.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 24 Nov 2009 13:50:01 +0100
+
 evolution-rss (0.1.4-5) unstable; urgency=low
 
   * 03_recv_feeds.patch: new patch from upstream. Fixes a bug causing 

Modified: unstable/evolution-rss/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/control?rev=1426&op=diff
==============================================================================
--- unstable/evolution-rss/debian/control (original)
+++ unstable/evolution-rss/debian/control Tue Nov 24 12:50:06 2009
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 5),
                dpkg-dev (>= 1.14.16),
                autotools-dev,
-               evolution-dev (>= 2.28),
+               evolution-dev (>= 2.28.1),
                libebook1.2-dev,
                intltool,
                libglib2.0-dev (>= 2.16.2),
@@ -33,7 +33,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         evolution (>= 2.28), evolution (<< 2.29)
+         evolution (>= 2.28.1), evolution (<< 2.29)
 Description: Evolution RSS Reader Plugin
  This plugin adds RSS Feeds support for evolution mail.
  .

Modified: unstable/evolution-rss/debian/patches/03_recv_feeds.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/03_recv_feeds.patch?rev=1426&op=diff
==============================================================================
--- unstable/evolution-rss/debian/patches/03_recv_feeds.patch (original)
+++ unstable/evolution-rss/debian/patches/03_recv_feeds.patch Tue Nov 24 12:50:06 2009
@@ -1,27 +1,41 @@
-Debian #551972
-
 diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
 --- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
-+++ evolution-rss-0.1.4-mod/src/rss.c	2009-10-26 19:30:55.000000000 +0200
++++ evolution-rss-0.1.4-mod/src/rss.c	2009-11-24 14:26:36.000000000 +0200
 @@ -2812,7 +2812,11 @@
          GMutex *lock;
  
          /* states/data used during shutdown */
 -        enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
-+#if EVOLUTION_VERSION >= 22800
-+	enum { MC_QUIT_NOT_START, MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
++#if EVOLUTION_VERSION >= 22801
++       enum { MC_QUIT_NOT_START, MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
 +#else
-+	enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
++       enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
 +#endif
  };
  
  void
-@@ -2829,7 +2833,7 @@
+@@ -2829,7 +2833,11 @@
  		deleted = 1;
  
  	MailComponent *mc = mail_component_peek ();
--        if (mc->priv->quit_state != -1)
++#if EVOLUTION_VERSION >= 22801
 +        if (mc->priv->quit_state != MC_QUIT_NOT_START)
++#else
+         if (mc->priv->quit_state != -1)
++#endif
  		rf->cancel_all=1;
  
  	d(g_print("taskbar_op_finish() queue:%d\n", rf->feed_queue));
+@@ -3194,7 +3202,11 @@
+ {
+ 	MailComponent *mc = mail_component_peek ();
+ 	g_print("stAte:%d\n", mc->priv->quit_state);
++#if EVOLUTION_VERSION >= 22801
++        if (mc->priv->quit_state != MC_QUIT_NOT_START)
++#else
+         if (mc->priv->quit_state != -1)
++#endif
+ 		rf->cancel=1;
+ 
+ 	if (!rf->pending && !rf->feed_queue && !rf->cancel_all && rf->online) {
+