r1497 - in /experimental/evolution/debian: changelog control patches/02_fix-gtkdoc.patch rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Jan 26 06:52:00 2010
New Revision: 1497

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1497
Log:
* New upstream development release.
* debian/control:
  - bump eds and gtkhtml versions to 2.29.6.
* debian/rules:
  - disable nm on non Linux builds, fix FTBFS on kFreeBSD.    closes: #566928
* debian/patches
  - 02_fix-gtkdoc dropped.

Removed:
    experimental/evolution/debian/patches/02_fix-gtkdoc.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1497&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Tue Jan 26 06:52:00 2010
@@ -1,3 +1,15 @@
+evolution (2.29.6-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * debian/control:
+    - bump eds and gtkhtml versions to 2.29.6.
+  * debian/rules:
+    - disable nm on non Linux builds, fix FTBFS on kFreeBSD.    closes: #566928
+  * debian/patches
+    - 02_fix-gtkdoc dropped.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 25 Jan 2010 23:50:27 +0100
+
 evolution (2.29.5-1) experimental; urgency=low
 
   * New upstream development release.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1497&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Tue Jan 26 06:52:00 2010
@@ -28,28 +28,28 @@
                gtk-doc-tools (>= 0.6),
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.29.5),
-               libgtkhtml-editor-dev (>= 3.29.5),
+               libgtkhtml3.14-dev (>= 3.29.6),
+               libgtkhtml-editor-dev (>= 3.29.6),
                libkrb5-dev,
                libnss3-dev,
                psmisc,
                libglib2.0-dev (>= 2.22.0),
-               evolution-data-server-dev (>= 2.29.5),
+               evolution-data-server-dev (>= 2.29.6),
                evolution-data-server-dev (<< 2.30.0),
                libgtk2.0-dev (>= 2.18.0),
                libgnomecanvas2-dev,
                libxml2-dev,
                libgconf2-dev,
-               libcamel1.2-dev (>= 2.29.5),
-               libedataserver1.2-dev (>= 2.29.5),
-               libegroupwise1.2-dev (>= 2.29.5),
-               libedataserverui1.2-dev (>= 2.29.5),
-               libebackend1.2-dev (>= 2.29.5),
-               libgdata1.2-dev (>= 2.29.5),
-               libgdata-google1.2-dev (>= 2.29.5),
+               libcamel1.2-dev (>= 2.29.6),
+               libedataserver1.2-dev (>= 2.29.6),
+               libegroupwise1.2-dev (>= 2.29.6),
+               libedataserverui1.2-dev (>= 2.29.6),
+               libebackend1.2-dev (>= 2.29.6),
+               libgdata1.2-dev (>= 2.29.6),
+               libgdata-google1.2-dev (>= 2.29.6),
                libgnome2-dev,
-               libecal1.2-dev (>= 2.29.5),
-               libebook1.2-dev (>= 2.29.5),
+               libecal1.2-dev (>= 2.29.6),
+               libebook1.2-dev (>= 2.29.6),
                libdbus-glib-1-dev,
                libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libnotify-dev (>= 0.3.0),
@@ -69,7 +69,7 @@
                libunique-dev,
                libcanberra-dev,
                libcanberra-gtk-dev,
-               libgtkimageview-dev,
+               libgtkimageview-dev
 
 Package: evolution
 Architecture: any

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1497&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Tue Jan 26 06:52:00 2010
@@ -32,6 +32,12 @@
 	--disable-pst-import \
 	--disable-contacts-map
 
+ifneq (DEB_HOST_ARCH_OS, linux)
+	DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm
+else
+	DEB_CONFIGURE_EXTRA_FLAGS+=--enable-nm
+endif
+
 clean::
 	debconf-updatepo
 	find -name '*.schemas' | xargs rm -f