r1633 - in /unstable/evolution-rss/debian: changelog control patches/01_folder-rename.patch patches/02_folder-properties.patch patches/03_recv_feeds.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Wed May 19 08:59:43 2010
New Revision: 1633

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1633
Log:
merge experimental branch into unstable

Removed:
    unstable/evolution-rss/debian/patches/01_folder-rename.patch
    unstable/evolution-rss/debian/patches/02_folder-properties.patch
    unstable/evolution-rss/debian/patches/03_recv_feeds.patch
Modified:
    unstable/evolution-rss/debian/changelog
    unstable/evolution-rss/debian/control

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1633&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Wed May 19 08:59:43 2010
@@ -1,3 +1,12 @@
+evolution-rss (0.1.9~20100320-1) experimental; urgency=low
+
+  * New upstream git snapshot.
+  * 01_folder-rename.patch, 02_folder-properties.patch, 
+    03_recv_feeds.patch: dropped, merged upstream.
+  * Update (build-)dependencies.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 20 Mar 2010 15:17:01 +0100
+
 evolution-rss (0.1.4-6) unstable; urgency=low
 
   * 03_recv_feeds.patch: new version of the patch, with a correct 

Modified: unstable/evolution-rss/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/control?rev=1633&op=diff
==============================================================================
--- unstable/evolution-rss/debian/control (original)
+++ unstable/evolution-rss/debian/control Wed May 19 08:59:43 2010
@@ -9,8 +9,9 @@
 Build-Depends: debhelper (>= 5),
                dpkg-dev (>= 1.14.16),
                autotools-dev,
-               evolution-dev (>= 2.28.1),
+               evolution-dev (>= 2.29.92),
                libebook1.2-dev,
+               libgnomecanvas2-dev,
                intltool,
                libglib2.0-dev (>= 2.16.2),
                libgtk2.0-dev (>= 2.12.0),
@@ -33,8 +34,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         evolution (>= 2.28.1), evolution (<< 2.29),
-         evolution-data-server (>= 2.28.1)
+         evolution (>= 2.29.92), evolution (<< 2.30),
+         evolution-data-server (>= 2.29.92)
 Description: Evolution RSS Reader Plugin
  This plugin adds RSS Feeds support for evolution mail.
  .