diff -u evolution-2.26.0/debian/changelog evolution-2.26.0/debian/changelog --- evolution-2.26.0/debian/changelog +++ evolution-2.26.0/debian/changelog @@ -1,3 +1,13 @@ +evolution (2.26.0-0ubuntu3) jaunty; urgency=low + + * enable pst-import plugin (importer for Outlook 2003/2007 mail files) + - debian/control: update build-depends for libpst-dev (<< 0.6.28) + - debian/control: update depends for the plugins package libpst (<< 0.6.28) + - debian/patches/65_pst-import-correct-include.patch: correct #include for libpst + - debian/evolution-plugins.install: add pst=import + + -- C de-Avillez Fri, 20 Mar 2009 19:59:13 -0500 + evolution (2.26.0-0ubuntu2) jaunty; urgency=low * Reapply revision which was not in the recent update diff -u evolution-2.26.0/debian/control evolution-2.26.0/debian/control --- evolution-2.26.0/debian/control +++ evolution-2.26.0/debian/control @@ -29,6 +29,7 @@ libatk1.0-dev, libldap2-dev, libgtkhtml3.14-dev (>= 3.25.4), + libpst-dev (<< 0.6.28), libgtkhtml-editor-dev, libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, @@ -179,7 +180,8 @@ Package: evolution-plugins Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libpst1 (<< 0.6.28) Recommends: notification-daemon Description: standard plugins for Evolution Evolution is a groupware suite which integrates mail, calendar, @@ -207,6 +209,7 @@ - attachment-reminder - face - backup-restore + - pst-import Package: evolution-plugins-experimental Architecture: any diff -u evolution-2.26.0/debian/evolution-plugins.install evolution-2.26.0/debian/evolution-plugins.install --- evolution-2.26.0/debian/evolution-plugins.install +++ evolution-2.26.0/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.26/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,template,select-one-source,copy-tool,face,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.26/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,template,select-one-source,copy-tool,face,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore,pst-import}*.{so,eplug,xml,glade} debian/lintian/evolution-plugins usr/share/lintian/overrides/ only in patch2: unchanged: --- evolution-2.26.0.orig/debian/patches/65_pst-import-correct-include.patch +++ evolution-2.26.0/debian/patches/65_pst-import-correct-include.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.26.0/plugins/pst-import/pst-importer.c evolution-2.26.0.new/plugins/pst-import/pst-importer.c +--- evolution-2.26.0/plugins/pst-import/pst-importer.c 2009-01-30 04:49:57.000000000 -0600 ++++ evolution-2.26.0.new/plugins/pst-import/pst-importer.c 2009-03-20 19:44:59.000000000 -0500 +@@ -66,7 +66,7 @@ + #include + #include + +-#include ++#include + #include + #include +