r2158 - in /experimental/evolution/debian/patches: 02_nss_paths.patch 04_gettext_intltool.patch 10_revert_libevolution_avoid-version.patch

[jordi at users.alioth.debian.org]

Author: jordi
Date: Mon May 14 08:28:46 2012
New Revision: 2158

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2158
Log:
Remove -avoid-version to some additional libs.

Modified:
    experimental/evolution/debian/patches/02_nss_paths.patch
    experimental/evolution/debian/patches/04_gettext_intltool.patch
    experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch

Modified: experimental/evolution/debian/patches/02_nss_paths.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/02_nss_paths.patch?rev=2158&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch (original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch Mon May 14 08:28:46 2012
@@ -4,11 +4,9 @@
  built-in certificate store of NSS) lives, and it's actually under libdir/nss
  rather than directly under libdir.
 
-Index: evolution-3.2.2/configure.ac
-===================================================================
---- evolution-3.2.2.orig/configure.ac	2012-01-04 10:31:04.819896725 -0500
-+++ evolution-3.2.2/configure.ac	2012-01-04 10:32:35.639899977 -0500
-@@ -824,7 +824,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -842,7 +842,7 @@
  			fi
  			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
  			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])

Modified: experimental/evolution/debian/patches/04_gettext_intltool.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/04_gettext_intltool.patch?rev=2158&op=diff
==============================================================================
--- experimental/evolution/debian/patches/04_gettext_intltool.patch (original)
+++ experimental/evolution/debian/patches/04_gettext_intltool.patch Mon May 14 08:28:46 2012
@@ -1,8 +1,6 @@
-Index: evolution-3.2.2/configure.ac
-===================================================================
---- evolution-3.2.2.orig/configure.ac	2011-11-24 20:36:56.204898254 +0100
-+++ evolution-3.2.2/configure.ac	2011-11-24 20:38:45.049430365 +0100
-@@ -158,9 +158,6 @@ dnl I18N stuff
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,9 +165,6 @@
  dnl ******************************
  IT_PROG_INTLTOOL([0.40.0])
  

Modified: experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch?rev=2158&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch (original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch Mon May 14 08:28:46 2012
@@ -247,3 +247,56 @@
  
  libetext_la_LIBADD = 						\
  	$(top_builddir)/a11y/libevolution-a11y.la		\
+--- a/capplet/settings/Makefile.am
++++ b/capplet/settings/Makefile.am
+@@ -63,5 +63,5 @@
+ 	$(top_builddir)/libemail-engine/libemail-engine.la \
+ 	$(top_builddir)/e-util/libeutil.la
+ 
+-libevolution_mail_settings_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_mail_settings_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+--- a/libemail-engine/Makefile.am
++++ b/libemail-engine/Makefile.am
+@@ -62,7 +62,7 @@
+ 	$(GNOME_PLATFORM_LIBS) \
+ 	$(NULL)
+ 
+-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libemail-engine.pc
+--- a/libemail-utils/Makefile.am
++++ b/libemail-utils/Makefile.am
+@@ -35,7 +35,7 @@
+ 	mail-mt.c \
+ 	$(NULL)
+ 
+-libemail_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libemail_utils_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+ libemail_utils_la_LIBADD = \
+ 	$(top_builddir)/filter/libfilter.la \
+--- a/libevolution-utils/Makefile.am
++++ b/libevolution-utils/Makefile.am
+@@ -30,7 +30,7 @@
+ 	evolution-util.c \
+ 	$(NULL)
+ 
+-libevolution_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_utils_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+ libevolution_utils_la_LIBADD = \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+--- a/libgnomecanvas/Makefile.am
++++ b/libgnomecanvas/Makefile.am
+@@ -62,7 +62,7 @@
+ 	$(GNOME_PLATFORM_LIBS) \
+ 	$(MATH_LIB)
+ 
+-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+ BUILT_SOURCES = $(MARSHAL_GENERATED)
+