r2106 - in /unstable/evolution-data-server/debian: changelog patches/22_gmodule_dep.patch patches/series

Tue Mar 27 17:11:33 UTC 2012

Author: jordi
Date: Tue Mar 27 17:11:32 2012
New Revision: 2106

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2106
Log:
Add 22_gmodule_dep.patch: Add explicit dependencies on gmodule-2.0
(closes: #665664).

Added:
    unstable/evolution-data-server/debian/patches/22_gmodule_dep.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2106&op=diff
==============================================================================

--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Tue Mar 27 17:11:32 2012
@@ -4,8 +4,10 @@
     affecting arch:all packages. Instead, bump to cdbs (>= 0.4.90) to
     ensure integrated dh_bugfiles support (closes: #593786).
   * Update Vcs-* URLs.
-
- -- Jordi Mallach <jordi at debian.org>  Tue, 27 Mar 2012 18:23:27 +0200
+  * Add 22_gmodule_dep.patch: Add explicit dependencies on gmodule-2.0
+    (closes: #665664).
+
+ -- Jordi Mallach <jordi at debian.org>  Tue, 27 Mar 2012 18:56:12 +0200
 
 evolution-data-server (3.2.2-1) unstable; urgency=low
 

Added: unstable/evolution-data-server/debian/patches/22_gmodule_dep.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/22_gmodule_dep.patch?rev=2106&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/22_gmodule_dep.patch (added)
+++ unstable/evolution-data-server/debian/patches/22_gmodule_dep.patch Tue Mar 27 17:11:32 2012
@@ -1,0 +1,61 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Add explicit dependencies on gmodule-2.0
+ Add explicit dependencies on gmodule-2.0, to fix FTBFS caused
+ by gio-2.0.pc in GLib 2.32 moving gmodule-2.0 from Requires to
+ Requires.private.
+Bug-GNOME: http://bugzilla.gnome.org/show_bug.cgi?id=664819
+Bug-GNOME: http://bugzilla.gnome.org/show_bug.cgi?id=666770
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665664
+Forwarded: not-needed
+
+Index: evolution-data-server-3.2.2/configure.ac
+===================================================================
+--- evolution-data-server-3.2.2.orig/configure.ac	2012-03-27 18:38:18.000000000 +0200
++++ evolution-data-server-3.2.2/configure.ac	2012-03-27 18:45:45.161259076 +0200
+@@ -334,6 +334,7 @@
+ dnl ***********************************
+ PKG_CHECK_MODULES(GNOME_PLATFORM,
+ 	[gio-2.0 >= glib_minimum_version
++        gmodule-2.0 >= glib_minimum_version
+ 	gtk+-3.0 >= gtk_minimum_version
+ 	gconf-2.0 >= gconf_minimum_version
+ 	libxml-2.0 >= libxml_minimum_version
+@@ -1294,7 +1295,7 @@
+ dnl ******************************
+ dnl libedataserver flags
+ dnl ******************************
+-E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
++E_DATA_SERVER_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
+ 
+ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS)
+ AC_SUBST(E_DATA_SERVER_CFLAGS)
+@@ -1316,7 +1317,7 @@
+ 	AC_SUBST(FACTORY_GTK_LIBS)
+ fi
+ 
+-E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
++E_BACKEND_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 gconf-2.0"
+ 
+ dnl ******************************
+ dnl libebackend flags
+@@ -1459,7 +1460,7 @@
+ 
+ AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
+ 
+-EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
++EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
+ AC_SUBST(CAMEL_CFLAGS)
+ AC_SUBST(CAMEL_LIBS)
+ 
+Index: evolution-data-server-3.2.2/libedataserver/libedataserver.pc.in
+===================================================================
+--- evolution-data-server-3.2.2.orig/libedataserver/libedataserver.pc.in	2011-04-26 16:25:02.000000000 +0200
++++ evolution-data-server-3.2.2/libedataserver/libedataserver.pc.in	2012-03-27 18:46:01.477258344 +0200
+@@ -10,6 +10,6 @@
+ Name: libedataserver
+ Description: Utility library for Evolution Data Server
+ Version: @VERSION@
+-Requires: gio-2.0 libxml-2.0 gconf-2.0 libsoup-2.4
++Requires: gio-2.0 gmodule-2.0 libxml-2.0 gconf-2.0 libsoup-2.4
+ Libs: -L${libdir} -ledataserver- at API_VERSION@
+ Cflags: -I${privincludedir}

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2106&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Tue Mar 27 17:11:32 2012
@@ -8,3 +8,4 @@
 08_newfolder_imap.patch
 20_gettext_intltool.patch
 21_link_libical.patch
+22_gmodule_dep.patch


