r1757 - in /experimental/evolution/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sat Oct  2 16:13:40 2010
New Revision: 1757

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1757
Log:
  - add  build-dep on libchamplain and geoclue to add contacts map plugin.
  - don't disable contact maps, drop pilot conduit disabling (useless now).

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=1757&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sat Oct  2 16:13:40 2010
@@ -3,15 +3,17 @@
   * New upstream release.
   * debian/control:
     - bump build-deps for 2.32 release.
+    - add  build-dep on libchamplain and geoclue to add contacts map plugin.
   * debian/rules:
     - pick flags from dpkg-buildflags.
     - add --as-needed to LDFLAGS
     - explicitly disable GTK3 build.
+    - don't disable contact maps, drop pilot conduit disabling (useless now).
   * debian/patches:
     - 02_let-nss-search-for-nssckbi, 03_correctly-init-nss and 
       04_login-to-nss-on-demand dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 17:07:05 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 18:13:10 +0200
 
 evolution (2.30.3-2) unstable; urgency=low
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1757&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Sat Oct  2 16:13:40 2010
@@ -44,8 +44,7 @@
                libegroupwise1.2-dev (>= 2.32.0),
                libedataserverui1.2-dev (>= 2.32.0),
                libebackend1.2-dev (>= 2.32.0),
-               libgdata1.2-dev (>= 2.32.0),
-               libgdata-google1.2-dev (>= 2.32.0),
+               libgdata-dev,
                libecal1.2-dev (>= 2.32.0),
                libebook1.2-dev (>= 2.32.0),
                libgnome2-dev,
@@ -70,7 +69,9 @@
                libgtkimageview-dev (>= 1.6),
                gnome-pkg-tools,
                libclutter-gtk-0.10-dev (>= 0.10),
-               libchamplain-0.4-dev (>= 0.4)
+               libchamplain-0.6-dev,
+               libchamplain-gtk-0.6-dev,
+               libgeoclue-dev
 
 Package: evolution
 Architecture: any

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1757&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Sat Oct  2 16:13:40 2010
@@ -26,13 +26,12 @@
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-openldap \
 	--enable-nls \
-	--disable-pilot-conduits \
 	--with-krb5=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--enable-plugins=experimental \
 	--disable-pst-import \
-	--disable-contacts-map
+	--enable-gtk3=no
 
 ifneq ($(DEB_HOST_ARCH_OS), linux)
 	DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm