r902 - in /unstable/evolution/debian: changelog control evolution.install patches/70_no-mail-remote-plugin.patch rules
heikkih-guest at users.alioth.debian.org
heikkih-guest at users.alioth.debian.org
Tue Nov 13 15:11:11 UTC 2007
Author: heikkih-guest
Date: Tue Nov 13 15:11:10 2007
New Revision: 902
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=902
Log:
* New upstream release
* Swap bogofilter and spamassassin recommmends, since bogofilter is quite
lightweight (closes: #435635)
* Versioned build-dependency on eds-dev and dependency on eds (closes:
#445375)
* Update patch: 70_no-mail-remote-plugin.patch
* Upstream fix for glade-dir (closes: #450524)
* [debian/rules] Update ELIBDIR
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/evolution.install
unstable/evolution/debian/patches/70_no-mail-remote-plugin.patch
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=902&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Nov 13 15:11:10 2007
@@ -1,3 +1,16 @@
+evolution (2.12.1-0) unstable; urgency=low
+
+ * New upstream release
+ * Swap bogofilter and spamassassin recommmends, since bogofilter is quite
+ lightweight (closes: #435635)
+ * Versioned build-dependency on eds-dev and dependency on eds (closes:
+ #445375)
+ * Update patch: 70_no-mail-remote-plugin.patch
+ * Upstream fix for glade-dir (closes: #450524)
+ * [debian/rules] Update ELIBDIR
+
+ -- Heikki Henriksen <heikkih at gmail.com> Tue, 13 Nov 2007 16:05:33 +0100
+
evolution (2.12.0-2) unstable; urgency=low
* Conflicts with evolution-exchange (<< 2.11.90) (closes: #444012, #444018)
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=902&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Tue Nov 13 15:11:10 2007
@@ -28,7 +28,8 @@
libglib2.0-dev,
liborbit2-dev (>= 1:2.9.8),
libbonobo2-dev,
- evolution-data-server-dev,
+ evolution-data-server-dev (>= 1.11.92),
+ evolution-data-server-dev (<< 1.13.0)),
libgtk2.0-dev (>= 2.10.0),
libbonoboui2-dev (>= 2.4.2),
libgnomevfs2-dev (>= 2.4),
@@ -62,7 +63,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 1.9.4),
+ evolution-data-server (>= 1.11.92),
+ evolution-data-server (<< 1.13.0),
gtkhtml3.14 (>= 3.14.0),
gnome-icon-theme (>= 1.2.0),
dbus
@@ -70,7 +72,7 @@
gnome-desktop-data,
evolution-plugins,
yelp,
- spamassassin | bogofilter
+ bogofilter | spamassassin
Suggests: bug-buddy,
gnupg,
gnome-spell (>= 1.0.4),
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=902&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Tue Nov 13 15:11:10 2007
@@ -10,7 +10,7 @@
debian/tmp/usr/lib/evolution/2.12/evolution-backup
debian/tmp/usr/bin
debian/tmp/usr/lib/bonobo
-debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.so
debian/evolution-mail.desktop usr/share/applications/
debian/evolution.xpm usr/share/pixmaps/
debian/lintian/evolution usr/share/lintian/overrides/
Modified: unstable/evolution/debian/patches/70_no-mail-remote-plugin.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/70_no-mail-remote-plugin.patch?rev=902&op=diff
==============================================================================
--- unstable/evolution/debian/patches/70_no-mail-remote-plugin.patch (original)
+++ unstable/evolution/debian/patches/70_no-mail-remote-plugin.patch Tue Nov 13 15:11:10 2007
@@ -1,24 +1,49 @@
-diff -Nur evolution-2.11.5/configure evolution-2.11.5.new/configure
---- evolution-2.11.5/configure 2007-07-10 14:25:51.000000000 +0100
-+++ evolution-2.11.5.new/configure 2007-07-10 14:28:13.000000000 +0100
-@@ -35410,7 +35410,7 @@
+diff -ru evolution-2.12.1.orig/configure evolution-2.12.1/configure
+--- evolution-2.12.1.orig/configure 2007-11-13 15:12:10.000000000 +0100
++++ evolution-2.12.1/configure 2007-11-13 15:13:08.000000000 +0100
+@@ -38032,7 +38032,7 @@
plugins_standard="$plugins_standard_always"
all_plugins_standard="$plugins_standard"
--plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote save-attachments"
-+plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments"
+-plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments"
++plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments"
plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
- all_plugins_experimental="$plugins_experimental_always ipod-sync $TNEF_ATTACHMENTS"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
-diff -Nur evolution-2.11.5/configure.in evolution-2.11.5.new/configure.in
---- evolution-2.11.5/configure.in 2007-07-10 14:25:50.000000000 +0100
-+++ evolution-2.11.5.new/configure.in 2007-07-10 14:27:52.000000000 +0100
-@@ -1559,7 +1559,7 @@
+@@ -38795,7 +38795,7 @@
+ EVOLUTION_DIR=`(cd $srcdir; pwd)`
+
+
+-ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mail-remote/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc"
++ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -39680,7 +39680,6 @@
+ "plugins/mail-notification/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-notification/Makefile" ;;
+ "plugins/mail-to-meeting/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-meeting/Makefile" ;;
+ "plugins/mail-to-task/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-task/Makefile" ;;
+- "plugins/mail-remote/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-remote/Makefile" ;;
+ "plugins/mono/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mono/Makefile" ;;
+ "plugins/new-mail-notify/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/new-mail-notify/Makefile" ;;
+ "plugins/subject-thread/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/subject-thread/Makefile" ;;
+diff -ru evolution-2.12.1.orig/configure.in evolution-2.12.1/configure.in
+--- evolution-2.12.1.orig/configure.in 2007-11-13 15:12:16.000000000 +0100
++++ evolution-2.12.1/configure.in 2007-11-13 15:13:18.000000000 +0100
+@@ -1700,7 +1700,7 @@
plugins_standard="$plugins_standard_always"
all_plugins_standard="$plugins_standard"
--plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote save-attachments"
-+plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments"
+-plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments"
++plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments"
plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
- all_plugins_experimental="$plugins_experimental_always ipod-sync $TNEF_ATTACHMENTS"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
+@@ -2009,7 +2009,6 @@
+ plugins/mail-notification/Makefile
+ plugins/mail-to-meeting/Makefile
+ plugins/mail-to-task/Makefile
+-plugins/mail-remote/Makefile
+ plugins/mono/Makefile
+ plugins/new-mail-notify/Makefile
+ plugins/subject-thread/Makefile
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=902&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Tue Nov 13 15:11:10 2007
@@ -14,7 +14,7 @@
DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts
DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts
-ELIBDIR := usr/lib/evolution/2.10
+ELIBDIR := usr/lib/evolution/2.12
CFLAGS += -fPIC
More information about the pkg-evolution-commits
mailing list