r2074 - in /experimental/evolution-exchange/debian: changelog control patches/01_deprecated.patch patches/03_link_libical.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Dec 1 21:29:45 UTC 2011 

Author: joss
Date: Thu Dec  1 21:29:45 2011
New Revision: 2074

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2074
Log:
* Use dh-autoreconf.
* 01_deprecated.patch: new patch. Remove _DISABLE_DEPRECATED flags.
  Closes: #650051.
* 03_link_libical.patch: new patch. Correctly link with libical to use 
  its functions.

Added:
    experimental/evolution-exchange/debian/patches/01_deprecated.patch
      - copied, changed from r2068, unstable/evolution-exchange/debian/patches/01_deprecated.patch
    experimental/evolution-exchange/debian/patches/03_link_libical.patch
      - copied, changed from r2072, unstable/evolution-exchange/debian/patches/03_link_libical.patch
    experimental/evolution-exchange/debian/patches/series
      - copied, changed from r2068, unstable/evolution-exchange/debian/patches/series
Modified:
    experimental/evolution-exchange/debian/changelog
    experimental/evolution-exchange/debian/control
    experimental/evolution-exchange/debian/rules

Modified: experimental/evolution-exchange/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/changelog?rev=2074&op=diff
==============================================================================
--- experimental/evolution-exchange/debian/changelog (original)
+++ experimental/evolution-exchange/debian/changelog Thu Dec  1 21:29:45 2011
@@ -1,3 +1,13 @@
+evolution-exchange (3.2.1-2) UNRELEASED; urgency=low
+
+  * Use dh-autoreconf.
+  * 01_deprecated.patch: new patch. Remove _DISABLE_DEPRECATED flags.
+    Closes: #650051.
+  * 03_link_libical.patch: new patch. Correctly link with libical to use 
+    its functions.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 01 Dec 2011 21:55:02 +0100
+
 evolution-exchange (3.2.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: experimental/evolution-exchange/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/control?rev=2074&op=diff
==============================================================================
--- experimental/evolution-exchange/debian/control (original)
+++ experimental/evolution-exchange/debian/control Thu Dec  1 21:29:45 2011
@@ -17,6 +17,7 @@
 Build-Depends: debhelper (>= 5.0.0),
                dpkg-dev (>= 1.14.16),
                cdbs (>= 0.4.37),
+               dh-autoreconf,
                gnome-pkg-tools,
                pkg-config,
                libglib2.0-dev (>= 2.28),

Copied: experimental/evolution-exchange/debian/patches/01_deprecated.patch (from r2068, unstable/evolution-exchange/debian/patches/01_deprecated.patch)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/patches/01_deprecated.patch?rev=2074&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/patches/01_deprecated.patch (original)
+++ experimental/evolution-exchange/debian/patches/01_deprecated.patch Thu Dec  1 21:29:45 2011
@@ -1,18 +1,16 @@
-Index: evolution-exchange-3.0.2/configure.ac
+Index: evolution-exchange-3.2.1/configure.ac
 ===================================================================
---- evolution-exchange-3.0.2.orig/configure.ac	2011-04-25 09:03:03.000000000 +0200
-+++ evolution-exchange-3.0.2/configure.ac	2011-12-01 21:35:36.077926002 +0100
-@@ -34,12 +34,7 @@ dnl **********************
+--- evolution-exchange-3.2.1.orig/configure.ac	2011-09-28 00:04:28.000000000 +0200
++++ evolution-exchange-3.2.1/configure.ac	2011-12-01 21:54:55.939596322 +0100
+@@ -34,10 +34,7 @@ dnl **********************
  dnl Compiler Warning Flags
  dnl **********************
  AS_COMPILER_FLAGS(WARNING_FLAGS,
--	"-DG_DISABLE_DEPRECATED
--	-DPANGO_DISABLE_DEPRECATED
+-	"-DPANGO_DISABLE_DEPRECATED
 -	-DGDK_DISABLE_DEPRECATED
 -	-DGDK_PIXBUF_DISABLE_DEPRECATED
--	-DGTK_DISABLE_DEPRECATED
--	-DE_BOOK_DISABLE_DEPRECATED
-+	"-DE_BOOK_DISABLE_DEPRECATED
- 	-DE_CAL_DISABLE_DEPRECATED
- 	-DG_DISABLE_SINGLE_INCLUDES
+-	-DG_DISABLE_SINGLE_INCLUDES
++	"-DG_DISABLE_SINGLE_INCLUDES
  	-DGTK_DISABLE_SINGLE_INCLUDES
+ 	-DGSEAL_ENABLE
+ 	-DE_BOOK_DISABLE_DEPRECATED

Copied: experimental/evolution-exchange/debian/patches/03_link_libical.patch (from r2072, unstable/evolution-exchange/debian/patches/03_link_libical.patch)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/patches/03_link_libical.patch?rev=2074&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/patches/03_link_libical.patch (original)
+++ experimental/evolution-exchange/debian/patches/03_link_libical.patch Thu Dec  1 21:29:45 2011
@@ -1,7 +1,7 @@
-Index: evolution-exchange-3.0.2/calendar/Makefile.am
+Index: evolution-exchange-3.2.1/calendar/Makefile.am
 ===================================================================
---- evolution-exchange-3.0.2.orig/calendar/Makefile.am	2011-12-01 21:50:10.702201880 +0100
-+++ evolution-exchange-3.0.2/calendar/Makefile.am	2011-12-01 22:17:19.430164318 +0100
+--- evolution-exchange-3.2.1.orig/calendar/Makefile.am	2011-09-28 00:04:28.000000000 +0200
++++ evolution-exchange-3.2.1/calendar/Makefile.am	2011-12-01 22:23:57.212108977 +0100
 @@ -9,6 +9,7 @@ libecalbackendexchange_la_CPPFLAGS = \
  	-DG_LOG_DOMAIN=\"e-cal-backend-exchange\" \
  	$(EVOLUTION_DATA_SERVER_CFLAGS) \
@@ -18,10 +18,10 @@
  	$(LDAP_LIBS) \
  	$(DNS_LIBS)
  
-Index: evolution-exchange-3.0.2/camel/Makefile.am
+Index: evolution-exchange-3.2.1/camel/Makefile.am
 ===================================================================
---- evolution-exchange-3.0.2.orig/camel/Makefile.am	2011-12-01 21:50:10.702201880 +0100
-+++ evolution-exchange-3.0.2/camel/Makefile.am	2011-12-01 22:16:40.609974526 +0100
+--- evolution-exchange-3.2.1.orig/camel/Makefile.am	2011-09-28 00:04:28.000000000 +0200
++++ evolution-exchange-3.2.1/camel/Makefile.am	2011-12-01 22:24:19.628218558 +0100
 @@ -6,6 +6,7 @@ CAMEL_provider_DATA = libcamelexchange.u
  libcamelexchange_la_CPPFLAGS = \
  	$(AM_CPPFLAGS) \
@@ -30,19 +30,19 @@
  	-I$(top_srcdir) \
  	-I$(top_srcdir)/tools \
  	-I$(top_srcdir)/server/lib \
-@@ -44,6 +45,7 @@ libcamelexchange_la_LIBADD = \
- 	$(top_builddir)/server/storage/libexchange-storage.la \
+@@ -50,6 +51,7 @@ libcamelexchange_la_LIBADD = \
  	$(top_builddir)/tools/libevolution-exchange-shared.la \
  	$(EVOLUTION_PLUGIN_LIBS) \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
 +	$(LIBICAL_LIBS) \
  	$(LDAP_LIBS) \
  	$(SOCKET_LIBS) \
  	$(DNS_LIBS)
-Index: evolution-exchange-3.0.2/configure.ac
+Index: evolution-exchange-3.2.1/configure.ac
 ===================================================================
---- evolution-exchange-3.0.2.orig/configure.ac	2011-12-01 22:11:03.500326487 +0100
-+++ evolution-exchange-3.0.2/configure.ac	2011-12-01 22:15:58.317767782 +0100
-@@ -279,6 +279,12 @@ case $abt in
+--- evolution-exchange-3.2.1.orig/configure.ac	2011-12-01 22:23:44.000000000 +0100
++++ evolution-exchange-3.2.1/configure.ac	2011-12-01 22:23:57.212108977 +0100
+@@ -288,6 +288,12 @@ case $abt in
  esac
  AC_DEFINE_UNQUOTED([E2K_APPROX_BUILD_TIME],[$abt],[Used to prevent clock-setting attacks against pilot licenses])
  

Copied: experimental/evolution-exchange/debian/patches/series (from r2068, unstable/evolution-exchange/debian/patches/series)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/patches/series?rev=2074&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/patches/series (original)
+++ experimental/evolution-exchange/debian/patches/series Thu Dec  1 21:29:45 2011
@@ -1,1 +1,2 @@
 01_deprecated.patch
+03_link_libical.patch

Modified: experimental/evolution-exchange/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-exchange/debian/rules?rev=2074&op=diff
==============================================================================
--- experimental/evolution-exchange/debian/rules (original)
+++ experimental/evolution-exchange/debian/rules Thu Dec  1 21:29:45 2011
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk

More information about the pkg-evolution-commits mailing list