Author: Jordi Mallach <jordi@debian.org>
Description: Revert 160006402248075b95c98e9e34d4538670ba7480
 Revert upstream patch that adds -avoid-version to all libevolution
 libs, making them versionless. This is a massive WTF.
Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=591436
Forwarded: no

---
Index: b/addressbook/gui/contact-editor/Makefile.am
===================================================================
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -26,7 +26,7 @@
 	e-contact-editor-dyntable.h \
 	e-contact-editor-dyntable.c
 
-libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/e-util/libevolution-util.la			\
Index: b/addressbook/gui/contact-list-editor/Makefile.am
===================================================================
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -20,7 +20,7 @@
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libecontactlisteditor_la_LIBADD =				\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
Index: b/addressbook/importers/Makefile.am
===================================================================
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -19,7 +19,7 @@
 	evolution-csv-importer.c	        \
 	evolution-addressbook-importers.h
 
-libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libevolution-util.la 			\
Index: b/addressbook/util/Makefile.am
===================================================================
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -20,7 +20,7 @@
 	eab-book-util.c					\
 	eab-book-util.h
 
-libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libeabutil_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libeabutil_la_LIBADD =					\
 	$(top_builddir)/e-util/libevolution-util.la	\
Index: b/calendar/gui/Makefile.am
===================================================================
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -235,7 +235,7 @@
 	$(MATH_LIB)							\
 	$(NULL)
 
-libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 EXTRA_DIST =	 			\
 	$(ui_DATA)			\
Index: b/calendar/importers/Makefile.am
===================================================================
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -16,7 +16,7 @@
 	evolution-calendar-importer.h	     \
 	icalendar-importer.c
 
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_calendar_importers_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la		\
Index: b/composer/Makefile.am
===================================================================
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -51,7 +51,7 @@
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
-libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_mail_composer_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_mail_composer_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la	\
Index: b/e-util/Makefile.am
===================================================================
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -675,7 +675,7 @@
 	$(PLATFORM_SOURCES) \
 	$(NULL)
 
-libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_util_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_util_la_LIBADD =  \
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
Index: b/em-format/Makefile.am
===================================================================
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -95,7 +95,7 @@
 	e-mail-parser-image.c				\
 	e-mail-parser-inlinepgp-encrypted.c		\
 	e-mail-parser-inlinepgp-signed.c		\
- 	e-mail-parser-message.c				\
+	e-mail-parser-message.c				\
 	e-mail-parser-message-deliverystatus.c		\
 	e-mail-parser-message-external.c		\
 	e-mail-parser-message-rfc822.c			\
@@ -122,7 +122,7 @@
 	e-mail-stripsig-filter.c			\
 	$(SMIME_EXTENSIONS)
 
-libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_mail_formatter_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 if ENABLE_SMIME
 SMIME_LIBS =						\
Index: b/libemail-engine/Makefile.am
===================================================================
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -82,7 +82,7 @@
 	$(GNOME_PLATFORM_LIBS) \
 	$(NULL)
 
-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libemail_engine_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-engine.pc
Index: b/libgnomecanvas/Makefile.am
===================================================================
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -54,7 +54,7 @@
 	$(GNOME_PLATFORM_LIBS) \
 	$(MATH_LIB)
 
-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 
Index: b/mail/Makefile.am
===================================================================
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -240,7 +240,7 @@
 	$(LIBSOUP_LIBS)					\
 	$(NULL)
 
-libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 noinst_PROGRAMS = test-mail-autoconfig
 
Index: b/mail/importers/Makefile.am
===================================================================
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -22,7 +22,7 @@
 	pine-importer.c				\
 	evolution-mbox-importer.c
 
-libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libevolution-util.la		\
Index: b/shell/Makefile.am
===================================================================
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -86,7 +86,7 @@
 	evo-version.h				\
 	$(NULL)
 
-libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_shell_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_shell_la_LIBADD =				\
 	$(top_builddir)/e-util/libevolution-util.la	\
Index: b/smime/gui/Makefile.am
===================================================================
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -43,7 +43,7 @@
 	$(CERT_UI_LIBS)					\
 	$(NULL)
 
-libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 ui_DATA = smime-ui.ui
 
Index: b/smime/lib/Makefile.am
===================================================================
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -35,6 +35,6 @@
 	$(CERT_UI_LIBS)				\
 	$(NULL)
 
-libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+libessmime_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk