r2070 - in /unstable/evolution-exchange/debian: changelog patches/02_linking_issues.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Dec  1 20:51:31 2011
New Revision: 2070

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2070
Log:
02_linking_issues.patch: stolen from upstream git. Fix linking 
issues causing build failures.

Added:
    unstable/evolution-exchange/debian/patches/02_linking_issues.patch
Modified:
    unstable/evolution-exchange/debian/changelog
    unstable/evolution-exchange/debian/patches/series

Modified: unstable/evolution-exchange/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/changelog?rev=2070&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/changelog (original)
+++ unstable/evolution-exchange/debian/changelog Thu Dec  1 20:51:31 2011
@@ -3,6 +3,8 @@
   * Use dh-autoreconf.
   * 01_deprecated.patch: new patch. Remove _DISABLE_DEPRECATED flags.
     Closes: #650051.
+  * 02_linking_issues.patch: stolen from upstream git. Fix linking 
+    issues causing build failures.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 01 Dec 2011 21:38:07 +0100
 

Added: unstable/evolution-exchange/debian/patches/02_linking_issues.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/patches/02_linking_issues.patch?rev=2070&op=file
==============================================================================
--- unstable/evolution-exchange/debian/patches/02_linking_issues.patch (added)
+++ unstable/evolution-exchange/debian/patches/02_linking_issues.patch Thu Dec  1 20:51:31 2011
@@ -1,0 +1,71 @@
+From 0314df5c8dd959d174b7862209e8d41c9541452d Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <mathieu at canonical.com>
+Date: Wed, 27 Jul 2011 16:45:02 +0000
+Subject: Bug #651786 - Fix more linking issues
+
+---
+diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
+index 7fe7117..42e0d72 100644
+--- a/addressbook/Makefile.am
++++ b/addressbook/Makefile.am
+@@ -57,6 +57,8 @@ libebookbackendexchange_la_LDFLAGS = \
+ 	-module -avoid-version $(NO_UNDEFINED)
+ 
+ libebookbackendexchange_la_LIBADD = \
++	$(top_builddir)/server/lib/libexchange.la \
++	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(top_builddir)/tools/libevolution-exchange-shared.la \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
+diff --git a/calendar/Makefile.am b/calendar/Makefile.am
+index d1b3c27..313ed4c 100644
+--- a/calendar/Makefile.am
++++ b/calendar/Makefile.am
+@@ -29,6 +29,8 @@ libecalbackendexchange_la_LDFLAGS = \
+ 	-module -avoid-version $(NO_UNDEFINED)
+ 
+ libecalbackendexchange_la_LIBADD = \
++	$(top_builddir)/server/lib/libexchange.la \
++	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(top_builddir)/tools/libevolution-exchange-shared.la \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
+diff --git a/camel/Makefile.am b/camel/Makefile.am
+index e65578b..24f60ba 100644
+--- a/camel/Makefile.am
++++ b/camel/Makefile.am
+@@ -40,6 +40,8 @@ libcamelexchange_la_LDFLAGS = \
+ 	-avoid-version -module $(NO_UNDEFINED)
+ 
+ libcamelexchange_la_LIBADD = \
++	$(top_builddir)/server/lib/libexchange.la \
++	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(top_builddir)/tools/libevolution-exchange-shared.la \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
+ 	$(LDAP_LIBS) \
+diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
+index b9b2b45..1aff64a 100644
+--- a/eplugin/Makefile.am
++++ b/eplugin/Makefile.am
+@@ -60,6 +60,7 @@ liborg_gnome_exchange_operations_la_SOURCES = \
+ 	exchange-send-options.h
+ 
+ liborg_gnome_exchange_operations_la_LIBADD = \
++	$(top_builddir)/server/lib/libexchange.la \
+ 	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index e54d851..55a962e 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -26,6 +26,7 @@ libevolution_exchange_shared_la_SOURCES = \
+ 	exchange-share-config-listener.c
+ 
+ libevolution_exchange_shared_la_LIBADD = \
++	$(top_builddir)/server/lib/libexchange.la \
+ 	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(GNOME_PLATFORM_LIBS) \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+--
+cgit v0.9.0.2

Modified: unstable/evolution-exchange/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/patches/series?rev=2070&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/patches/series (original)
+++ unstable/evolution-exchange/debian/patches/series Thu Dec  1 20:51:31 2011
@@ -1,1 +1,2 @@
 01_deprecated.patch
+02_linking_issues.patch