r2116 - in /unstable/evolution-ews/debian: changelog patches/03_individual_glib_headers.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed Mar 28 17:46:05 2012
New Revision: 2116

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2116
Log:
Add 03_individual_glib_headers.patch to fix FTBFS caused by the
deprecation of individual GLib headers.

Added:
    unstable/evolution-ews/debian/patches/03_individual_glib_headers.patch
Modified:
    unstable/evolution-ews/debian/changelog
    unstable/evolution-ews/debian/patches/series

Modified: unstable/evolution-ews/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-ews/debian/changelog?rev=2116&op=diff
==============================================================================
--- unstable/evolution-ews/debian/changelog (original)
+++ unstable/evolution-ews/debian/changelog Wed Mar 28 17:46:05 2012
@@ -2,12 +2,14 @@
 
   * Do not build with -Werror, to work around a FTBFS caused by new
     deprecated functions when building with GLib 2.32 (closes: #665669).
+  * Add 03_individual_glib_headers.patch to fix FTBFS caused by the
+    deprecation of individual GLib headers.
   * watch: do not uupdate.
   * Update Vcs-* fields.
   * Bump Standards-Version to 3.9.3, with no further changes.
   * Add DEP3 patch headers.
 
- -- Jordi Mallach <jordi at debian.org>  Wed, 28 Mar 2012 18:51:15 +0200
+ -- Jordi Mallach <jordi at debian.org>  Wed, 28 Mar 2012 19:45:20 +0200
 
 evolution-ews (3.2.2-1) unstable; urgency=low
 

Added: unstable/evolution-ews/debian/patches/03_individual_glib_headers.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-ews/debian/patches/03_individual_glib_headers.patch?rev=2116&op=file
==============================================================================
--- unstable/evolution-ews/debian/patches/03_individual_glib_headers.patch (added)
+++ unstable/evolution-ews/debian/patches/03_individual_glib_headers.patch Wed Mar 28 17:46:05 2012
@@ -1,0 +1,18 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Do not include individual glib-2.0 headers.
+ This is deprecated in GLib 3.32; instead, use glib.h directly.
+
+Index: evolution-ews-3.2.2/src/calendar/e-cal-backend-ews.c
+===================================================================
+--- evolution-ews-3.2.2.orig/src/calendar/e-cal-backend-ews.c	2011-10-20 12:28:55.000000000 +0200
++++ evolution-ews-3.2.2/src/calendar/e-cal-backend-ews.c	2012-03-28 19:32:34.750628510 +0200
+@@ -40,8 +40,7 @@
+ #include <libical/icalcomponent.h>
+ #include <libical/icalproperty.h>
+ #include <libical/icalparameter.h>
+-#include <glib-2.0/glib/gerror.h>
+-#include <glib-2.0/glib/glist.h>
++#include <glib.h>
+ #include <camel/camel.h>
+ #include <ews-camel-common.h>
+ #include <libedataserver/eds-version.h>

Modified: unstable/evolution-ews/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-ews/debian/patches/series?rev=2116&op=diff
==============================================================================
--- unstable/evolution-ews/debian/patches/series (original)
+++ unstable/evolution-ews/debian/patches/series Wed Mar 28 17:46:05 2012
@@ -1,5 +1,6 @@
 01_deprecated.patch
 02_liblzx_noinst.patch
+03_individual_glib_headers.patch
 10_none_server.patch
 11_deleted_inbox.patch
 12_prefill_host.patch