r3151 - in /experimental/evolution/debian: changelog control evolution-common.install evolution-plugin-bogofilter.install evolution-plugin-pstimport.install evolution-plugin-spamassassin.install evolution-plugins.install rules

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Wed May 3 12:14:36 UTC 2017 

Author: jbicha-guest
Date: Wed May  3 12:14:34 2017
New Revision: 3151

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3151
Log:
Split bogofilter, pstimport, and spamassassin support into separate pkgs

Added:
    experimental/evolution/debian/evolution-plugin-bogofilter.install
    experimental/evolution/debian/evolution-plugin-pstimport.install
    experimental/evolution/debian/evolution-plugin-spamassassin.install
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-common.install
    experimental/evolution/debian/evolution-plugins.install
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=3151&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Wed May  3 12:14:34 2017
@@ -4,6 +4,9 @@
     - 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

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=3151&op=diff
==============================================================================
--- experimental/evolution/debian/control	(original)
+++ experimental/evolution/debian/control	Wed May  3 12:14:34 2017
@@ -75,8 +75,9 @@
          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 @@
   - mail-notification
   - mail-to-task
   - prefer-plain
-  - pst-import
   - save-calendar
   - templates
 
@@ -199,6 +199,54 @@
   - 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 @@
  .
  This package contains test programs, designed to be run as part of a
  regression testsuite.
-

Modified: experimental/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-common.install?rev=3151&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-common.install	(original)
+++ experimental/evolution/debian/evolution-common.install	Wed May  3 12:14:34 2017
@@ -4,4 +4,3 @@
 usr/share/locale
 usr/share/glib-2.0
 usr/share/help
-usr/share/appdata/*.metainfo.xml

Added: experimental/evolution/debian/evolution-plugin-bogofilter.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugin-bogofilter.install?rev=3151&op=file
==============================================================================
--- experimental/evolution/debian/evolution-plugin-bogofilter.install	(added)
+++ experimental/evolution/debian/evolution-plugin-bogofilter.install	Wed May  3 12:14:34 2017
@@ -0,0 +1,2 @@
+usr/lib/evolution/modules/module-bogofilter.so
+usr/share/appdata/evolution-bogofilter.metainfo.xml

Added: experimental/evolution/debian/evolution-plugin-pstimport.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugin-pstimport.install?rev=3151&op=file
==============================================================================
--- experimental/evolution/debian/evolution-plugin-pstimport.install	(added)
+++ experimental/evolution/debian/evolution-plugin-pstimport.install	Wed May  3 12:14:34 2017
@@ -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

Added: experimental/evolution/debian/evolution-plugin-spamassassin.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugin-spamassassin.install?rev=3151&op=file
==============================================================================
--- experimental/evolution/debian/evolution-plugin-spamassassin.install	(added)
+++ experimental/evolution/debian/evolution-plugin-spamassassin.install	Wed May  3 12:14:34 2017
@@ -0,0 +1,2 @@
+usr/lib/evolution/modules/module-spamassassin.so
+usr/share/appdata/evolution-spamassassin.metainfo.xml

Modified: experimental/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins.install?rev=3151&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins.install	(original)
+++ experimental/evolution/debian/evolution-plugins.install	Wed May  3 12:14:34 2017
@@ -16,8 +16,6 @@
 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

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=3151&op=diff
==============================================================================
--- experimental/evolution/debian/rules	(original)
+++ experimental/evolution/debian/rules	Wed May  3 12:14:34 2017
@@ -36,6 +36,8 @@
 
 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

More information about the pkg-evolution-commits mailing list