From 74ebfdd9875214e545cfea562eecdcfa2ad0451c Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Wed, 3 May 2017 12:14:34 +0000 Subject: [PATCH] Split bogofilter, pstimport, and spamassassin support into separate pkgs git-svn-id: file:///svn/pkg-evolution/experimental/evolution@3151 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++ debian/control | 55 ++++++++++++++++++-- debian/evolution-common.install | 1 - debian/evolution-plugin-bogofilter.install | 2 + debian/evolution-plugin-pstimport.install | 3 ++ debian/evolution-plugin-spamassassin.install | 2 + debian/evolution-plugins.install | 2 - debian/rules | 2 + 8 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 debian/evolution-plugin-bogofilter.install create mode 100644 debian/evolution-plugin-pstimport.install create mode 100644 debian/evolution-plugin-spamassassin.install diff --git a/debian/changelog b/debian/changelog index d08cd51bee..743d0bcb98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ evolution (3.24.1-1) UNRELEASED; urgency=medium - Switch from autotools to cmake * Bump e-d-s dependencies and build-dependencies to 3.24.1 * Add evolution-tests package for installed tests + * 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 diff --git a/debian/control b/debian/control index 3abd6541a7..742312f559 100644 --- a/debian/control +++ b/debian/control @@ -75,8 +75,9 @@ Depends: ${shlibs:Depends}, dbus, psmisc Recommends: evolution-plugins, - yelp, - bogofilter | spamassassin + evolution-plugin-bogofilter | evolution-plugin-spamassassin, + evolution-plugin-pstimport, + yelp Suggests: evolution-ews, evolution-plugins-experimental, gnupg, @@ -177,7 +178,6 @@ Description: standard plugins for Evolution - mail-notification - mail-to-task - prefer-plain - - pst-import - save-calendar - templates @@ -199,6 +199,54 @@ Description: experimental plugins for Evolution - external-editor - contacts-map +Package: evolution-plugin-bogofilter +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution (= ${binary:Version}), + bogofilter +Breaks: evolution-common (<< 3.24.1-1~), + libevolution (<< 3.24.1-1~) +Replaces: evolution-common (<< 3.24.1-1~), + libevolution (<< 3.24.1-1~) +Description: standard plugins for Evolution (bogofilter) + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes the bogofilter spam filter module for Evolution. + +Package: evolution-plugin-pstimport +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution (= ${binary:Version}), +Breaks: evolution-common (<< 3.24.1-1~), + evolution-plugins (<< 3.24.1-1~) +Replaces: evolution-common (<< 3.24.1-1~), + libevolution (<< 3.24.1-1~) +Description: standard plugins for Evolution (pstimport) + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes a plugin for Evolution that enables importing + Microsoft Outlook messages from a PST file. + +Package: evolution-plugin-spamassassin +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution (= ${binary:Version}), + spamassassin, +Breaks: evolution-common (<< 3.24.1-1~), + libevolution (<< 3.24.1-1~) +Replaces: evolution-common (<< 3.24.1-1~), + libevolution (<< 3.24.1-1~) +Description: standard plugins for Evolution (spamassassin) + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes the spamassasin spam filter module for Evolution. + Package: evolution-tests Architecture: any Depends: ${shlibs:Depends}, @@ -209,4 +257,3 @@ Description: Installed tests for Evolution . This package contains test programs, designed to be run as part of a regression testsuite. - diff --git a/debian/evolution-common.install b/debian/evolution-common.install index a0988f97f0..0f2e885f47 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -4,4 +4,3 @@ usr/share/icons/hicolor usr/share/locale usr/share/glib-2.0 usr/share/help -usr/share/appdata/*.metainfo.xml diff --git a/debian/evolution-plugin-bogofilter.install b/debian/evolution-plugin-bogofilter.install new file mode 100644 index 0000000000..e2dbacc8a6 --- /dev/null +++ b/debian/evolution-plugin-bogofilter.install @@ -0,0 +1,2 @@ +usr/lib/evolution/modules/module-bogofilter.so +usr/share/appdata/evolution-bogofilter.metainfo.xml diff --git a/debian/evolution-plugin-pstimport.install b/debian/evolution-plugin-pstimport.install new file mode 100644 index 0000000000..9f4b9b2e2a --- /dev/null +++ b/debian/evolution-plugin-pstimport.install @@ -0,0 +1,3 @@ +usr/lib/evolution/plugins/liborg-gnome-pst-import.so +usr/lib/evolution/plugins/org-gnome-pst-import.eplug +usr/share/appdata/evolution-pst.metainfo.xml diff --git a/debian/evolution-plugin-spamassassin.install b/debian/evolution-plugin-spamassassin.install new file mode 100644 index 0000000000..0b4415841c --- /dev/null +++ b/debian/evolution-plugin-spamassassin.install @@ -0,0 +1,2 @@ +usr/lib/evolution/modules/module-spamassassin.so +usr/share/appdata/evolution-spamassassin.metainfo.xml diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index 89baf041ee..48c7293546 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -16,8 +16,6 @@ usr/lib/evolution/plugins/*-templates.so usr/lib/evolution/plugins/*-templates.eplug usr/lib/evolution/plugins/*-dbx-import.so usr/lib/evolution/plugins/*-dbx-import.eplug -usr/lib/evolution/plugins/*-pst-import.so -usr/lib/evolution/plugins/*-pst-import.eplug usr/lib/evolution/plugins/*-bbdb.so usr/lib/evolution/plugins/*-bbdb.eplug usr/lib/evolution/plugins/*-attachment-reminder.so diff --git a/debian/rules b/debian/rules index 063fa12b20..ac89b9f790 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,8 @@ override_dh_auto_configure: override_dh_install: dh_install --fail-missing -X.la -Xlibevolutiontestsettings.so + find debian/libevolution/ -name 'module-bogofilter.so' -delete + find debian/libevolution/ -name 'module-spamassassin.so' -delete override_dh_makeshlibs: dh_makeshlibs -V'libevolution (>= $(DEB_VERSION_UPSTREAM)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' -n