r1477 - in /experimental/evolution/debian: NEWS changelog control evolution-common.install rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Jan 11 14:10:54 2010
New Revision: 1477

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1477
Log:
  - drop build-dep on gnome-pilot.
* drop gnome-pilot support.

Modified:
    experimental/evolution/debian/NEWS
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-common.install
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/NEWS?rev=1477&op=diff
==============================================================================
--- experimental/evolution/debian/NEWS (original)
+++ experimental/evolution/debian/NEWS Mon Jan 11 14:10:54 2010
@@ -1,3 +1,10 @@
+evolution (2.29.4-1) unstable; urgency=low
+
+  * Due to gnome-pilot not beeing recent enough in Debian, it is now disabled
+    in evolution builds.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 Jan 2010 15:08:11 +0100
+
 evolution (2.24.5-2) unstable; urgency=low
 
   * Evolution 2.24 now uses an sqlite database to store the messages

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1477&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Mon Jan 11 14:10:54 2010
@@ -5,12 +5,11 @@
     - drop build-dep on libgnomeprint.
     - bump eds and gtkhtml versions to 2.29.4.
     - drop build-dep on hal.
+    - drop build-dep on gnome-pilot.
   * debian/patches:
     - drop 02_fix-ftbfs-pilot_charset.
-WARNING: the patch doesn't apply anymore but evo still FTBFS without. No news
-from #603452.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Dec 2009 22:21:49 +0100
+  * drop gnome-pilot support.
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 Jan 2010 15:09:53 +0100
 
 evolution (2.29.3.2-1) experimental; urgency=low
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1477&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Mon Jan 11 14:10:54 2010
@@ -30,7 +30,6 @@
                libldap2-dev,
                libgtkhtml3.14-dev (>= 3.29.4),
                libgtkhtml-editor-dev (>= 3.29.4),
-               libgnome-pilot2-dev (>= 2.0.15),
                libkrb5-dev,
                libnss3-dev,
                psmisc,

Modified: experimental/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-common.install?rev=1477&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-common.install (original)
+++ experimental/evolution/debian/evolution-common.install Mon Jan 11 14:10:54 2010
@@ -1,7 +1,6 @@
 debian/tmp/usr/share/applications
 debian/tmp/usr/share/mime-info
 debian/tmp/usr/share/evolution
-debian/tmp/usr/share/gnome-pilot
 debian/tmp/usr/share/icons/hicolor
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/gnome

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1477&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Mon Jan 11 14:10:54 2010
@@ -23,7 +23,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-openldap \
 	--enable-nls \
-	--enable-pilot-conduits \
+	--disable-pilot-conduits \
 	--with-krb5=/usr \
 	--sysconfdir=/etc \
 	--enable-nntp \