callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New upstream release

Browse Source
This commit is contained in:
Sebastien Bacher
2021-01-25 17:12:11 +01:00
parent cada366c2f
commit bb23b6daca
2 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
evolution (3.38.3-1) UNRELEASED; urgency=medium
* New upstream release
-- Sebastien Bacher <seb128@ubuntu.com> Mon, 25 Jan 2021 17:12:11 +0100
evolution (3.38.2-1) unstable; urgency=medium evolution (3.38.2-1) unstable; urgency=medium
* New upstream release * New upstream release

112
debian/patches/10_revert_libevolution_avoid-version.patch vendored
View File

@ -32,10 +32,10 @@ Forwarded: no
src/web-extensions/CMakeLists.txt | 5 +++++ src/web-extensions/CMakeLists.txt | 5 +++++
19 files changed, 93 insertions(+) 19 files changed, 93 insertions(+)
Index: evolution-3.35.91/src/addressbook/gui/contact-editor/CMakeLists.txt Index: evolution/src/addressbook/gui/contact-editor/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/contact-editor/CMakeLists.txt --- evolution.orig/src/addressbook/gui/contact-editor/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/contact-editor/CMakeLists.txt +++ evolution/src/addressbook/gui/contact-editor/CMakeLists.txt
@@ -30,6 +30,11 @@ add_dependencies(econtacteditor @@ -30,6 +30,11 @@ add_dependencies(econtacteditor
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -48,10 +48,10 @@ Index: evolution-3.35.91/src/addressbook/gui/contact-editor/CMakeLists.txt
target_compile_definitions(econtacteditor PRIVATE target_compile_definitions(econtacteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-editor\" -DG_LOG_DOMAIN=\"e-contact-editor\"
) )
Index: evolution-3.35.91/src/addressbook/gui/contact-list-editor/CMakeLists.txt Index: evolution/src/addressbook/gui/contact-list-editor/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/contact-list-editor/CMakeLists.txt --- evolution.orig/src/addressbook/gui/contact-list-editor/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/contact-list-editor/CMakeLists.txt +++ evolution/src/addressbook/gui/contact-list-editor/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(econtactlisteditor @@ -25,6 +25,11 @@ add_dependencies(econtactlisteditor
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -64,10 +64,10 @@ Index: evolution-3.35.91/src/addressbook/gui/contact-list-editor/CMakeLists.txt
target_compile_definitions(econtactlisteditor PRIVATE target_compile_definitions(econtactlisteditor PRIVATE
-DG_LOG_DOMAIN=\"e-contact-list-editor\" -DG_LOG_DOMAIN=\"e-contact-list-editor\"
) )
Index: evolution-3.35.91/src/addressbook/gui/widgets/CMakeLists.txt Index: evolution/src/addressbook/gui/widgets/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/gui/widgets/CMakeLists.txt --- evolution.orig/src/addressbook/gui/widgets/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/gui/widgets/CMakeLists.txt +++ evolution/src/addressbook/gui/widgets/CMakeLists.txt
@@ -74,6 +74,12 @@ add_dependencies(eabwidgets @@ -74,6 +74,12 @@ add_dependencies(eabwidgets
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -81,10 +81,10 @@ Index: evolution-3.35.91/src/addressbook/gui/widgets/CMakeLists.txt
target_compile_definitions(eabwidgets PRIVATE target_compile_definitions(eabwidgets PRIVATE
-DG_LOG_DOMAIN=\"eabwidgets\" -DG_LOG_DOMAIN=\"eabwidgets\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\" -DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
Index: evolution-3.35.91/src/addressbook/importers/CMakeLists.txt Index: evolution/src/addressbook/importers/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/importers/CMakeLists.txt --- evolution.orig/src/addressbook/importers/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/importers/CMakeLists.txt +++ evolution/src/addressbook/importers/CMakeLists.txt
@@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-i @@ -19,6 +19,11 @@ add_dependencies(evolution-addressbook-i
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -97,10 +97,10 @@ Index: evolution-3.35.91/src/addressbook/importers/CMakeLists.txt
target_compile_definitions(evolution-addressbook-importers PRIVATE target_compile_definitions(evolution-addressbook-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-addressbook-importers\" -DG_LOG_DOMAIN=\"evolution-addressbook-importers\"
) )
Index: evolution-3.35.91/src/addressbook/printing/CMakeLists.txt Index: evolution/src/addressbook/printing/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/printing/CMakeLists.txt --- evolution.orig/src/addressbook/printing/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/printing/CMakeLists.txt +++ evolution/src/addressbook/printing/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(econtactprint @@ -25,6 +25,11 @@ add_dependencies(econtactprint
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -113,10 +113,10 @@ Index: evolution-3.35.91/src/addressbook/printing/CMakeLists.txt
target_compile_definitions(econtactprint PRIVATE target_compile_definitions(econtactprint PRIVATE
-DG_LOG_DOMAIN=\"addressbook-printing\" -DG_LOG_DOMAIN=\"addressbook-printing\"
-DEVOLUTION_ECPSDIR=\"${ecpsdir}\" -DEVOLUTION_ECPSDIR=\"${ecpsdir}\"
Index: evolution-3.35.91/src/addressbook/util/CMakeLists.txt Index: evolution/src/addressbook/util/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/addressbook/util/CMakeLists.txt --- evolution.orig/src/addressbook/util/CMakeLists.txt
+++ evolution-3.35.91/src/addressbook/util/CMakeLists.txt +++ evolution/src/addressbook/util/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(eabutil @@ -16,6 +16,11 @@ add_dependencies(eabutil
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -129,11 +129,11 @@ Index: evolution-3.35.91/src/addressbook/util/CMakeLists.txt
target_compile_definitions(eabutil PRIVATE target_compile_definitions(eabutil PRIVATE
-DG_LOG_DOMAIN=\"eabutil\" -DG_LOG_DOMAIN=\"eabutil\"
) )
Index: evolution-3.35.91/src/calendar/gui/CMakeLists.txt Index: evolution/src/calendar/gui/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/calendar/gui/CMakeLists.txt --- evolution.orig/src/calendar/gui/CMakeLists.txt
+++ evolution-3.35.91/src/calendar/gui/CMakeLists.txt +++ evolution/src/calendar/gui/CMakeLists.txt
@@ -182,6 +182,11 @@ add_dependencies(evolution-calendar @@ -183,6 +183,11 @@ add_dependencies(evolution-calendar
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -145,10 +145,10 @@ Index: evolution-3.35.91/src/calendar/gui/CMakeLists.txt
target_compile_definitions(evolution-calendar PRIVATE target_compile_definitions(evolution-calendar PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar\" -DG_LOG_DOMAIN=\"evolution-calendar\"
-DEVOLUTION_ETSPECDIR=\"${etspecdir}\" -DEVOLUTION_ETSPECDIR=\"${etspecdir}\"
Index: evolution-3.35.91/src/calendar/importers/CMakeLists.txt Index: evolution/src/calendar/importers/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/calendar/importers/CMakeLists.txt --- evolution.orig/src/calendar/importers/CMakeLists.txt
+++ evolution-3.35.91/src/calendar/importers/CMakeLists.txt +++ evolution/src/calendar/importers/CMakeLists.txt
@@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-impo @@ -16,6 +16,11 @@ add_dependencies(evolution-calendar-impo
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -161,10 +161,10 @@ Index: evolution-3.35.91/src/calendar/importers/CMakeLists.txt
target_compile_definitions(evolution-calendar-importers PRIVATE target_compile_definitions(evolution-calendar-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-calendar-importers\" -DG_LOG_DOMAIN=\"evolution-calendar-importers\"
-DEVOLUTION_SOUNDDIR=\"${soundsdir}\" -DEVOLUTION_SOUNDDIR=\"${soundsdir}\"
Index: evolution-3.35.91/src/composer/CMakeLists.txt Index: evolution/src/composer/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/composer/CMakeLists.txt --- evolution.orig/src/composer/CMakeLists.txt
+++ evolution-3.35.91/src/composer/CMakeLists.txt +++ evolution/src/composer/CMakeLists.txt
@@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer @@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -177,11 +177,11 @@ Index: evolution-3.35.91/src/composer/CMakeLists.txt
target_compile_definitions(evolution-mail-composer PRIVATE target_compile_definitions(evolution-mail-composer PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-composer\" -DG_LOG_DOMAIN=\"evolution-mail-composer\"
-DEVOLUTION_UIDIR=\"${uidir}\" -DEVOLUTION_UIDIR=\"${uidir}\"
Index: evolution-3.35.91/src/e-util/CMakeLists.txt Index: evolution/src/e-util/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/e-util/CMakeLists.txt --- evolution.orig/src/e-util/CMakeLists.txt
+++ evolution-3.35.91/src/e-util/CMakeLists.txt +++ evolution/src/e-util/CMakeLists.txt
@@ -595,6 +595,11 @@ add_dependencies(evolution-util @@ -591,6 +591,11 @@ add_dependencies(evolution-util
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -193,10 +193,10 @@ Index: evolution-3.35.91/src/e-util/CMakeLists.txt
target_compile_definitions(evolution-util PRIVATE target_compile_definitions(evolution-util PRIVATE
-DG_LOG_DOMAIN=\"evolution-util\" -DG_LOG_DOMAIN=\"evolution-util\"
-DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\" -DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\"
Index: evolution-3.35.91/src/em-format/CMakeLists.txt Index: evolution/src/em-format/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/em-format/CMakeLists.txt --- evolution.orig/src/em-format/CMakeLists.txt
+++ evolution-3.35.91/src/em-format/CMakeLists.txt +++ evolution/src/em-format/CMakeLists.txt
@@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatte @@ -110,6 +110,11 @@ add_dependencies(evolution-mail-formatte
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -209,10 +209,10 @@ Index: evolution-3.35.91/src/em-format/CMakeLists.txt
target_compile_definitions(evolution-mail-formatter PRIVATE target_compile_definitions(evolution-mail-formatter PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-formatter\" -DG_LOG_DOMAIN=\"evolution-mail-formatter\"
-DEVOLUTION_IMAGESDIR=\"${imagesdir}\" -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
Index: evolution-3.35.91/src/libemail-engine/CMakeLists.txt Index: evolution/src/libemail-engine/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/libemail-engine/CMakeLists.txt --- evolution.orig/src/libemail-engine/CMakeLists.txt
+++ evolution-3.35.91/src/libemail-engine/CMakeLists.txt +++ evolution/src/libemail-engine/CMakeLists.txt
@@ -56,6 +56,11 @@ add_dependencies(email-engine @@ -56,6 +56,11 @@ add_dependencies(email-engine
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -225,10 +225,10 @@ Index: evolution-3.35.91/src/libemail-engine/CMakeLists.txt
target_compile_definitions(email-engine PRIVATE target_compile_definitions(email-engine PRIVATE
-DG_LOG_DOMAIN=\"e-mail-engine\" -DG_LOG_DOMAIN=\"e-mail-engine\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution-3.35.91/src/libgnomecanvas/CMakeLists.txt Index: evolution/src/libgnomecanvas/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/libgnomecanvas/CMakeLists.txt --- evolution.orig/src/libgnomecanvas/CMakeLists.txt
+++ evolution-3.35.91/src/libgnomecanvas/CMakeLists.txt +++ evolution/src/libgnomecanvas/CMakeLists.txt
@@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLI @@ -50,6 +50,8 @@ target_compile_options(gnomecanvas PUBLI
) )
@ -238,10 +238,10 @@ Index: evolution-3.35.91/src/libgnomecanvas/CMakeLists.txt
INSTALL_RPATH "" INSTALL_RPATH ""
) )
Index: evolution-3.35.91/src/mail/CMakeLists.txt Index: evolution/src/mail/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/mail/CMakeLists.txt --- evolution.orig/src/mail/CMakeLists.txt
+++ evolution-3.35.91/src/mail/CMakeLists.txt +++ evolution/src/mail/CMakeLists.txt
@@ -221,6 +221,11 @@ add_dependencies(evolution-mail @@ -221,6 +221,11 @@ add_dependencies(evolution-mail
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -254,10 +254,10 @@ Index: evolution-3.35.91/src/mail/CMakeLists.txt
target_compile_definitions(evolution-mail PRIVATE target_compile_definitions(evolution-mail PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail\" -DG_LOG_DOMAIN=\"evolution-mail\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution-3.35.91/src/mail/importers/CMakeLists.txt Index: evolution/src/mail/importers/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/mail/importers/CMakeLists.txt --- evolution.orig/src/mail/importers/CMakeLists.txt
+++ evolution-3.35.91/src/mail/importers/CMakeLists.txt +++ evolution/src/mail/importers/CMakeLists.txt
@@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importer @@ -24,6 +24,11 @@ add_dependencies(evolution-mail-importer
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -270,10 +270,10 @@ Index: evolution-3.35.91/src/mail/importers/CMakeLists.txt
target_compile_definitions(evolution-mail-importers PRIVATE target_compile_definitions(evolution-mail-importers PRIVATE
-DG_LOG_DOMAIN=\"evolution-mail-importers\" -DG_LOG_DOMAIN=\"evolution-mail-importers\"
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
Index: evolution-3.35.91/src/shell/CMakeLists.txt Index: evolution/src/shell/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/shell/CMakeLists.txt --- evolution.orig/src/shell/CMakeLists.txt
+++ evolution-3.35.91/src/shell/CMakeLists.txt +++ evolution/src/shell/CMakeLists.txt
@@ -60,6 +60,11 @@ add_dependencies(evolution-shell @@ -60,6 +60,11 @@ add_dependencies(evolution-shell
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -286,10 +286,10 @@ Index: evolution-3.35.91/src/shell/CMakeLists.txt
target_compile_definitions(evolution-shell PRIVATE target_compile_definitions(evolution-shell PRIVATE
-DG_LOG_DOMAIN=\"evolution-shell\" -DG_LOG_DOMAIN=\"evolution-shell\"
-DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\" -DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
Index: evolution-3.35.91/src/smime/gui/CMakeLists.txt Index: evolution/src/smime/gui/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/smime/gui/CMakeLists.txt --- evolution.orig/src/smime/gui/CMakeLists.txt
+++ evolution-3.35.91/src/smime/gui/CMakeLists.txt +++ evolution/src/smime/gui/CMakeLists.txt
@@ -25,6 +25,11 @@ add_dependencies(evolution-smime @@ -25,6 +25,11 @@ add_dependencies(evolution-smime
${DEPENDENCIES} ${DEPENDENCIES}
) )
@ -302,10 +302,10 @@ Index: evolution-3.35.91/src/smime/gui/CMakeLists.txt
target_compile_definitions(evolution-smime PRIVATE target_compile_definitions(evolution-smime PRIVATE
-DG_LOG_DOMAIN=\"evolution-smime\" -DG_LOG_DOMAIN=\"evolution-smime\"
) )
Index: evolution-3.35.91/src/smime/lib/CMakeLists.txt Index: evolution/src/smime/lib/CMakeLists.txt
=================================================================== ===================================================================
--- evolution-3.35.91.orig/src/smime/lib/CMakeLists.txt --- evolution.orig/src/smime/lib/CMakeLists.txt
+++ evolution-3.35.91/src/smime/lib/CMakeLists.txt +++ evolution/src/smime/lib/CMakeLists.txt
@@ -21,6 +21,11 @@ add_dependencies(essmime @@ -21,6 +21,11 @@ add_dependencies(essmime
${DEPENDENCIES} ${DEPENDENCIES}
) )