From 393fb64407abf55d8d097516639226328905cc61 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Mon, 5 Jun 2017 01:37:56 +0000 Subject: [PATCH] Refresh and re-enable 10_revert_libevolution_avoid-version.patch git-svn-id: file:///svn/pkg-evolution/experimental/evolution@3158 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 +- debian/control | 2 - debian/evolution-dev.install | 1 + debian/libevolution.install | 2 +- ...10_revert_libevolution_avoid-version.patch | 297 ++++++++++++++++++ debian/patches/series | 1 + debian/tests/installed-tests | 2 +- 7 files changed, 302 insertions(+), 8 deletions(-) create mode 100644 debian/patches/10_revert_libevolution_avoid-version.patch diff --git a/debian/changelog b/debian/changelog index 8340e10994..54c291775c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,7 @@ evolution (3.24.1-1) UNRELEASED; urgency=medium * Split bogofilter, pstimport, and spamassassin support into separate packages so that they can be individually installed or uninstalled by appstream clients - * Drop 10_revert_libevolution_avoid-version.patch: - - This doesn't directly apply with the cmake conversion and doesn't - seem useful since the version has been 0 for the past 5 years - * Add Breaks/Replaces from libevolution to evolution-dev for above + * Update 10_revert_libevolution_avoid-version.patch: * Disable 02_nss_paths.patch since it's not clear whether this is still needed diff --git a/debian/control b/debian/control index 742312f559..f753d16ed8 100644 --- a/debian/control +++ b/debian/control @@ -115,8 +115,6 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, evolution-common (= ${source:Version}), -Breaks: evolution-dev (<< 3.24) -Replaces: evolution-dev (<< 3.24) Description: evolution libraries This package contains libraries used by evolution and the Anjal mail client. diff --git a/debian/evolution-dev.install b/debian/evolution-dev.install index 67b9a6cc46..d069feff1a 100644 --- a/debian/evolution-dev.install +++ b/debian/evolution-dev.install @@ -1,3 +1,4 @@ usr/lib/pkgconfig usr/include +usr/lib/evolution/*.so usr/share/gtk-doc diff --git a/debian/libevolution.install b/debian/libevolution.install index 408c319d6c..93ada159b8 100644 --- a/debian/libevolution.install +++ b/debian/libevolution.install @@ -1,4 +1,4 @@ -usr/lib/evolution/*.so +usr/lib/evolution/*.so.* usr/lib/evolution/modules/*.so usr/lib/evolution/web-extensions/*.so usr/lib/evolution/web-extensions/webkit-editor/*.so diff --git a/debian/patches/10_revert_libevolution_avoid-version.patch b/debian/patches/10_revert_libevolution_avoid-version.patch new file mode 100644 index 0000000000..5eeda8d37d --- /dev/null +++ b/debian/patches/10_revert_libevolution_avoid-version.patch @@ -0,0 +1,297 @@ +Author: Jordi Mallach +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 + + Without this patch, dpkg-shlibdeps doesn't work and libevolution's + reverse dependencies don't get an automatic dependency on libevolution + dpkg-shlibdeps: warning: can't extract name and version from library name +' libevolution-util.so' +--- + src/addressbook/gui/contact-editor/CMakeLists.txt | 5 +++++ + src/addressbook/gui/contact-list-editor/CMakeLists.txt | 5 +++++ + src/addressbook/gui/widgets/CMakeLists.txt | 6 ++++++ + src/addressbook/importers/CMakeLists.txt | 5 +++++ + src/addressbook/printing/CMakeLists.txt | 5 +++++ + src/addressbook/util/CMakeLists.txt | 5 +++++ + src/calendar/gui/CMakeLists.txt | 5 +++++ + src/calendar/importers/CMakeLists.txt | 5 +++++ + src/composer/CMakeLists.txt | 5 +++++ + src/e-util/CMakeLists.txt | 5 +++++ + src/em-format/CMakeLists.txt | 5 +++++ + src/libemail-engine/CMakeLists.txt | 5 +++++ + src/libgnomecanvas/CMakeLists.txt | 2 ++ + src/mail/CMakeLists.txt | 5 +++++ + src/mail/importers/CMakeLists.txt | 5 +++++ + src/shell/CMakeLists.txt | 5 +++++ + src/smime/gui/CMakeLists.txt | 5 +++++ + src/smime/lib/CMakeLists.txt | 5 +++++ + src/web-extensions/CMakeLists.txt | 5 +++++ + 19 files changed, 93 insertions(+) + +--- a/src/addressbook/gui/contact-editor/CMakeLists.txt ++++ b/src/addressbook/gui/contact-editor/CMakeLists.txt +@@ -30,6 +30,11 @@ add_dependencies(econtacteditor + ${DEPENDENCIES} + ) + ++set_target_properties(econtacteditor PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(econtacteditor PRIVATE + -DG_LOG_DOMAIN=\"e-contact-editor\" + ) +--- a/src/addressbook/gui/contact-list-editor/CMakeLists.txt ++++ b/src/addressbook/gui/contact-list-editor/CMakeLists.txt +@@ -25,6 +25,11 @@ add_dependencies(econtactlisteditor + ${DEPENDENCIES} + ) + ++set_target_properties(econtactlisteditor PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(econtactlisteditor PRIVATE + -DG_LOG_DOMAIN=\"e-contact-list-editor\" + ) +--- a/src/addressbook/gui/widgets/CMakeLists.txt ++++ b/src/addressbook/gui/widgets/CMakeLists.txt +@@ -74,6 +74,12 @@ add_dependencies(eabwidgets + ${DEPENDENCIES} + ) + ++set_target_properties(eabwidgets PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ ++ + target_compile_definitions(eabwidgets PRIVATE + -DG_LOG_DOMAIN=\"eabwidgets\" + -DEVOLUTION_ETSPECDIR=\"${etspecdir}\" +--- a/src/addressbook/importers/CMakeLists.txt ++++ b/src/addressbook/importers/CMakeLists.txt +@@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-i + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-addressbook-importers PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-addressbook-importers PRIVATE + -DG_LOG_DOMAIN=\"evolution-addressbook-importers\" + ) +--- a/src/addressbook/printing/CMakeLists.txt ++++ b/src/addressbook/printing/CMakeLists.txt +@@ -25,6 +25,11 @@ add_dependencies(econtactprint + ${DEPENDENCIES} + ) + ++set_target_properties(econtactprint PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(econtactprint PRIVATE + -DG_LOG_DOMAIN=\"addressbook-printing\" + -DEVOLUTION_ECPSDIR=\"${ecpsdir}\" +--- a/src/addressbook/util/CMakeLists.txt ++++ b/src/addressbook/util/CMakeLists.txt +@@ -16,6 +16,11 @@ add_dependencies(eabutil + ${DEPENDENCIES} + ) + ++set_target_properties(eabutil PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(eabutil PRIVATE + -DG_LOG_DOMAIN=\"eabutil\" + ) +--- a/src/calendar/gui/CMakeLists.txt ++++ b/src/calendar/gui/CMakeLists.txt +@@ -180,6 +180,11 @@ add_dependencies(evolution-calendar + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-calendar PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-calendar PRIVATE + -DG_LOG_DOMAIN=\"evolution-calendar\" + -DEVOLUTION_ETSPECDIR=\"${etspecdir}\" +--- a/src/calendar/importers/CMakeLists.txt ++++ b/src/calendar/importers/CMakeLists.txt +@@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-impo + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-calendar-importers PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-calendar-importers PRIVATE + -DG_LOG_DOMAIN=\"evolution-calendar-importers\" + -DEVOLUTION_SOUNDDIR=\"${soundsdir}\" +--- a/src/composer/CMakeLists.txt ++++ b/src/composer/CMakeLists.txt +@@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-mail-composer PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-mail-composer PRIVATE + -DG_LOG_DOMAIN=\"evolution-mail-composer\" + -DEVOLUTION_UIDIR=\"${uidir}\" +--- a/src/e-util/CMakeLists.txt ++++ b/src/e-util/CMakeLists.txt +@@ -574,6 +574,11 @@ add_dependencies(evolution-util + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-util PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-util PRIVATE + -DG_LOG_DOMAIN=\"evolution-util\" + -DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\" +--- a/src/em-format/CMakeLists.txt ++++ b/src/em-format/CMakeLists.txt +@@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatte + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-mail-formatter PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-mail-formatter PRIVATE + -DG_LOG_DOMAIN=\"evolution-mail-formatter\" + -DEVOLUTION_IMAGESDIR=\"${imagesdir}\" +--- a/src/libemail-engine/CMakeLists.txt ++++ b/src/libemail-engine/CMakeLists.txt +@@ -60,6 +60,11 @@ add_dependencies(email-engine + ${DEPENDENCIES} + ) + ++set_target_properties(email-engine PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(email-engine PRIVATE + -DG_LOG_DOMAIN=\"e-mail-engine\" + -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" +--- a/src/libgnomecanvas/CMakeLists.txt ++++ b/src/libgnomecanvas/CMakeLists.txt +@@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLI + ) + + set_target_properties(gnomecanvas PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 + INSTALL_RPATH "" + ) + +--- a/src/mail/CMakeLists.txt ++++ b/src/mail/CMakeLists.txt +@@ -209,6 +209,11 @@ add_dependencies(evolution-mail + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-mail PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-mail PRIVATE + -DG_LOG_DOMAIN=\"evolution-mail\" + -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" +--- a/src/mail/importers/CMakeLists.txt ++++ b/src/mail/importers/CMakeLists.txt +@@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importer + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-mail-importers PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-mail-importers PRIVATE + -DG_LOG_DOMAIN=\"evolution-mail-importers\" + -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" +--- a/src/shell/CMakeLists.txt ++++ b/src/shell/CMakeLists.txt +@@ -60,6 +60,11 @@ add_dependencies(evolution-shell + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-shell PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-shell PRIVATE + -DG_LOG_DOMAIN=\"evolution-shell\" + -DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\" +--- a/src/smime/gui/CMakeLists.txt ++++ b/src/smime/gui/CMakeLists.txt +@@ -25,6 +25,11 @@ add_dependencies(evolution-smime + ${DEPENDENCIES} + ) + ++set_target_properties(evolution-smime PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(evolution-smime PRIVATE + -DG_LOG_DOMAIN=\"evolution-smime\" + ) +--- a/src/smime/lib/CMakeLists.txt ++++ b/src/smime/lib/CMakeLists.txt +@@ -21,6 +21,11 @@ add_dependencies(essmime + ${DEPENDENCIES} + ) + ++set_target_properties(essmime PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(essmime PRIVATE + -DG_LOG_DOMAIN=\"essmime\" + ) +--- a/src/web-extensions/CMakeLists.txt ++++ b/src/web-extensions/CMakeLists.txt +@@ -15,6 +15,11 @@ add_dependencies(edomutils + ${DEPENDENCIES} + ) + ++set_target_properties(edomutils PROPERTIES ++ VERSION 0.0.0 ++ SOVERSION 0 ++) ++ + target_compile_definitions(edomutils PRIVATE + -DG_LOG_DOMAIN=\"edomutils\" + -DEVOLUTION_IMAGESDIR=\"${imagesdir}\" diff --git a/debian/patches/series b/debian/patches/series index 7a6b03e6b1..3e4522b2c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ #02_nss_paths.patch +10_revert_libevolution_avoid-version.patch diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests index 9a6a8cf490..9b90355a2e 100644 --- a/debian/tests/installed-tests +++ b/debian/tests/installed-tests @@ -1,5 +1,5 @@ #!/bin/bash -# autopkgtest check: Run the installed-tests to verify gjs works correctly +# autopkgtest check: Run the installed-tests to verify evolution works correctly # (C) 2013-2015 Canonical Ltd. # Author: Iain Lane set -e