r862 - in /etch/evolution/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Thu Jul 19 17:41:03 UTC 2007
Author: lool
Date: Thu Jul 19 17:41:03 2007
New Revision: 862
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=862
Log:
* Resync with 2.6.3-6etch1 from the archive.
Added:
etch/evolution/debian/README.Debian
etch/evolution/debian/csv2vcard.1
etch/evolution/debian/evolution-addressbook-export.1
etch/evolution/debian/evolution-common.install
etch/evolution/debian/evolution-mail.desktop
etch/evolution/debian/evolution-plugins-experimental.install
etch/evolution/debian/evolution.xpm
etch/evolution/debian/patches/07_default_shell_only_with_no_uris.patch
etch/evolution/debian/patches/10_e-cell-text-missing-include.patch
etch/evolution/debian/patches/10_pkg-config-rpath.patch
etch/evolution/debian/patches/17_fix_alarm_delay_for_calendar.patch
etch/evolution/debian/patches/20_xulrunner.patch
etch/evolution/debian/patches/30_ipod-sync_missing-files.patch
etch/evolution/debian/patches/40_gfdl-user-guide.patch
etch/evolution/debian/patches/50_libnssckbi-location.patch
etch/evolution/debian/patches/56_pt_br-translation-fixes.patch
etch/evolution/debian/patches/60_alarm-list-dialog-peek.patch
etch/evolution/debian/patches/60_new_addressbook_set_relative_url.patch
etch/evolution/debian/patches/61_itip-formatter-date-in-past.patch
etch/evolution/debian/patches/65_null-camel-exception.patch
etch/evolution/debian/patches/70_no-mail-remote-plugin.patch
etch/evolution/debian/patches/90_build_with_new_pisock.patch
etch/evolution/debian/patches/91_CVE-2007-1002.patch
etch/evolution/debian/watch
Modified:
etch/evolution/debian/changelog
etch/evolution/debian/compat
etch/evolution/debian/control
etch/evolution/debian/docs
etch/evolution/debian/evolution-dev.install
etch/evolution/debian/evolution-plugins.install
etch/evolution/debian/evolution.1
etch/evolution/debian/evolution.install
etch/evolution/debian/evolution.links
etch/evolution/debian/evolution.manpages
etch/evolution/debian/evolution.menu
etch/evolution/debian/patches/10_etasks-missing-include.patch
etch/evolution/debian/patches/55_fi-translation-fix.patch
etch/evolution/debian/rules
Added: etch/evolution/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/README.Debian?rev=862&op=file
==============================================================================
--- etch/evolution/debian/README.Debian (added)
+++ etch/evolution/debian/README.Debian Thu Jul 19 17:41:03 2007
@@ -1,0 +1,22 @@
+Evolution for Debian
+====================
+
+Mailbox corruption
+------------------
+
+Mailbox summary corruption is an issue that is known to appear in exceptional cases as reported in http://bugs.debian.org/295270 and http://bugs.debian.org/347703. A typical symptom is the error message: "Error while Refreshing folder: Summary and folder mismatch, even after a sync." No data is lost, but one or more summary files are corrupted.
+
+Before fixing the problem, backup your ~/.evolution folder just in case. Delete ~/.evolution/mail/local/MAILBOX.ev-summary where MAILBOX is your mailboxes. For example, the inbox summary file is Inbox.ev-summary. To rebuild the summaries, restart evolution and evolution-data-server.
+
+Common console error messages
+---------------------
+libnm_glib_nm_state_cb: dbus returned an error.
+ (org.freedesktop.DBus.Error.ServiceUnknown) The name org.freedesktop.NetworkManager was not provided by any .service files
+
+Evolution cannot contact network-manager, most likely because it is not installed. The error message only indicates that network-manager will not be used, and automatic offline mode is disabled.
+
+
+libnm_glib_nm_state_cb: dbus returned an error.
+ (org.freedesktop.DBus.Error.AccessDenied) A security policy in place prevents this sender from sending this message to this recipient, see message bus configuration file (rejected message had interface "org.freedesktop.NetworkManager" member "state" error name "(unset)" destination "org.freedesktop.NetworkManager")
+
+Access is denied to the network-manager service. The required permissions can be configured in /etc/dbus-1/system.d/NetworkManager.conf. A typical way to acquire permission is to add the current user to the 'netdev' group. As with missing network-manager, the default fallback if access is denied is to toggle offline operation manually.
Modified: etch/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/changelog?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/changelog (original)
+++ etch/evolution/debian/changelog Thu Jul 19 17:41:03 2007
@@ -1,3 +1,273 @@
+evolution (2.6.3-6etch1) stable-security; urgency=high
+
+ * Fix format string vulnerability in shared memo handling
+ [91_CVE-2007-1002.patch]
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Sat, 23 Jun 2007 18:36:02 +0000
+
+evolution (2.6.3-6) unstable; urgency=high
+
+ * 50_libnssckbi-location.patch: Adapt private library search path
+ to relocated xulruner libraries. (closes: #408548)
+
+ -- Oystein Gisnas <oystein at gisnas.net> Sun, 11 Mar 2007 09:22:14 +0100
+
+evolution (2.6.3-5) unstable; urgency=low
+
+ * 40_gfdl-user-guide.patch: Correct user guide copyright notice.
+ See http://bugzilla.gnome.org/395566. (closes: #406337)
+
+ -- Oystein Gisnas <oystein at gisnas.net> Mon, 5 Mar 2007 23:02:55 +0100
+
+evolution (2.6.3-4) unstable; urgency=low
+
+ * New patch, 56_pt_br-translation-fixes, fixes a typo in the translation of
+ "Default Sources" in pt_BR.po; thanks Marco Túlio Gontijo e Silva;
+ closes: #405424.
+
+ -- Loic Minier <lool at dooz.org> Tue, 23 Jan 2007 22:17:15 +0100
+
+evolution (2.6.3-3) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * Remove libusb-dev build-dev. [debian/control]
+ * Document mailbox summary corruption. [debian/README.Debian]
+ * Document common network-manager error messages.
+ [debian/README.Debian]
+ * Don't depend on HAL and NetworkManager on non-Linux archs.
+ Thanks to Petr Salinger. (closes: #401540) [debian/control]
+
+ -- Oystein Gisnas <oystein at gisnas.net> Mon, 4 Dec 2006 23:28:18 +0100
+
+evolution (2.6.3-2) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * Add missing include to avoid possible segfault.
+ Thanks to Dann Frazier <dannf at debian.org>. (closes: #384280)
+ [debian/patches/10_e-cell-text-missing-include.patch]
+
+ [ Heikki Henriksen ]
+ * Add patch to build with newer libpisock. Thanks to Ricardo Setti.
+ (closes: #341172) [debian/patches/90_build_with_new_pisock.patch]
+ * Add temp build-dep on libusb-dev until libpisock-dev is fixed
+ [debian/control]
+
+ -- Heikki Henriksen <heikkih at gmail.com> Thu, 21 Sep 2006 14:23:02 +0200
+
+evolution (2.6.3-1) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * New upstream release
+ - does not ping when offline (closes: #360373)
+ * Reorder build-deps to match order in configure.in. [debian/control]
+ * Add build-deps for each e-d-s lib used. [debian/control]
+ * Patches applied upstream:
+ - debian/patches/18_fix_label_typo.patch
+ - debian/patches/20_correct_gettext_domain.patch
+ - debian/patches/31_no-audio-inline.patch: Obsolete
+ - debian/patches/70_build-experimental-plugins.patch: Obsolete
+ * Update patch debian/patches/70_no-mail-remote-plugin.patch
+
+ [ Heikki Henriksen ]
+ * Check build-deps (closes: #383174)
+ * Re-add build-dep on gtkhtml3.8 to fix ftbfs
+
+ -- Heikki Henriksen <heikkih at gmail.com> Tue, 15 Aug 2006 21:07:17 +0200
+
+evolution (2.6.2-4) unstable; urgency=high
+
+ * Add gnome-icon-theme build-dep. [debian/control] (Closes: #377161)
+
+ -- Oystein Gisnas <oystein at gisnas.net> Fri, 7 Jul 2006 08:40:16 +0200
+
+evolution (2.6.2-3) unstable; urgency=low
+
+ * debian/control: Add ${misc:Depends}
+ * debian/control: Remove conflict with older evolution
+ * debian/evolution-dev.install: Remove .la files again
+ * debian/patches/10_pkg-config-rpath.patch: Add explicit -rpath to
+ private libs pkg-config to fix .la-less builds against these libs
+ * Convert icon to XPM format for Debian menu
+ * debian/control: Clean up dependencies
+ * Move icon, menu and .desktop from evolution-common to evolution
+ * debian/control: Depend on = source:Version of -common package
+ for binNMU compatibility
+
+ -- Oystein Gisnas <oystein at gisnas.net> Thu, 6 Jul 2006 09:45:29 +0200
+
+evolution (2.6.2-2) unstable; urgency=low
+
+ * Make the package binNMU-safe:
+ - Build-depend on dpkg-dev >= 1.13.19. [debian/control]
+ - Use ${binary:Version} & ${source:Version} [debian/control]
+ - use UPSTREAM_VERSION [debian/rules]
+
+ -- Heikki Henriksen <heikkih at gmail.com> Mon, 12 Jun 2006 09:53:50 +0200
+
+evolution (2.6.2-1) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * debian/patches/61_itip-formatter-date-in-past.patch: (Closes:
+ #368920)
+ * Update manpages
+ * Move architecture independent files to package evolution-common
+ (Closes: #232890)
+ * Move experimental plugins to evolution-plugins-experimental
+ * debian/control: Update package descriptions
+ * debian/control: Correct Suggests: and Recommends: for plugins
+
+ [ Heikki Henriksen ]
+ * New upstream release
+ * Update patches:
+ - debian/patches/17_fix_alarm_delay_for_calendar.patch
+ - debian/patches/31_no-audio-inline.patch
+ - debian/patches/55_fi-translation-fix.patch
+ - debian/patches/70_build-experimental-plugins.patch
+ * Drop patches applied upstream:
+ - debian/patches/06_fix_inline_pgp_breaking_charset.patch
+ - debian/patches/11_window_settings_stored.patch
+ - debian/patches/12_fix_icon_metaphors_bug_339626.patch
+ - debian/patches/40_disposition-notification.patch
+ - debian/patches/60_exchange-operations-create-addressbook.patch
+ * plugin for ipod-sync works again:
+ - debian/patches/30_no-ipod-sync.patch: dropped
+ - debian/patches/30_ipod-sync_missing-files.patch: added
+ - debian/control: bring back build-deps on hal >= 0.5.4
+ - debian/evolution-plugins.install: add ipod-sync to experimental line
+ * debian/control: Change dep on Source-Version from = to >= to have it
+ binNMU-able
+ * debian/control: add dep on libhal-dev to evolution-dev
+ * debian/rules: Fix Version\: in dpkg-parsechangelog
+ * debian/rules: Don't overwrite DEB_SHLIBDEPS_INCLUDE &
+ DEB_DH_MAKESHLIBS_ARGS_?
+ * debian/evolution-dev.install: bring back *.la until we get broken
+ rpath in some libs fixed
+
+ -- Heikki Henriksen <heikkih at gmail.com> Sun, 11 Jun 2006 20:18:06 +0200
+
+evolution (2.6.1-3) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * debian/control: Move -dbg pkg to section gnome
+ * debian/control: Claim compliance with Debian Policy 3.7.2
+ * debian/patches/60_new_addressbook_set_relative_url.patch: (Closes: #361995)
+ * debian/evolution-dev.install: drop installation of *.la
+ * Add manpages csv2vcard.1 and evolution-addressbook-export.1
+ * debian/evolution.install: drop installation of
+ evolution-addressbook-clean (closes: #346088)
+ * debian/patches/65_null-camel-exception.patch: stop using NULL in
+ place of Camel exceptions
+ * debian/patches/70_build-experimental-plugins.patch: Build
+ experimental plugins. Thanks to Michel Dänzer. (Closes: #312288)
+ * debian/patches/evolution{,-plugins}.install: Move base plugins to
+ evolution package
+
+ [ Heikki Henriksen ]
+ * patches pulled from ubuntu:
+ - debian/patches/06_fix_inline_pgp_breaking_charset.patch
+ - debian/patches/11_window_settings_stored.patch: (closes: #363259)
+ - debian/patches/12_fix_icon_metaphors_bug_339626.patch
+ - debian/patches/17_fix_alarm_delay_for_calendar.patch
+ - debian/patches/18_fix_label_typo.patch
+ - debian/patches/20_correct_gettext_domain.patch
+
+ -- Oystein Gisnas <oystein at gisnas.net> Thu, 25 May 2006 08:09:47 +0200
+
+evolution (2.6.1-2) unstable; urgency=low
+
+ [ Oystein Gisnas ]
+ * debian/patches/60_exchange-operations-create-addressbook.patch:
+ Fix create addressbook breakage caused by exchange-operations plugin
+ * debian/control: Add dep dbus (closes: #365797)
+
+ [ Heikki Henriksen ]
+ * debian/control: add dep on libnm-glib-dev & libgtkhtml3.8-dev for
+ evolution-dev
+ * debian/evolution-plugins.install: not install *.la
+ * debian/patches/60_alarm-list-dialog-peek.patch: fix segfault on certain
+ cases/archs. Thanks to Dann Frazier (closes: #365923)
+
+ -- Oystein Gisnas <oystein at gisnas.net> Thu, 4 May 2006 12:25:51 +0200
+
+evolution (2.6.1-1) unstable; urgency=low
+
+ [ Heikki Henriksen ]
+ * Upload to unstable
+ * New upstream release (2.6.1)
+ * debian/control: add recommends notification-daemon to evolution-plugins
+ * debian/control: bump debhelper build-dep to >= 5.0.0
+ * debian/control: added recommends: yelp (closes: #277707)
+ * debian/control: removed old unecessary conflicts/replaces
+ * debian/control: add suggests on evolution-dbg
+ * evolution-wombat has been removed some time ago
+ (closes: #236852, #265568, #160049, #211656, #218075, #196426)
+ * debian/evolution-mail.desktop: pull from ubuntu (and add norwegian
+ translations :) ) (closes: #257322)
+ * debian/rules: clean up clean::
+ * debian/control: add build-dep libnm-glib-dev and suggest network-manager.
+ Provides NetworkManager-magic if available.
+ * Upstream fix for addressbook data-loss (uid vs relative_uri)
+ (closes: #361995)
+ * debian/watch: added
+ * debian/patches/40_disposition-notification.patch:
+ Fix crash on disposition-notification (upstream bug: 324327)
+ * debian/patches/31_no-audio-inline.patch & debian/control:
+ Remove build-dep on gstreamer0.8 and audio-inline-plugin until its' fixed
+ * Upstream fix for new-mail-plugin (closes: #341085)
+
+ [ Oystein Gisnas ]
+ * Upstream fixes for mbox import (closes: #292810)
+ * Upstream fixes for yelp user guide category and title++
+ (closes: #360860, #339500)
+ * Upstream support for contact groups (closes: #297236)
+ * Upstream LDAP fixes (closes: #187821, #190750, #251060, #139947)
+ * Remove obsolete README.SSL since SSL/TLS is builtin
+ * Upstream fix for creation of task from mail message (closes: #327406)
+ * debian/evolution.links: Fix link filename for evolution-2.6 manpage
+ * debian/rules: Add dh_shlibdeps flag to aviod unnecessary runs of ldconfig
+ * debian/evolution.menu: Remove obsolete tag in menu file (see #129131)
+
+ [ Jordi Mallach ]
+ * debian/rules:
+ - don't overwrite CFLAGS, or we get unusable -dbg packages
+ (thanks seb128).
+ - likewise for DEB_CONFIGURE_EXTRA_FLAGS.
+
+ -- Heikki Henriksen <heikkih at gmail.com> Fri, 28 Apr 2006 17:12:48 +0200
+
+evolution (2.6.0-2) experimental; urgency=medium
+
+ * Now updates count for drafts folder (closes: #284095)
+ * Build --without-krb4 (closes: #278242)
+ * Move spamassassin recommends to evolution-plugins (closes: #343987)
+ * Upstream fixes in ldif-import (closes: #357845)
+ * Bump debhelper compat to 5
+ * remove camel-providers from evolution.install:
+ moved to e-d-s once upon a time
+ * remove evolution-importers from evolution.install:
+ goes under *so
+
+ -- Heikki Henriksen <heikkih at gmail.com> Mon, 3 Apr 2006 20:02:52 +0200
+
+evolution (2.6.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Added -dbg package with Priority: extra
+ * debian/patches/50_de-translation-typo.patch:
+ Removed - string is no longer valid
+ * debian/patches/55_fi-translation-fix.patch:
+ Updated
+ * debian/patches/80_default_mailer_free-fix.patch:
+ Removed - fixed upstream
+ * Enable experimental plugins and update plugin-list
+ (closes: #349163, #312288)
+ * debian/patches/07_default_shell_only_with_no_uris.patch:
+ Added from ubuntu's packages
+ * debian/patches/30_no-ipod-sync.patch:
+ Don't build ipod-sync-plugin (at least not until it wants to build)
+
+ -- Heikki Henriksen <heikkih at gmail.com> Thu, 30 Mar 2006 17:56:35 +0200
+
evolution (2.4.2.1-2) unstable; urgency=medium
* Acknowledge NMU (closes: #358432)
Modified: etch/evolution/debian/compat
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/compat?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/compat (original)
+++ etch/evolution/debian/compat Thu Jul 19 17:41:03 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: etch/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/control?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/control (original)
+++ etch/evolution/debian/control Thu Jul 19 17:41:03 2007
@@ -2,73 +2,127 @@
Section: gnome
Priority: optional
Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers at lists.alioth.debian.org>
-Uploaders: Takuo KITAME <kitame at debian.org>, Jordi Mallach <jordi at debian.org>, Margarita Manterola <debian at marga.com.ar>, Loic Minier <lool at dooz.org>, Heikki Henriksen <heikkih at gmail.com>
-Build-Depends: bison, intltool (>= 0.28-2), debhelper (>= 4.1.46), gtkhtml3.8 (>= 3.8.1-1.1), libgtkhtml3.8-dev (>= 3.8.1-1.1), libldap2-dev (>= 2.0.23), libgnome2-dev (>= 2.8), libnss-dev (>= 2:1.7), scrollkeeper, psmisc, libsoup2.2-dev (>= 2.2.6), libpam0g-dev, gnome-common, autotools-dev (>= 20030717.1), libgnome-pilot2-dev, libgail-dev (>= 1.4.1), libcompfaceg1-dev, gnome-icon-theme (>= 1.2.0), cdbs, evolution-data-server-dev (>= 1.4.2.1-1.1), libgstreamer0.8-dev, libdbus-1-dev, libdbus-glib-1-dev, libkrb5-dev
-Standards-Version: 3.6.2
+Uploaders: Takuo KITAME <kitame at debian.org>, Jordi Mallach <jordi at debian.org>, Margarita Manterola <debian at marga.com.ar>, Loic Minier <lool at dooz.org>, Heikki Henriksen <heikkih at gmail.com>, Oystein Gisnas <oystein at gisnas.net>
+Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.37), dpkg-dev (>= 1.3.19), scrollkeeper, flex, bison, intltool (>= 0.30), libtool, pkg-config, gnome-icon-theme (>= 1.2.0), libatk1.0-dev, libldap2-dev, libgtkhtml3.8-dev (>= 3.7.0), libgnome-pilot2-dev, libkrb5-dev, libnss3-dev, psmisc, libglib2.0-dev, liborbit2-dev (>= 1:2.9.8), libbonobo2-dev, evolution-data-server-dev, libgtk2.0-dev (>= 2.4.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), libgnomeui-dev, libglade2-dev, libgnomecanvas2-dev, libxml2-dev, libgconf2-dev, libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcamel1.2-dev, libedataserver1.2-dev (>= 1.3.1), libegroupwise1.2-dev (>= 1.3.1), libedataserverui1.2-dev (>= 1.3.1), libgnome2-dev, libecal1.2-dev (>= 1.3.1), libebook1.2-dev (>= 1.3.1), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libsoup2.2-dev (>= 2.2.2), libdbus-1-dev, libexchange-storage1.2-dev (>= 1.3.1), gtkhtml3.8 (>= 3.7.0)
+Standards-Version: 3.7.2
Package: evolution
-Section: gnome
Architecture: any
-Depends: gtkhtml3.8 (>= 3.8.1-1.1), ${shlibs:Depends}, libnss3 (>= 2:1.7), libnspr4 (>= 2:1.7), ${misc:Depends}, evolution-data-server (>= 1.4.2.1-1.1), gnome-icon-theme
-Suggests: bug-buddy, gnupg, gnome-spell (>= 1.0.4), evolution-exchange
-Recommends: mozilla-psm (>= 2:1.7), gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, spamassassin, evolution-plugins
+Depends: ${misc:Depends}, ${shlibs:Depends}, evolution-common (= ${source:Version}), evolution-data-server (>= 1.6.3), gtkhtml3.8 (>= 3.10.3), gnome-icon-theme (>= 1.2.0), dbus
+Recommends: gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, evolution-plugins, yelp, spamassassin
+Suggests: bug-buddy, gnupg, gnome-spell (>= 1.0.4), network-manager, evolution-exchange, evolution-dbg, evolution-plugins-experimental
Provides: mail-reader, imap-client
-Conflicts: evolution2.2
-Replaces: evolution2.2
-Description: The groupware suite
- Evolution is the integrated mail, calendar, task and address book distributed
- suite from Novell, Inc.
+Replaces: evolution-plugins (<= 2.6.1-2), evolution-common (<< 2.6.2-3)
+Description: groupware suite with mail client and organizer
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ Additional features include integration with Exchange and Groupwise
+ servers, newsgroup client, LDAP support, web calendars and
+ synchronization with Palm devices.
+ .
+ Evolution is a graphical application that is part of GNOME, and
+ is distributed by Novell, Inc.
.
See http://www.novell.com/products/evolution/ for more
information.
+ .
+ The following plugins belonging to the "base" set are included.
+ - calendar-file
+ - calendar-http
+ - calendar-weather
+ - itip-formatter
+ - plugin-manager
+ - default-source
+ - addressbook-file
+ - startup-wizard
+ - print-message
+ - mark-all-read
+ - groupwise-features
+ - groupwise-account-setup
+ - hula-account-setup
+ - mail-account-disable
+ - publish-calendar
+ - caldav
+ - sa-junk-plugin
+ - exchange-operations
+
+Package: evolution-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: evolution (<< 2.6.2-1)
+Recommends: evolution
+Description: architecture independent files for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains the architecture independent files needed
+ by the evolution package.
Package: evolution-dev
Section: devel
Architecture: any
-Conflicts: evolution2.2-dev
-Replaces: evolution2.2-dev
-Depends: evolution (= ${Source-Version}), libsoup2.2-dev, libgnomeui-dev (>= 2.8)
-Description: Development library files for Evolution
- Header and static library files for developing Evolution components.
+Depends: ${misc:Depends}, evolution (= ${binary:Version}), libgnome2-dev, libgnomeui-dev, libbonoboui2-dev (>= 2.4.2), libcamel1.2-dev
+Description: development library files for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains header and static library files
+ for developing Evolution components.
+
+Package: evolution-dbg
+Priority: extra
+Architecture: any
+Depends: evolution (= ${binary:Version})
+Description: debugging symbols for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains unstripped binaries of evolution for
+ use in debugging.
Package: evolution-plugins
-Section: gnome
Architecture: any
-Depends: evolution (= ${Source-Version}), ${shlibs:Depends}
-Description: All bundled plugins for Evolution
- This package includes all plugins which are bundled evolution source.
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: notification-daemon
+Description: standard plugins for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
.
- Base plugins.
- - calendar-file
- - calendar-http
- - calendar-weather
- - groupwise-account-setup
- - itip-formatter
- - plugin-manager
- - send-options
- - shared-folder
- - groupwise-send-options
- - exchange-account-setup
- - groupwise-status-tracking
- - default-source
- - addressbook-file
- - addressbook-groupwise
- - startup-wizard
- Standard plugins.
+ This package includes plugins for evolution. The plugins belong
+ to the set of "standard" plugins, which are useful, but not
+ necessary for a functioning application.
+ .
+ The following standard plugins are included.
- bbdb
- subject-thread
- - save-attachments
- - prefer-plain
- save-calendar
- select-one-source
- copy-tool
- mail-to-task
- - folder-unsubscribe
- mark-calendar-offline
- - audio-inline
- mailing-list-actions
- new-mail-notify
- Experimental plugins.
+ - default-mailer
+ - import-ics-attachments
+
+Package: evolution-plugins-experimental
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, evolution (= ${binary:Version})
+Replaces: evolution-plugins (<< 2.6.2-1)
+Description: experimental plugins for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package includes plugins for Evolution. The plugins belong
+ to the set of "experimental" plugins, which are unsupported, have
+ undergone little testing, and might cause problems to the rest of
+ Evolution. Use with care.
+ .
+ The following plugins are included.
- backup-restore
- folder-unsubscribe
- mail-to-meeting
+ - prefer-plain
+ - save-attachments
+ - ipod-sync
Added: etch/evolution/debian/csv2vcard.1
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/csv2vcard.1?rev=862&op=file
==============================================================================
--- etch/evolution/debian/csv2vcard.1 (added)
+++ etch/evolution/debian/csv2vcard.1 Thu Jul 19 17:41:03 2007
@@ -1,0 +1,19 @@
+.TH CSV2VCARD 1 2006\-05\-13 "GNOME" "GNOME"
+.SH NAME
+csv2vcard \- Convert a CSV-formatted list of contacts to vCards
+.SH SYNOPSIS
+.B csv2vcard
+.I INFILE OUTFILE
+.SH DESCRIPTION
+Takes the CSV-formatted list of contacts from Outlook and attempts to
+convert it into a list of vCards suitable for import into Evolution.
+.SH "SEE ALSO"
+.BR evolution (1)
+.SH AUTHOR
+Michael MacDonald <mjmac at ximian.com>
+.PP
+This manual page was originally written by Oystein Gisnas for the
+Debian system.
+.\" Copyright 2006 Øystein Gisnås
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
Modified: etch/evolution/debian/docs
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/docs?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/docs (original)
+++ etch/evolution/debian/docs Thu Jul 19 17:41:03 2007
@@ -3,5 +3,4 @@
AUTHORS
HACKING
MAINTAINERS
-debian/README.SSL
debian/NEWS.Debian
Added: etch/evolution/debian/evolution-addressbook-export.1
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-addressbook-export.1?rev=862&op=file
==============================================================================
--- etch/evolution/debian/evolution-addressbook-export.1 (added)
+++ etch/evolution/debian/evolution-addressbook-export.1 Thu Jul 19 17:41:03 2007
@@ -1,0 +1,50 @@
+.TH EVOLUTION-ADDRESSBOOK-EXPORT 1 2006\-05\-13 "GNOME" "GNOME"
+.SH NAME
+evolution-addressbook-export \- export addressbook content from Evoluion
+.SH SYNOPSIS
+.B evolution-addressbook-export
+.RI [ OPTIONS ] " " [ ADDRESSBOOK ]
+.SH DESCRIPTION
+Export the entire contents of the Evolution address book with ID
+.I ADDRESSBOOK
+, or the default address book if none is given. Available address book
+IDs can be listed with the \-l option. Supported export formats are
+vCard and CSV.
+.SH OPTIONS
+.TP
+.BR \-? ", " \-\-help
+Show a help message listing all the options and their meanings.
+.TP
+.B \-\-usage
+Show a brief help message listing the names of the options only.
+.TP
+.BI \-\-output= OUTPUTFILE
+.RI "Use " OUTPUTFILE "as output file for exported data. Defaults to standard out."
+.TP
+.BR \-l ", " \-\-list\-addressbook\-folders
+Export a comma-separated list of address book IDs, names and number of
+entries instead of address book contents.
+.TP
+.BI \-\-format= FORMAT
+.RI "Specify the output format. " FORMAT " must be either `vcard' or `csv'."
+The default format is vCard.
+.TP
+.BR \-a ", " \-\-async
+.RI "Export in asynchronous mode. " OUTPUTFILE " must be set and will be the prefix for the output files."
+.TP
+.BI \-\-size= NUMBER
+.RI "Export " NUMBER " entries to each output file. The default is 100."
+This option is only valid in asynchronous mode.
+.PP
+In addition, the usual Bonobo activation and GNOME command line options apply.
+See the output of \-\-help for details.
+.SH "SEE ALSO"
+.BR evolution (1)
+.SH AUTHOR
+Gilbert Fang <gilbert.fang at sun.com>
+.PP
+This manual page was originally written by Oystein Gisnas for the
+Debian system.
+.\" Copyright 2006 Øystein Gisnås
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
Added: etch/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-common.install?rev=862&op=file
==============================================================================
--- etch/evolution/debian/evolution-common.install (added)
+++ etch/evolution/debian/evolution-common.install Thu Jul 19 17:41:03 2007
@@ -1,0 +1,8 @@
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/mime-info
+debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/evolution
+debian/tmp/usr/share/gnome-pilot
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/omf
Modified: etch/evolution/debian/evolution-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-dev.install?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution-dev.install (original)
+++ etch/evolution/debian/evolution-dev.install Thu Jul 19 17:41:03 2007
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/evolution/*/*.{la,a,so}
+debian/tmp/usr/lib/evolution/*/*.{a,so}
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/include
debian/tmp/usr/share/idl
Added: etch/evolution/debian/evolution-mail.desktop
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-mail.desktop?rev=862&op=file
==============================================================================
--- etch/evolution/debian/evolution-mail.desktop (added)
+++ etch/evolution/debian/evolution-mail.desktop Thu Jul 19 17:41:03 2007
@@ -1,0 +1,44 @@
+[Desktop Entry]
+Name=Evolution Mail
+Name[da]=Evolution - e-post-program
+Name[de]=Evolution eMail
+Name[es]=Cliente de correo Evolution
+Name[fi]=Evolution-sähköposti
+Name[fr]=Lecteur de courrier Evolution
+Name[he]=דו×ר ×בולושיין
+Name[is]=Evolution Póstur
+Name[it]=Gestore di posta Evolution
+Name[nb]=Evolution e-post
+Name[nn]=Evolution e-post
+Name[no]=Evolution e-post
+Name[pt_BR]=Leitor de E-mail Evolution
+Name[ro]=Evolution Mail
+Name[sv]=Evolution e-post
+Name[xh]=I-Imeyili ye-Evolution
+Name[zh_CN]=Evolution 电å邮件
+Comment=Read and write emails
+Comment[da]=Læs og skriv e-breve
+Comment[de]=Emails lesen und schreiben
+Comment[es]=Cliente de correo Evolution
+Comment[fr]=Lire et écrire des courriers électroniques
+Comment[he]=×§×¨× ×“×•×ר ב×מצעות ×בולושיין
+Comment[fi]=Evolution-sähköposti
+Comment[is]=Evolution Póstur
+Comment[it]=Leggi e scrivi email
+Comment[nb]=Les og send e-post
+Comment[nn]=Les og send e-post
+Comment[no]=Les og send e-post
+Comment[pt_BR]=Leia e envie e-mails
+Comment[ro]=Evolution Mail
+Comment[sv]=Visa en notifieringsikon när dokument skrivs ut
+Comment[xh]=I-Imeyili ye-Evolution
+Comment[zh_CN]=Evolution 电å邮件
+Exec=evolution --component=mail
+Icon=evolution
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Network;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.6;evolution-alarm-notify;
Added: etch/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-plugins-experimental.install?rev=862&op=file
==============================================================================
--- etch/evolution/debian/evolution-plugins-experimental.install (added)
+++ etch/evolution/debian/evolution-plugins-experimental.install Thu Jul 19 17:41:03 2007
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/evolution/2.6/plugins/*{backup-restore,folder-unsubscribe,ipod-sync,mail-to-meeting,prefer-plain,save-attachments}*.{so,eplug,xml,glade}
Modified: etch/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution-plugins.install?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution-plugins.install (original)
+++ etch/evolution/debian/evolution-plugins.install Thu Jul 19 17:41:03 2007
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/2.4/plugins
+debian/tmp/usr/lib/evolution/2.6/plugins/*{bbdb,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mark-calendar-offline,mailing-list-actions,new-mail-notify,default-mailer,mail-attachments-import-ics}*.{so,eplug,xml,glade}
Modified: etch/evolution/debian/evolution.1
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.1?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution.1 (original)
+++ etch/evolution/debian/evolution.1 Thu Jul 19 17:41:03 2007
@@ -1,52 +1,69 @@
-.TH EVOLUTION 1 2004\-11\-06 "GNOME" "GNOME"
-.SH NAME
-evolution \- e\-mail, calendar, addressbook, and to do list application
-.SH SYNOPSIS
-.BR evolution " [" \-options "] [" \-\-long\-option "] [" file "...]"
-.SH DESCRIPTION
-This manual page briefly introduces the
-.B evolution
-command.
-Evolution is a program for reading and sending e\-mail and for managing
-calendars, address books, and to do lists.
-It is written for the GNOME graphical desktop.
-.PP
-For a more detailed explanation of Evolution, please see the Help menu.
-.SH OPTIONS
-.TP
-.BR \-? ", " \-\-help
-Show a help message listing all the options and their meanings.
-.TP
-.BR \-\-usage
-Show a brief help message listing the names of the options only.
-.TP
-.BR \-c ", " \-\-component= STRING
-Start Evolution by activating the desired component.
-.TP
-.BR \-\-offline
-Start in offline mode.
-.TP
-.BR \-\-online
-Start in online mode.
-.TP
-.BR \-\-force\-shutdown
-Forcibly shut down all Evolution components.
-.TP
-.BR \-\-debug= STRING
-Send the debugging output of all components to a file.
-.PP
-In addition, the usual GTK+ and GNOME command line options apply.
-See the output of \-\-help for details.
-.SH "SEE ALSO"
-http://www.novell.com/products/evolution/
-.SH AUTHOR
-Evolution was originally developed by the company Ximian, now a part
-of Novell.
-Evolution is now part of GNOME, and many people have touched the code.
-See the "About" item in the "Help" menu for a list.
-.PP
-This manual page was originally written by Lars Wirzenius for the
-Debian system.
-.\" Copyright 2004 Lars Wirzenius
-.\" You may copy this manual page under the terms of the version 2 of
-.\" the GNU General Public License.
+.TH EVOLUTION 1 2004\-11\-06 "GNOME" "GNOME"
+.SH NAME
+evolution \- groupware suite for GNOME containing e\-mail, calendar,
+addressbook, to-do list and memo tools
+.SH SYNOPSIS
+.B evolution
+.RI [ OPTIONS ] " " [ MAILTO ]
+.SH DESCRIPTION
+This manual page briefly introduces the
+.B evolution
+command. Evolution is a graphical groupware suite, a single
+application for reading and sending e\-mail and for managing
+calendars, address books, notes, to-do lists and memos. It is written
+for the GNOME graphical desktop.
+.PP
+.RI "An optional " MAILTO " expression can be specified, typically"
+.RI "invoked from another application. An example " MAILTO " expression"
+is `mailto:username at example.com`. This will open a new composer window
+with an empty e-mail to `username at example.com`. More advanced expressions
+are also suppported, but should conform to RFC 2368.
+.PP
+For a more detailed explanation of Evolution, please see the Help menu.
+.SH OPTIONS
+.TP
+.B \-?, \-\-help
+Show a help message listing all the options and their meanings.
+.TP
+.B \-\-usage
+Show a brief help message listing the names of the options only.
+.TP
+.BI "\-c, \-\-component=" COMPONENT
+Start Evolution by activating the desired component.
+.I COMPONENT
+is one of `mail', `calendar', `contacts', `tasks', `memos'.
+.TP
+.B \-\-offline
+Start in offline mode.
+.TP
+.BR \-\-online
+Start in online mode.
+.TP
+.B \-\-force\-shutdown
+Forcibly shut down all Evolution components.
+.TP
+.B \-\-force\-migrate
+Forcibly re-migrate from Evolution 1.4.
+.TP
+.BI \-\-debug= FILE
+.RI "Send the debugging output of all components to " FILE "."
+.TP
+.B \-\-disable-eplugin
+Disable loading of any plugins.
+.PP
+In addition, the usual GTK+ and GNOME command line options apply.
+See the output of \-\-help for details.
+.SH "SEE ALSO"
+http://www.novell.com/products/evolution/
+.SH AUTHOR
+Evolution was originally developed by the company Ximian, now a part
+of Novell.
+Evolution is now part of GNOME, and many people have touched the code.
+See the "About" item in the "Help" menu for a list.
+.PP
+This manual page was originally written by Lars Wirzenius for the
+Debian system.
+.\" Copyright 2004 Lars Wirzenius
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
+.\" Updated by Oystein Gisnas
Modified: etch/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.install?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution.install (original)
+++ etch/evolution/debian/evolution.install Thu Jul 19 17:41:03 2007
@@ -1,21 +1,13 @@
debian/tmp/etc/gconf
-debian/tmp/usr/lib/evolution/2.4/*.so.*
-debian/tmp/usr/lib/evolution/2.4/camel-providers/*.urls
-debian/tmp/usr/lib/evolution/2.4/camel-providers/*.so
-debian/tmp/usr/lib/evolution/2.4/components/*.so
-debian/tmp/usr/lib/evolution/2.4/conduits/*.so
-debian/tmp/usr/lib/evolution/2.4/csv2vcard
-debian/tmp/usr/lib/evolution/2.4/killev
-debian/tmp/usr/lib/evolution/2.4/evolution-*-importers/*.so
-debian/tmp/usr/lib/evolution/2.4/evolution-addressbook-*
-debian/tmp/usr/lib/evolution/2.4/evolution-alarm-notify
+debian/tmp/usr/lib/evolution/2.6/*.so.*
+debian/tmp/usr/lib/evolution/2.6/components/*.so
+debian/tmp/usr/lib/evolution/2.6/conduits/*.so
+debian/tmp/usr/lib/evolution/2.6/csv2vcard
+debian/tmp/usr/lib/evolution/2.6/killev
+debian/tmp/usr/lib/evolution/2.6/evolution-addressbook-export
+debian/tmp/usr/lib/evolution/2.6/evolution-alarm-notify
debian/tmp/usr/bin
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/mime-info
-debian/tmp/usr/share/pixmaps
-debian/tmp/usr/share/evolution
-debian/tmp/usr/share/gnome-pilot
-debian/tmp/usr/share/locale
debian/tmp/usr/lib/bonobo
-debian/tmp/usr/share/gnome
-debian/tmp/usr/share/omf
+debian/tmp/usr/lib/evolution/2.6/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,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+debian/evolution-mail.desktop usr/share/applications/
+debian/evolution.xpm usr/share/pixmaps/
Modified: etch/evolution/debian/evolution.links
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.links?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution.links (original)
+++ etch/evolution/debian/evolution.links Thu Jul 19 17:41:03 2007
@@ -1,4 +1,4 @@
-/usr/bin/evolution-2.4 /usr/bin/evolution
-/usr/lib/evolution/2.4/csv2vcard /usr/bin/csv2vcard
-/usr/lib/evolution/2.4/evolution-addressbook-export /usr/bin/evolution-addressbook-export
-/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.4.gz
+/usr/bin/evolution-2.6 /usr/bin/evolution
+/usr/lib/evolution/2.6/csv2vcard /usr/bin/csv2vcard
+/usr/lib/evolution/2.6/evolution-addressbook-export /usr/bin/evolution-addressbook-export
+/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.6.1.gz
Modified: etch/evolution/debian/evolution.manpages
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.manpages?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution.manpages (original)
+++ etch/evolution/debian/evolution.manpages Thu Jul 19 17:41:03 2007
@@ -1,1 +1,3 @@
debian/evolution.1
+debian/evolution-addressbook-export.1
+debian/csv2vcard.1
Modified: etch/evolution/debian/evolution.menu
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.menu?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/evolution.menu (original)
+++ etch/evolution/debian/evolution.menu Thu Jul 19 17:41:03 2007
@@ -1,4 +1,3 @@
?package(evolution):needs="X11" section="Apps/Net" \
title="Evolution" command="/usr/bin/evolution" \
- hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution-2.4.png" \
- kderemove="1"
+ hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm"
Added: etch/evolution/debian/evolution.xpm
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/evolution.xpm?rev=862&op=file
==============================================================================
--- etch/evolution/debian/evolution.xpm (added)
+++ etch/evolution/debian/evolution.xpm Thu Jul 19 17:41:03 2007
@@ -1,0 +1,198 @@
+/* XPM */
+static char * evolution_xpm[] = {
+"24 24 171 2",
+" c None",
+". c #888A85",
+"+ c #ABACA9",
+"@ c #FFFFFF",
+"# c #EDEDED",
+"$ c #EBEBEB",
+"% c #E9E9E9",
+"& c #E8E8E8",
+"* c #E6E6E6",
+"= c #E4E4E4",
+"- c #E2E2E2",
+"; c #E1E1E1",
+"> c #E0E0E0",
+", c #DDDDDD",
+"' c #DBDBDB",
+") c #DADADA",
+"! c #E7E7E7",
+"~ c #DEDEDE",
+"{ c #DCDCDC",
+"] c #D9D9D9",
+"^ c #D7D7D7",
+"/ c #D5D5D5",
+"( c #E5E5E5",
+"_ c #E3E3E3",
+": c #D8D8D8",
+"< c #D3D3D3",
+"[ c #B0B1AF",
+"} c #A6A7A5",
+"| c #D2D2D2",
+"1 c #C9CAC9",
+"2 c #B8B9B7",
+"3 c #B2B2B1",
+"4 c #C0C1BF",
+"5 c #D0D0CF",
+"6 c #FAFAFA",
+"7 c #F5F5F5",
+"8 c #B0B0AF",
+"9 c #ACADAA",
+"0 c #CDCECC",
+"a c #C5C5C4",
+"b c #C0C0BF",
+"c c #B4B4B3",
+"d c #BBBBBA",
+"e c #CBCBCA",
+"f c #F7F7F7",
+"g c #FDFDFD",
+"h c #FBFBFB",
+"i c #F8F8F8",
+"j c #C8C8C8",
+"k c #C7C7C6",
+"l c #E2E4E2",
+"m c #F4F4F4",
+"n c #FCFCFC",
+"o c #F6F6F6",
+"p c #F0F0F1",
+"q c #917E9B",
+"r c #7D6086",
+"s c #76527C",
+"t c #7B5D84",
+"u c #9885A1",
+"v c #878984",
+"w c #D8DAD8",
+"x c #D9DAD9",
+"y c #F3F3F3",
+"z c #F2F2F2",
+"A c #C4BDC9",
+"B c #7D5F86",
+"C c #B090B1",
+"D c #D6B9D3",
+"E c #DCC0D9",
+"F c #75577E",
+"G c #F1F1F1",
+"H c #B7B9B6",
+"I c #E0E0DF",
+"J c #F0F0F0",
+"K c #EFEFEF",
+"L c #EEEEEE",
+"M c #E3E3E5",
+"N c #7C5F86",
+"O c #C7AAC6",
+"P c #CFBDD0",
+"Q c #D2CFD0",
+"R c #D3D2D1",
+"S c #E5E5E4",
+"T c #DBD8DA",
+"U c #CDBACD",
+"V c #75557E",
+"W c #E8E9E8",
+"X c #ABAEAA",
+"Y c #D1D2D0",
+"Z c #C8C9C7",
+"` c #82708E",
+" . c #D0BDD0",
+".. c #F2F2F0",
+"+. c #9E9E9D",
+"@. c #F1F1EF",
+"#. c #F4F4F2",
+"$. c #EFEFED",
+"%. c #E7E7E5",
+"&. c #CEBBCF",
+"*. c #6F567B",
+"=. c #DDDEDD",
+"-. c #A9AAA7",
+";. c #795B82",
+">. c #EAE7E8",
+",. c #F5F5F3",
+"'. c #EDEDEB",
+"). c #A9A9A8",
+"!. c #F6F6F4",
+"~. c #F0F0EE",
+"{. c #EAEAE8",
+"]. c #DDDADC",
+"^. c #75567E",
+"/. c #ECECEC",
+"(. c #C4C6C3",
+"_. c #A9ACA8",
+":. c #DCDBDF",
+"<. c #75527C",
+"[. c #D3D2D2",
+"}. c #F3F3F1",
+"|. c #F7F7F5",
+"1. c #868686",
+"2. c #B7B7B6",
+"3. c #E2E2E0",
+"4. c #C1C1C0",
+"5. c #75517B",
+"6. c #C0C2BF",
+"7. c #CCCECB",
+"8. c #D3D2D6",
+"9. c #DAD9D8",
+"0. c #E6E6E4",
+"a. c #787878",
+"b. c #C2C2C1",
+"c. c #EBEBE9",
+"d. c #E4E4E2",
+"e. c #CCCBCA",
+"f. c #EAEAEA",
+"g. c #C5C7C4",
+"h. c #785A81",
+"i. c #E2DFE0",
+"j. c #6D6D6C",
+"k. c #D2D2D0",
+"l. c #E3E3E1",
+"m. c #DDDBDE",
+"n. c #74557D",
+"o. c #E5E6E5",
+"p. c #826F8D",
+"q. c #D1BED0",
+"r. c #DADAD8",
+"s. c #DEDEDC",
+"t. c #CFBCD0",
+"u. c #6E557A",
+"v. c #F4F3F5",
+"w. c #D1BED1",
+"x. c #DCD9DA",
+"y. c #B3B3B1",
+"z. c #D1D0CF",
+"A. c #DCD9DB",
+"B. c #CEBBCE",
+"C. c #73547C",
+"D. c #838580",
+"E. c #858782",
+"F. c #746F77",
+"G. c #74567D",
+"H. c #73547B",
+"I. c #604A6B",
+"J. c #72537B",
+"K. c #74517B",
+"L. c #74507B",
+"M. c #715279",
+"N. c #5E4667",
+" ",
+" . . . . . ",
+" + @ @ @ @ @ . ",
+" . @ # # $ % & @ . ",
+" . @ # $ % * = - ; @ . ",
+" . @ $ % * = - > , ' ) @ . ",
+" . @ % ! = - > ~ { ] ^ / / @ . ",
+" . @ ! ( _ ; ~ { ) : / < [ } | @ . ",
+" . @ 1 _ ; ~ { ) : 2 3 4 5 6 7 8 9 @ . ",
+" . @ 0 a { b c d e f g h i i i j k @ . ",
+" . @ l b a m n h i o o p q r s s t u v ",
+" . @ 7 w x o 7 m y z A B C D E E D C F ",
+" . @ y G H I J K L M N O P Q R S T U O V ",
+" . @ G G W X Y Z Z ` C ...+. at .#.$.%.&.C *. ",
+" . @ K K L =.-.. v ;.D >.,.'.).!.~.{.].D ^. ",
+" . @ # # /.(._.o :.<.E [.}.|.1.2.$.3.4.E 5. ",
+" . @ $ $ 6.7.y & 8.<.E 9.$.0.a.b.c.d.e.E 5. ",
+" . @ f.g.m /.! * ( h.D i.{.j.k.{.%.l.m.D n. ",
+" . @ o.m ! * * ( ( p.C q.l.r.s.d.3.s.t.C u. ",
+" . @ @ @ @ @ @ @ @ v.h.O w.x.y.z.A.B.O C. ",
+" D.. . . . . . . . E.F.G.C D E E D C H. ",
+" I.J.K.L.M.N. ",
+" ",
+" "};
Added: etch/evolution/debian/patches/07_default_shell_only_with_no_uris.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/07_default_shell_only_with_no_uris.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/07_default_shell_only_with_no_uris.patch (added)
+++ etch/evolution/debian/patches/07_default_shell_only_with_no_uris.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,13 @@
+diff -ru evolution-2.6.2.orig/shell/main.c evolution-2.6.2/shell/main.c
+--- evolution-2.6.2.orig/shell/main.c 2006-05-03 16:02:44.000000000 +0200
++++ evolution-2.6.2/shell/main.c 2006-05-30 20:20:31.000000000 +0200
+@@ -375,7 +375,8 @@
+ }
+
+ if (shell != NULL) {
+- e_shell_create_window (shell, default_component_id, NULL);
++ if (g_slist_length (uri_list) == 0)
++ e_shell_create_window (shell, default_component_id, NULL);
+ open_uris (corba_shell, uri_list);
+ } else {
+ CORBA_Environment ev;
Added: etch/evolution/debian/patches/10_e-cell-text-missing-include.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/10_e-cell-text-missing-include.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/10_e-cell-text-missing-include.patch (added)
+++ etch/evolution/debian/patches/10_e-cell-text-missing-include.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,10 @@
+--- evolution-2.6.3/widgets/table/e-cell-text.c.orig 2006-08-23 01:03:32.000000000 -0600
++++ evolution-2.6.3/widgets/table/e-cell-text.c 2006-08-23 01:04:05.000000000 -0600
+@@ -45,6 +45,7 @@
+ #include <gtk/gtk.h>
+ #include <libgnomecanvas/gnome-canvas.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
++#include <libgnomeprint/gnome-print-pango.h>
+
+ #include "a11y/e-table/gal-a11y-e-cell-registry.h"
+ #include "a11y/e-table/gal-a11y-e-cell-text.h"
Modified: etch/evolution/debian/patches/10_etasks-missing-include.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/10_etasks-missing-include.patch?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/patches/10_etasks-missing-include.patch (original)
+++ etch/evolution/debian/patches/10_etasks-missing-include.patch Thu Jul 19 17:41:03 2007
@@ -1,9 +1,9 @@
-diff -urN evolution-2.4.1.orig/calendar/gui/e-tasks.c evolution-2.4.1/calendar/gui/e-tasks.c
---- evolution-2.4.1.orig/calendar/gui/e-tasks.c 2005-10-03 08:12:19.000000000 +0200
-+++ evolution-2.4.1/calendar/gui/e-tasks.c 2005-11-11 13:35:20.000000000 +0100
-@@ -38,6 +38,7 @@
+diff -ru evolution-2.6.2.orig/calendar/gui/e-tasks.c evolution-2.6.2/calendar/gui/e-tasks.c
+--- evolution-2.6.2.orig/calendar/gui/e-tasks.c 2006-05-03 16:01:45.000000000 +0200
++++ evolution-2.6.2/calendar/gui/e-tasks.c 2006-05-30 20:23:05.000000000 +0200
+@@ -39,6 +39,7 @@
#include "e-util/e-config-listener.h"
- #include "e-util/e-time-utils.h"
+ #include "e-util/e-util-private.h"
#include "shell/e-user-creatable-items-handler.h"
+#include "libedataserver/e-categories.h"
#include <libedataserver/e-url.h>
Added: etch/evolution/debian/patches/10_pkg-config-rpath.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/10_pkg-config-rpath.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/10_pkg-config-rpath.patch (added)
+++ etch/evolution/debian/patches/10_pkg-config-rpath.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,20 @@
+diff -ruN evolution-2.6.2.orig/evolution-plugin.pc.in evolution-2.6.2/evolution-plugin.pc.in
+--- evolution-2.6.2.orig/evolution-plugin.pc.in 2006-06-14 10:53:16.000000000 +0200
++++ evolution-2.6.2/evolution-plugin.pc.in 2006-06-14 10:54:22.000000000 +0200
+@@ -15,5 +15,5 @@
+ Description: libraries needed for Evolution plugin development
+ Version: @VERSION@
+ Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ camel-provider-1.2
+-Libs: -L${privlibdir} -leutil
++Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
+ Cflags: -I${privincludedir}
+diff -ruN evolution-2.6.2.orig/evolution-shell.pc.in evolution-2.6.2/evolution-shell.pc.in
+--- evolution-2.6.2.orig/evolution-shell.pc.in 2006-06-14 10:53:16.000000000 +0200
++++ evolution-2.6.2/evolution-shell.pc.in 2006-06-14 10:54:47.000000000 +0200
+@@ -19,5 +19,5 @@
+ Description: libraries needed for Evolution shell components
+ Version: @VERSION@
+ Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@
+-Libs: -L${privlibdir} -leshell
++Libs: -L${privlibdir} -leshell -Wl,-R${privlibdir}
+ Cflags: -I${privincludedir}
Added: etch/evolution/debian/patches/17_fix_alarm_delay_for_calendar.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/17_fix_alarm_delay_for_calendar.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/17_fix_alarm_delay_for_calendar.patch (added)
+++ etch/evolution/debian/patches/17_fix_alarm_delay_for_calendar.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,53 @@
+diff -ru evolution-2.6.2.orig/calendar/gui/dialogs/event-page.c evolution-2.6.2/calendar/gui/dialogs/event-page.c
+--- evolution-2.6.2.orig/calendar/gui/dialogs/event-page.c 2006-05-04 11:18:44.000000000 +0200
++++ evolution-2.6.2/calendar/gui/dialogs/event-page.c 2006-05-30 20:33:27.000000000 +0200
+@@ -2918,40 +2918,33 @@
+ priv->alarm_units = calendar_config_get_default_reminder_units ();
+ priv->alarm_interval = calendar_config_get_default_reminder_interval ();
+
++ menu_label = "";
+ switch (priv->alarm_units) {
+ case CAL_DAYS:
+- if (priv->alarm_interval != -1) {
++ if (priv->alarm_interval != 1) {
+ menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
+- } else {
+- priv->alarm_interval = -1;
+ }
+ break;
+
+ case CAL_HOURS:
+- if (priv->alarm_interval != -1) {
++ if (priv->alarm_interval != 1) {
+ menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
+- } else {
+- priv->alarm_interval = -1;
+ }
+ break;
+
+ case CAL_MINUTES:
+- if (priv->alarm_interval != -1) {
++ if (priv->alarm_interval != 15) {
+ menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
+- } else {
+- priv->alarm_interval = -1;
+ }
+ break;
+ }
+
+- if (menu_label) {
+- GtkWidget *item, *menu;
+-
+- item = gtk_menu_item_new_with_label (menu_label);
+- gtk_widget_show (item);
+- menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
+- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
++ cus_item = gtk_menu_item_new_with_label (menu_label);
++ if(menu_label[0] != '\0') {
++ gtk_widget_show (cus_item);
+ }
++ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item);
+
+ cus_item = gtk_menu_item_new_with_label (_("Customize"));
+ gtk_widget_show (cus_item);
Added: etch/evolution/debian/patches/20_xulrunner.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/20_xulrunner.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/20_xulrunner.patch (added)
+++ etch/evolution/debian/patches/20_xulrunner.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,32 @@
+diff -ru evolution-2.6.2.orig/configure.in evolution-2.6.2/configure.in
+--- evolution-2.6.2.orig/configure.in 2006-05-29 15:35:02.000000000 +0200
++++ evolution-2.6.2/configure.in 2006-05-30 20:49:38.000000000 +0200
+@@ -736,7 +736,7 @@
+
+ if test "x${check_manually}" = "xno"; then
+ AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
+- mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr"
++ mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr"
+ for pc in $mozilla_nspr_pcs; do
+ if $PKG_CONFIG --exists $pc; then
+ AC_MSG_RESULT($pc)
+@@ -746,7 +746,7 @@
+ done
+
+ AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
+- mozilla_nss_pcs="nss mozilla-nss firefox-nss"
++ mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss"
+ for pc in $mozilla_nss_pcs; do
+ if $PKG_CONFIG --exists $pc; then
+ AC_MSG_RESULT($pc)
+@@ -770,8 +770,8 @@
+ MANUAL_NSS_LIBS=""
+ else
+ check_manually="yes"
+- mozilla_nspr=""
+- mozilla_nss=""
++ mozilla_nspr="xulrunner-nspr"
++ mozilla_nss="xulrunner-nss"
+ fi
+ fi
+
Added: etch/evolution/debian/patches/30_ipod-sync_missing-files.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/30_ipod-sync_missing-files.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/30_ipod-sync_missing-files.patch (added)
+++ etch/evolution/debian/patches/30_ipod-sync_missing-files.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,465 @@
+diff -ruN evolution-2.6.2.orig/plugins/ipod-sync/evolution-ipod-sync.h evolution-2.6.2/plugins/ipod-sync/evolution-ipod-sync.h
+--- evolution-2.6.2.orig/plugins/ipod-sync/evolution-ipod-sync.h 1970-01-01 01:00:00.000000000 +0100
++++ evolution-2.6.2/plugins/ipod-sync/evolution-ipod-sync.h 2006-05-30 23:19:03.000000000 +0200
+@@ -0,0 +1,43 @@
++/*
++ * evolution-ipod-sync.h
++ *
++ * (C)2004 Justin Wake <jwake at iinet.net.au>
++ *
++ * Licensed under the GNU GPL v2. See COPYING.
++ *
++ */
++
++#include "config.h"
++#include <dbus/dbus.h>
++#include <dbus/dbus-glib.h>
++#include <libhal.h>
++#include <signal.h>
++
++#ifdef ENABLE_NLS
++# include <libintl.h>
++# define _(String) gettext (String)
++# ifdef gettext_noop
++# define N_(String) gettext_noop (String)
++# else
++# define N_(String) (String)
++# endif
++#else
++# define _(String)
++# define N_(String) (String)
++#endif
++
++#ifdef EIS_DEBUG
++# define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
++#else
++# define dbg(fmt,arg...) do { } while(0)
++#endif
++
++#define warn(fmt,arg...) g_warning("%s/%d: " fmt,__FILE__,__LINE__,##arg)
++
++
++gboolean check_hal ();
++
++char *find_ipod_mount_point (LibHalContext *ctx);
++gboolean ipod_check_status (gboolean silent);
++char *ipod_get_mount ();
++
+diff -ruN evolution-2.6.2.orig/plugins/ipod-sync/sync.c evolution-2.6.2/plugins/ipod-sync/sync.c
+--- evolution-2.6.2.orig/plugins/ipod-sync/sync.c 1970-01-01 01:00:00.000000000 +0100
++++ evolution-2.6.2/plugins/ipod-sync/sync.c 2006-05-30 23:20:00.000000000 +0200
+@@ -0,0 +1,414 @@
++/*
++ * sync.c
++ *
++ * (C)2004 Justin Wake <jwake at iinet.net.au>
++ *
++ * Licensed under the GNU GPL v2. See COPYING.
++ *
++ */
++
++#include "config.h"
++#include "evolution-ipod-sync.h"
++#include <gnome.h>
++
++#include <libebook/e-book.h>
++#include <libebook/e-contact.h>
++#include <libecal/e-cal.h>
++#include <libical/ical.h>
++#include <errno.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#define EBOOK_SOURCE_LIST "/apps/evolution/addressbook/sources"
++#define ECAL_SOURCE_LIST "/apps/evolution/calendar/sources"
++#define ETASK_SOURCE_LIST "/apps/evolution/tasks/sources"
++
++extern GtkWidget *progress_bar;
++extern IPod ipod_info;
++
++static void pulse (void)
++{
++ gtk_progress_bar_pulse (GTK_PROGRESS_BAR (progress_bar));
++ g_main_context_iteration (NULL, FALSE);
++}
++
++/**
++ * Something bad happened.
++ */
++static void error_dialog (char *title, char *error)
++{
++ GtkWidget *error_dlg =
++ gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
++ "<span weight=\"bold\" size=\"larger\">"
++ "%s</span>\n\n%s.", title, error);
++
++ gtk_dialog_set_has_separator (GTK_DIALOG (error_dlg), FALSE);
++ gtk_container_set_border_width (GTK_CONTAINER (error_dlg), 5);
++ gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dlg)->label),
++ TRUE);
++ gtk_dialog_set_default_response (GTK_DIALOG (error_dlg),
++ GTK_RESPONSE_OK);
++
++ gtk_dialog_run (GTK_DIALOG (error_dlg));
++ gtk_widget_destroy (error_dlg);
++}
++
++/**
++ * Something really bad happened.
++ */
++static void critical_error (char *title, char *error)
++{
++ error_dialog (title, error);
++ gtk_main_quit ();
++ exit (EXIT_FAILURE);
++}
++
++static GSList *
++get_source_uris_for_type (char *key)
++{
++ ESourceList *sources;
++ GSList *groups;
++ GSList *uris = NULL;
++ GSList *item, *source;
++ sources = e_source_list_new_for_gconf_default (key);
++ groups = e_source_list_peek_groups (sources);
++
++ for (item = groups; item != NULL; item = item->next)
++ {
++ ESourceGroup *group;
++
++ g_assert (item->data != NULL);
++
++ group = E_SOURCE_GROUP (item->data);
++ for (source = e_source_group_peek_sources(group);
++ source != NULL;
++ source = source->next)
++ {
++ gchar *uri;
++ g_assert (source->data != NULL);
++ uri = e_source_get_uri (E_SOURCE (source->data));
++ uris = g_slist_append (uris, uri);
++ }
++ }
++
++ g_object_unref (sources);
++
++ return uris;
++}
++
++static void
++free_uri_list (GSList *uris)
++{
++ g_slist_foreach (uris, (GFunc)g_free, NULL);
++ g_slist_free (uris);
++}
++
++/**
++ * Force the data into little-endian output.
++ *
++ * Note: data must be of even length.
++ */
++static void
++force_little_endian (gunichar2 *data, int length)
++{
++ int i;
++
++ /* We're big-endian?
++ (A little tidier than before) */
++ if (G_BYTE_ORDER == G_BIG_ENDIAN)
++ {
++ for (i = 0; i < length; i++)
++ {
++ gunichar2 c = data[i];
++
++ c = ((((guint16)(c) & 0xFF00) >> 8) |
++ (((guint16)(c) & 0x00FF) << 8));
++
++ data[i] = c;
++ }
++ }
++}
++
++/**
++ * Write a string of data to a file on the iPod.
++ *
++ * Will return if the write worked, otherwise will
++ * display an error dialog and end the program.
++ */
++static void
++write_to_ipod (GString *str, char *path, char *filename)
++{
++ char *output_path;
++ char *output_file;
++ FILE *f;
++ guchar *utf8;
++ gunichar2 *utf16;
++ guchar bom[2] = {0xFF, 0xFE};
++ int i, count;
++
++ output_path = g_build_path (G_DIR_SEPARATOR_S,
++ ipod_info.mount_point,
++ path, NULL);
++
++ if (!g_file_test (output_path, G_FILE_TEST_IS_DIR))
++ {
++ if (mkdir (output_path, 0777) != 0)
++ critical_error (_("No output directory!"),
++ _("The output directory was not found on "
++ "iPod! Please ensure that iPod has been correctly "
++ "set up and try again."));
++ }
++
++ output_file = g_build_filename (output_path, filename, NULL);
++
++ g_free (output_path);
++
++ f = fopen (output_file, "w");
++
++ g_free (output_file);
++
++ if (f == NULL)
++ {
++ critical_error (_("Could not export data!"), strerror (errno));
++ }
++
++ /* Convert the input string into UTF16 */
++ utf8 = str->str;
++ if (g_utf8_validate (utf8, -1, NULL))
++ {
++ utf16 = g_utf8_to_utf16 (utf8, -1, NULL, NULL, NULL);
++
++ /* Swap the bytes if we're big-endian so that the output
++ * remains little-endian according to the BOM. */
++ force_little_endian (utf16, g_utf8_strlen (utf8, -1));
++ }
++
++ count = 2 * g_utf8_strlen (utf8, -1);
++
++ /* Write the BOM
++ * 0xFF 0xFE
++ * UTF-16 Little Endian
++ */
++ for (i = 0; i < 2; i++)
++ fwrite (&bom[i], 1, 1, f);
++
++ if ((fwrite(utf16, count, 1, f) != 1) &&
++ (count > 0))
++ {
++ g_free (utf16);
++ fclose (f);
++ critical_error (_("Could not export data!"),
++ _("Exporting data failed."));
++ }
++
++ g_free (utf16);
++ fclose (f);
++}
++
++static GString *
++uri_list_to_vcard_string (GSList *uris)
++{
++ GString *str = NULL;
++ EBook *book = NULL;
++ EBookQuery *qry = NULL;
++ GList *contacts = NULL, *c = NULL;
++ GSList *uri;
++
++ qry = e_book_query_field_exists (E_CONTACT_FILE_AS);
++
++ str = g_string_new (NULL);
++
++ for (uri = uris; uri != NULL; uri = uri->next)
++ {
++ g_assert (uri->data != NULL);
++
++ book = e_book_new_from_uri (uri->data, NULL);
++
++ if (e_book_open (book, TRUE, NULL) == FALSE)
++ {
++ error_dialog (_("Could not open addressbook!"),
++ _("Could not open the Evolution addressbook to export data."));
++
++ /* Maybe the next one will work. */
++ continue;
++ }
++
++ if (e_book_get_contacts (book, qry, &contacts, NULL) == FALSE)
++ {
++ /* Looks like this one is empty. */
++ g_object_unref (book);
++ continue;
++ }
++
++ /* Loop through the contacts, adding them to the string. */
++ for (c = contacts; c != NULL; c = c->next)
++ {
++ gchar *tmp;
++ EContact *contact = E_CONTACT (c->data);
++
++ tmp = e_vcard_to_string (E_VCARD (contact),
++ EVC_FORMAT_VCARD_30);
++
++ g_string_append (str, tmp);
++ g_string_append (str, "\r\n");
++ g_free (tmp);
++ g_object_unref (contact);
++ }
++
++ if (contacts != NULL)
++ g_list_free (contacts);
++
++ g_object_unref (book);
++ }
++
++ /* Okay, all done. */
++ e_book_query_unref (qry);
++
++ return (str);
++}
++
++static GString *
++uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
++{
++ GString *str = NULL;
++ ECal *cal = NULL;
++ icalcomponent *obj = NULL;
++ GList *objects = NULL, *o = NULL;
++ GSList *uri;
++
++ str = g_string_new (NULL);
++
++ for (uri = uris; uri != NULL; uri = uri->next)
++ {
++ g_assert (uri->data != NULL);
++
++ cal = e_cal_new_from_uri (uri->data, type);
++
++ if (e_cal_open (cal, TRUE, NULL) == FALSE)
++ {
++ error_dialog (_("Could not open calendar/todo!"),
++ _("Could not open the Evolution calendar/todo list to export data."));
++
++ /* Maybe the next one will work. */
++ continue;
++ }
++
++
++ e_cal_get_object_list (cal, "#t", &objects, NULL);
++
++ for (o = objects; o != NULL; o = o->next)
++ {
++ gchar *tmp;
++ icalcomponent *comp;
++
++ g_assert (o->data != NULL);
++
++ comp = o->data;
++ tmp = e_cal_get_component_as_string (cal, comp);
++ g_string_append (str, tmp);
++ g_free (tmp);
++ }
++
++ g_object_unref (cal);
++ }
++
++ /* Okay, all done. */
++
++ return (str);
++}
++
++/* Attempt to export the addressbook. */
++static void
++export_addressbook (void)
++{
++ GSList *uris;
++ GString *data;
++ pulse ();
++
++ uris = get_source_uris_for_type (EBOOK_SOURCE_LIST);
++
++ pulse ();
++
++ data = uri_list_to_vcard_string (uris);
++
++ write_to_ipod (data, "/Contacts/", "evolution.vcf");
++
++ g_string_free (data, TRUE);
++
++ pulse ();
++
++ free_uri_list (uris);
++
++ pulse ();
++}
++
++/* Attempt to export the calendar(s). */
++static void
++export_calendar (void)
++{
++ GSList *uris;
++ GString *data;
++
++ pulse ();
++
++ uris = get_source_uris_for_type (ECAL_SOURCE_LIST);
++
++ pulse ();
++
++ data = uri_list_to_vcal_string (uris, E_CAL_SOURCE_TYPE_EVENT);
++
++ write_to_ipod (data, "/Calendars/", "evolution-cal.ics");
++
++ g_string_free (data, TRUE);
++
++ free_uri_list (uris);
++
++ pulse ();
++}
++
++/* Attempt to export the task list(s). */
++static void
++export_tasks (void)
++{
++ GSList *uris;
++ GString *data;
++
++ pulse ();
++
++ uris = get_source_uris_for_type (ETASK_SOURCE_LIST);
++
++ pulse ();
++
++ data = uri_list_to_vcal_string (uris, E_CAL_SOURCE_TYPE_TODO);
++
++ write_to_ipod (data, "/Calendars/", "evolution-todo.ics");
++
++ g_string_free (data, TRUE);
++
++ free_uri_list (uris);
++
++ pulse ();
++}
++
++void
++export_to_ipod (void)
++{
++ pulse ();
++
++ if (ipod_info.addressbook == TRUE)
++ export_addressbook ();
++
++ if (ipod_info.calendar == TRUE)
++ export_calendar ();
++
++ if (ipod_info.tasks == TRUE)
++ export_tasks ();
++
++ pulse ();
++ sync ();
++ pulse ();
++ return;
++}
++
Added: etch/evolution/debian/patches/40_gfdl-user-guide.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/40_gfdl-user-guide.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/40_gfdl-user-guide.patch (added)
+++ etch/evolution/debian/patches/40_gfdl-user-guide.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,18 @@
+--- evolution/help/C/evolution.xml (revision 33272)
++++ evolution/help/C/evolution.xml (working copy)
+@@ -5245,10 +5245,13 @@
+ <member>Further, Novell, Inc. makes no representations or warranties with respect to any software, and specifically disclaims any express or implied warranties of merchantability or fitness for any particular purpose. Further, Novell, Inc. reserves the right to make changes to any and all parts of Novell software, at any time, without any obligation to notify any person or entity of such changes.</member>
+ </simplelist>
+ <simplelist>
+- <member>Any products or technical information provided under this Agreement may be subject to U.S. export controls and the trade laws of other countries. You agree to comply with all export control regulations and to obtain any required licenses or classification to export, re-export, or import deliverables. You agree not to export or re-export to entities on the current U.S. export exclusion lists or to any embargoed or terrorist countries as specified in the U.S. export laws. You agree to not use deliverables for prohibited nuclear, missile, or chemical biological weaponry end uses. Please refer to www.novell.com/info/exports/ for more information on exporting Novell software. Novell assumes no responsibility for your failure to obtain any necessary export approvals.</member>
++ <member>You may not use, export, or re-export this product in violation of any applicable laws or regulations including, without limitation, U.S. export regulations or the laws of the country in which you reside.</member>
+ </simplelist>
+ <simplelist>
+- <member>Copyright © 2005-2006 Novell, Inc. All rights reserved. No part of this publication may be reproduced, photocopied, stored on a retrieval system, or transmitted without the express written consent of the publisher.</member>
++ <member>Copyright © 2007 Novell, Inc. All rights reserved. Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.2 or any later version, published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/licenses/fdl.html.</member>
++ <member>THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:</member>
++ <member>1. THE DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND</member>
++ <member>2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.</member>
+ </simplelist>
+ <simplelist>
+ <member>Novell, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.novell.com/company/legal/patents/ and one or more additional patents or pending patent applications in the U.S. and in other countries.</member>
Added: etch/evolution/debian/patches/50_libnssckbi-location.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/50_libnssckbi-location.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/50_libnssckbi-location.patch (added)
+++ etch/evolution/debian/patches/50_libnssckbi-location.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,11 @@
+diff -Nur evolution-2.6.3/smime/lib/e-cert-db.c evolution-2.6.3.new/smime/lib/e-cert-db.c
+--- evolution-2.6.3/smime/lib/e-cert-db.c 2006-07-04 06:11:05.000000000 +0200
++++ evolution-2.6.3.new/smime/lib/e-cert-db.c 2007-03-11 01:32:42.000000000 +0100
+@@ -290,6 +290,7 @@
+ MOZILLA_NSS_LIB_DIR,
+ #endif
+ "/usr/lib",
++ "/usr/lib/xulrunner",
+ "/usr/lib/mozilla",
+ "/opt/mozilla/lib",
+ "/opt/mozilla/lib/mozilla"
Modified: etch/evolution/debian/patches/55_fi-translation-fix.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/55_fi-translation-fix.patch?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/patches/55_fi-translation-fix.patch (original)
+++ etch/evolution/debian/patches/55_fi-translation-fix.patch Thu Jul 19 17:41:03 2007
@@ -1,12 +1,12 @@
-diff -urN evolution-2.4.1.orig/po/fi.po evolution-2.4.1/po/fi.po
---- evolution-2.4.1.orig/po/fi.po 2005-09-08 08:58:56.000000000 +0200
-+++ evolution-2.4.1/po/fi.po 2005-11-11 13:50:14.000000000 +0100
-@@ -6188,7 +6188,7 @@
-
- #: ../calendar/gui/dialogs/recurrence-page.c:989
+diff -ru evolution-2.6.2.orig/po/fi.po evolution-2.6.2/po/fi.po
+--- evolution-2.6.2.orig/po/fi.po 2006-05-29 09:11:24.000000000 +0200
++++ evolution-2.6.2/po/fi.po 2006-05-30 21:07:05.000000000 +0200
+@@ -6391,7 +6391,7 @@
+ #.
+ #: ../calendar/gui/dialogs/recurrence-page.c:998
msgid "second"
-msgstr "sekunti"
+msgstr "toinen"
- #: ../calendar/gui/dialogs/recurrence-page.c:990
- msgid "third"
+ #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+ #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
Added: etch/evolution/debian/patches/56_pt_br-translation-fixes.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/56_pt_br-translation-fixes.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/56_pt_br-translation-fixes.patch (added)
+++ etch/evolution/debian/patches/56_pt_br-translation-fixes.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,12 @@
+diff -Nur evolution-2.6.3/po/pt_BR.po evolution-2.6.3.new/po/pt_BR.po
+--- evolution-2.6.3/po/pt_BR.po 2006-03-11 03:55:30.000000000 +0100
++++ evolution-2.6.3.new/po/pt_BR.po 2007-01-23 22:12:22.000000000 +0100
+@@ -14892,7 +14892,7 @@
+
+ #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+ msgid "Default Sources"
+-msgstr "Origems Padrões"
++msgstr "Origens Padrões"
+
+ #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+ msgid ""
Added: etch/evolution/debian/patches/60_alarm-list-dialog-peek.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/60_alarm-list-dialog-peek.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/60_alarm-list-dialog-peek.patch (added)
+++ etch/evolution/debian/patches/60_alarm-list-dialog-peek.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,11 @@
+diff -ru evolution-2.6.1.orig/calendar/gui/dialogs/alarm-list-dialog.h evolution-2.6.1/calendar/gui/dialogs/alarm-list-dialog.h
+--- evolution-2.6.1.orig/calendar/gui/dialogs/alarm-list-dialog.h 2004-06-23 00:35:41.000000000 +0200
++++ evolution-2.6.1/calendar/gui/dialogs/alarm-list-dialog.h 2006-05-03 23:13:32.000000000 +0200
+@@ -32,6 +32,7 @@
+ G_BEGIN_DECLS
+
+ gboolean alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store);
++GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store);
+
+ G_END_DECLS
+
Added: etch/evolution/debian/patches/60_new_addressbook_set_relative_url.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/60_new_addressbook_set_relative_url.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/60_new_addressbook_set_relative_url.patch (added)
+++ etch/evolution/debian/patches/60_new_addressbook_set_relative_url.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,29 @@
+--- evolution-2.6.1.orig/addressbook/gui/widgets/eab-config.c 2005-01-31 22:59:17.000000000 +0100
++++ evolution-2.6.1/addressbook/gui/widgets/eab-config.c 2006-05-08 01:30:57.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #endif
+
++#include <libedataserver/e-source.h>
+ #include "eab-config.h"
+
+ static GObjectClass *ecp_parent_class;
+@@ -136,6 +137,18 @@
+ eab_config_target_new_source (EABConfig *ecp, struct _ESource *source)
+ {
+ EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t));
++ char *uri_text;
++ const char *relative_uri;
++
++ /* For local sources, use uid as relative_uri */
++ uri_text = e_source_get_uri (source);
++ if (!strncmp (uri_text, "file", 4)) {
++ relative_uri = e_source_peek_relative_uri (source);
++ if (!relative_uri || !*relative_uri) {
++ e_source_set_relative_uri (source, e_source_peek_uid (source));
++ }
++ }
++ g_free (uri_text);
+
+ t->source = source;
+ g_object_ref (source);
Added: etch/evolution/debian/patches/61_itip-formatter-date-in-past.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/61_itip-formatter-date-in-past.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/61_itip-formatter-date-in-past.patch (added)
+++ etch/evolution/debian/patches/61_itip-formatter-date-in-past.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,23 @@
+diff -ruN evolution-2.6.1.orig/plugins/itip-formatter/itip-view.c evolution-2.6.1/plugins/itip-formatter/itip-view.c
+--- evolution-2.6.1.orig/plugins/itip-formatter/itip-view.c 2006-01-27 17:33:57.000000000 +0100
++++ evolution-2.6.1/plugins/itip-formatter/itip-view.c 2006-05-26 11:22:05.000000000 +0200
+@@ -148,7 +148,8 @@
+
+ /* Calculate a normalized "tomorrow" */
+ tomorrow_tm = *current_tm;
+- if (tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) {
++ /* Don't need this if date is in the past. Also, year assumption won't fail. */
++ if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) {
+ tomorrow_tm.tm_mday = 1;
+ if (tomorrow_tm.tm_mon == 11) {
+ tomorrow_tm.tm_mon = 1;
+@@ -162,7 +163,8 @@
+
+ /* Calculate a normalized "next seven days" */
+ week_tm = *current_tm;
+- if (week_tm.tm_mday + 6 > time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) {
++ /* Don't need this if date is in the past. Also, year assumption won't fail. */
++ if (date_tm->tm_year >= current_tm->tm_year && week_tm.tm_mday + 6 > time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) {
+ week_tm.tm_mday = (week_tm.tm_mday + 6) % time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon);
+ if (week_tm.tm_mon == 11) {
+ week_tm.tm_mon = 1;
Added: etch/evolution/debian/patches/65_null-camel-exception.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/65_null-camel-exception.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/65_null-camel-exception.patch (added)
+++ etch/evolution/debian/patches/65_null-camel-exception.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,41 @@
+diff -urN evolution-2.6.1.orig/mail/mail-send-recv.c evolution-2.6.1/mail/mail-send-recv.c
+--- evolution-2.6.1.orig/mail/mail-send-recv.c 2006-02-13 14:59:45.000000000 +0100
++++ evolution-2.6.1/mail/mail-send-recv.c 2006-05-14 12:07:28.000000000 +0200
+@@ -285,13 +285,17 @@
+ static send_info_t get_receive_type(const char *url)
+ {
+ CamelProvider *provider;
++ CamelException *ex;
+
+ /* HACK: since mbox is ALSO used for native evolution trees now, we need to
+ fudge this to treat it as a special 'movemail' source */
+ if (!strncmp(url, "mbox:", 5))
+ return SEND_RECEIVE;
+
+- provider = camel_provider_get(url, NULL);
++ ex = camel_exception_new();
++ provider = camel_provider_get(url, ex);
++ camel_exception_free(ex);
++
+ if (!provider)
+ return SEND_INVALID;
+
+@@ -715,11 +719,16 @@
+ struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+ int i;
+ CamelFolder *folder;
++ CamelException *ex;
+
+ for (i=0;i<m->folders->len;i++) {
+- folder = mail_tool_uri_to_folder(m->folders->pdata[i], 0, NULL);
++ ex = camel_exception_new();
++ folder = mail_tool_uri_to_folder(m->folders->pdata[i], 0, ex);
++ camel_exception_free(ex);
+ if (folder) {
+- camel_folder_refresh_info(folder, NULL);
++ ex = camel_exception_new();
++ camel_folder_refresh_info(folder, ex);
++ camel_exception_free(ex);
+ camel_object_unref(folder);
+ }
+ if (camel_operation_cancel_check(m->info->cancel))
Added: etch/evolution/debian/patches/70_no-mail-remote-plugin.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/70_no-mail-remote-plugin.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/70_no-mail-remote-plugin.patch (added)
+++ etch/evolution/debian/patches/70_no-mail-remote-plugin.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,22 @@
+--- configure.in.orig 2006-08-02 01:17:14.950332992 +0200
++++ configure.in 2006-08-02 01:17:37.473908888 +0200
+@@ -1430,7 +1430,7 @@
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+
+-plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
++plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting prefer-plain save-attachments"
+ plugins_experimental="$plugins_experimental_always $IPOD_SYNC"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync"
+
+--- configure.orig 2006-08-02 01:17:19.854587432 +0200
++++ configure 2006-08-02 01:18:15.676101272 +0200
+@@ -32979,7 +32979,7 @@
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+
+-plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
++plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting prefer-plain save-attachments"
+ plugins_experimental="$plugins_experimental_always $IPOD_SYNC"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync"
+
Added: etch/evolution/debian/patches/90_build_with_new_pisock.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/90_build_with_new_pisock.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/90_build_with_new_pisock.patch (added)
+++ etch/evolution/debian/patches/90_build_with_new_pisock.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,907 @@
+diff -Nur evolution-2.8.0/addressbook/conduit/address-conduit.c evolution-2.8.0.new/addressbook/conduit/address-conduit.c
+--- evolution-2.8.0/addressbook/conduit/address-conduit.c 2005-12-06 09:43:37.000000000 +0100
++++ evolution-2.8.0.new/addressbook/conduit/address-conduit.c 2006-09-20 18:47:49.000000000 +0200
+@@ -462,6 +462,7 @@
+ {
+ static char buff[ 4096 ];
+ struct Address addr;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+@@ -469,7 +470,10 @@
+ }
+
+ memset (&addr, 0, sizeof (struct Address));
+- unpack_Address (&addr, remote->record, remote->length);
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Address(&addr, &piBuf, address_v1);
+
+ g_snprintf (buff, 4096, "['%s' '%s' '%s']",
+ addr.entry[entryLastname] ?
+@@ -786,12 +790,23 @@
+ }
+ }
+
++/* convert a local EAddrLocalRecord to a GnomePilotRecord for the PDA
++ *
++ * @param local local Evolution address record
++ * @param ctxt conduit context
++ * @param record record to use for GnomePilotRecord. Allow the calling
++ * function to determine if the record should be allocated
++ * dynamically or statically.
++ * @param maxRecordLen size of *record (max amount of data that can be put
++ * into record)
++ */
+ static GnomePilotRecord
+ local_record_to_pilot_record (EAddrLocalRecord *local,
+- EAddrConduitContext *ctxt)
++ EAddrConduitContext *ctxt,
++ unsigned char *record,
++ int maxRecordLen)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
+
+ g_assert (local->addr != NULL );
+
+@@ -802,10 +817,25 @@
+ p.attr = local->local.attr;
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
++
++ memset(record, 0, maxRecordLen);
+
+ /* Generate pilot record structure */
+- p.record = record;
+- p.length = pack_Address (local->addr, p.record, 0xffff);
++ {
++ pi_buffer_t piBuf;
++ memset (&piBuf, 0, sizeof (piBuf));
++
++ pack_Address(local->addr, &piBuf, address_v1);
++ if(piBuf.used > 0) {
++ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
++ }
++
++ p.length = piBuf.used;
++ p.record = record;
++ if(piBuf.data) {
++ free(piBuf.data);
++ }
++ }
+
+ return p;
+ }
+@@ -834,16 +864,26 @@
+ */
+ if (local->local.ID != 0) {
+ struct Address addr;
+- char record[0xffff];
++ pi_buffer_t *piBuf;
+ int cat = 0;
++ int dlpReadRetval = 0;
++
+
+- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+- ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN( _("local_record_from_ecard: no more memory to allocate") );
++ return;
++ }
++ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
++ ctxt->dbi->db_handle,
++ local->local.ID, piBuf,
++ NULL, NULL, &cat);
++
++
++ if (dlpReadRetval > 0) {
+ local->local.category = cat;
+ memset (&addr, 0, sizeof (struct Address));
+- unpack_Address (&addr, record, 0xffff);
++ unpack_Address(&addr, piBuf, address_v1);
+ for (i = 0; i < 5; i++) {
+ if (addr.entry[entryPhone1 + i])
+ local->addr->entry[entryPhone1 + i] =
+@@ -858,6 +898,8 @@
+ }
+ free_Address (&addr);
+ }
++
++ pi_buffer_free(piBuf);
+ }
+
+ local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
+@@ -1022,7 +1064,13 @@
+
+ g_return_val_if_fail(remote!=NULL,NULL);
+ memset (&address, 0, sizeof (struct Address));
+- unpack_Address (&address, remote->record, remote->length);
++ {
++ pi_buffer_t piBuf;
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Address(&address, &piBuf, address_v1);
++ }
+
+ if (in_contact == NULL)
+ contact = e_contact_new ();
+@@ -1212,7 +1260,7 @@
+ EBookQuery *query;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *piBuf;
+ char *filename;
+ char *change_id;
+ char *auth;
+@@ -1302,9 +1350,14 @@
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
+- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
++ gnome_pilot_conduit_error (conduit,
++ _("pre_sync(): Error allocating pi_buffer_t memory"));
++ return -1;
++ }
++ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Address application block"));
+@@ -1313,8 +1366,8 @@
+ _("Could not read pilot's Address application block"));
+ return -1;
+ }
+- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_AddressAppInfo (&(ctxt->ai), piBuf->data, len);
++ pi_buffer_free(piBuf);
+
+ check_for_slow_setting (conduit, ctxt);
+ if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
+@@ -1494,6 +1547,7 @@
+ {
+ GnomePilotRecord local_pilot;
+ int retval = 0;
++ static unsigned char record[0xffff];
+
+ LOG (g_message ("compare: local=%s remote=%s...\n",
+ print_local (local), print_remote (remote)));
+@@ -1501,7 +1555,7 @@
+ g_return_val_if_fail (local != NULL, -1);
+ g_return_val_if_fail (remote != NULL, -1);
+
+- local_pilot = local_record_to_pilot_record (local, ctxt);
++ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ if (remote->length != local_pilot.length
+ || memcmp (local_pilot.record, remote->record, remote->length))
+@@ -1693,9 +1747,11 @@
+ GnomePilotRecord *remote,
+ EAddrConduitContext *ctxt)
+ {
++ static unsigned char record[0xffff];
++
+ LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
+
+- *remote = local_record_to_pilot_record (local, ctxt);
++ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ return 0;
+ }
+diff -Nur evolution-2.8.0/calendar/conduits/calendar/calendar-conduit.c evolution-2.8.0.new/calendar/conduits/calendar/calendar-conduit.c
+--- evolution-2.8.0/calendar/conduits/calendar/calendar-conduit.c 2005-12-23 05:39:34.000000000 +0100
++++ evolution-2.8.0.new/calendar/conduits/calendar/calendar-conduit.c 2006-09-20 18:48:56.000000000 +0200
+@@ -413,6 +413,7 @@
+ {
+ static char buff[ 4096 ];
+ struct Appointment appt;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+@@ -420,7 +421,10 @@
+ }
+
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, remote->record, remote->length);
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Appointment(&appt, &piBuf, datebook_v1);
+
+ g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
+ mktime (&appt.begin),
+@@ -813,12 +817,23 @@
+ return TRUE;
+ }
+
++/* convert a local ECalLocalRecord to a GnomePilotRecord for the PDA
++ *
++ * @param local local Evolution Calendar record
++ * @param ctxt conduit context
++ * @param record record to use for GnomePilotRecord. Allow the calling
++ * function to determine if the record should be allocated
++ * dynamically or statically.
++ * @param maxRecordLen size of *record (max amount of data that can be put
++ * into record)
++ */
+ static GnomePilotRecord
+ local_record_to_pilot_record (ECalLocalRecord *local,
+- ECalConduitContext *ctxt)
++ ECalConduitContext *ctxt,
++ unsigned char *record,
++ int maxRecordLen)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
+
+ g_assert (local->comp != NULL);
+ g_assert (local->appt != NULL );
+@@ -829,9 +844,25 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset(record, 0, maxRecordLen);
++
+ /* Generate pilot record structure */
+- p.record = record;
+- p.length = pack_Appointment (local->appt, p.record, 0xffff);
++ {
++
++ pi_buffer_t piBuf;
++ memset (&piBuf, 0, sizeof (piBuf));
++
++ pack_Appointment(local->appt, &piBuf, datebook_v1);
++ if(piBuf.used > 0) {
++ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
++ }
++
++ p.length = piBuf.used;
++ p.record = record;
++ if(piBuf.data) {
++ free(piBuf.data);
++ }
++ }
+
+ return p;
+ }
+@@ -867,22 +898,31 @@
+ * we don't overwrite them
+ */
+ if (local->local.ID != 0) {
+- struct Appointment appt;
+- char record[0xffff];
++ struct Appointment appt;
++ pi_buffer_t *piBuf;
+ int cat = 0;
++ int dlpReadRetval = 0;
+
+- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+- ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN( _("local_record_from_comp: no more memory to allocate") );
++ return;
++ }
++ dlpReadRetval = dlp_ReadRecordById (ctxt->dbi->pilot_socket,
++ ctxt->dbi->db_handle,
++ local->local.ID, piBuf,
++ NULL, NULL, &cat);
++
++ if (dlpReadRetval > 0) {
+ local->local.category = cat;
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, record, 0xffff);
++ unpack_Appointment (&appt, piBuf, datebook_v1);
+ local->appt->alarm = appt.alarm;
+ local->appt->advance = appt.advance;
+ local->appt->advanceUnits = appt.advanceUnits;
+ free_Appointment (&appt);
+ }
++ pi_buffer_free(piBuf);
+ }
+
+ /* STOP: don't replace these with g_strdup, since free_Appointment
+@@ -1144,7 +1184,13 @@
+ g_return_val_if_fail (remote != NULL, NULL);
+
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, remote->record, remote->length);
++ {
++ pi_buffer_t piBuf;
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Appointment(&appt, &piBuf, datebook_v1);
++ }
+
+ if (in_comp == NULL) {
+ comp = e_cal_component_new ();
+@@ -1409,7 +1455,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *removed = NULL, *added = NULL, *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *piBuf;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -1521,9 +1567,14 @@
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
+- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
++ gnome_pilot_conduit_error (conduit,
++ _("pre_sync(): Error allocating pi_buffer_t memory"));
++ return -1;
++ }
++ len = dlp_ReadAppBlock(dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Calendar application block"));
+@@ -1532,8 +1583,8 @@
+ _("Could not read pilot's Calendar application block"));
+ return -1;
+ }
+- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_AppointmentAppInfo (&(ctxt->ai), piBuf->data, len);
++ pi_buffer_free(piBuf);
+
+ check_for_slow_setting (conduit, ctxt);
+ if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
+@@ -1715,6 +1766,7 @@
+ /* used by the quick compare */
+ GnomePilotRecord local_pilot;
+ int retval = 0;
++ static unsigned char record[0xffff];
+
+ LOG (g_message ("compare: local=%s remote=%s...\n",
+ print_local (local), print_remote (remote)));
+@@ -1722,7 +1774,7 @@
+ g_return_val_if_fail (local!=NULL,-1);
+ g_return_val_if_fail (remote!=NULL,-1);
+
+- local_pilot = local_record_to_pilot_record (local, ctxt);
++ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ if (remote->length != local_pilot.length
+ || memcmp (local_pilot.record, remote->record, remote->length))
+@@ -1883,9 +1935,11 @@
+ GnomePilotRecord *remote,
+ ECalConduitContext *ctxt)
+ {
++ static unsigned char record[0xffff];
++
+ LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
+
+- *remote = local_record_to_pilot_record (local, ctxt);
++ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ return 0;
+ }
+diff -Nur evolution-2.8.0/calendar/conduits/memo/memo-conduit.c evolution-2.8.0.new/calendar/conduits/memo/memo-conduit.c
+--- evolution-2.8.0/calendar/conduits/memo/memo-conduit.c 2005-10-19 13:39:35.000000000 +0200
++++ evolution-2.8.0.new/calendar/conduits/memo/memo-conduit.c 2006-09-20 18:49:46.000000000 +0200
+@@ -331,6 +331,7 @@
+ {
+ static char buff[ 64 ];
+ struct Memo memo;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+@@ -338,7 +339,10 @@
+ }
+
+ memset (&memo, 0, sizeof (struct Memo));
+- unpack_Memo (&memo, remote->record, remote->length);
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Memo(&memo, &piBuf, memo_v1);
+
+ g_snprintf (buff, 64, "['%s']",
+ memo.text ?
+@@ -446,12 +450,24 @@
+ }
+ }
+
++/**
++ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
++ *
++ * @param local local Evolution memo record
++ * @param ctxt conduit context
++ * @param record record to use for GnomePilotRecord. Allow the calling
++ * function to determine if the record should be allocated
++ * dynamically or statically.
++ * @param maxRecordLen size of *record (max amount of data that can be put
++ * into record)
++ */
+ static GnomePilotRecord
+ local_record_to_pilot_record (EMemoLocalRecord *local,
+- EMemoConduitContext *ctxt)
++ EMemoConduitContext *ctxt,
++ unsigned char *record,
++ int maxRecordLen)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
+
+ g_assert (local->comp != NULL);
+ g_assert (local->memo != NULL );
+@@ -464,9 +480,25 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset(record, 0, maxRecordLen);
++
+ /* Generate pilot record structure */
+- p.record = record;
+- p.length = pack_Memo (local->memo, p.record, 0xffff);
++ {
++
++ pi_buffer_t piBuf;
++ memset (&piBuf, 0, sizeof (piBuf));
++
++ pack_Memo(local->memo, &piBuf, memo_v1);
++ if(piBuf.used > 0) {
++ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
++ }
++
++ p.length = piBuf.used;
++ p.record = record;
++ if(piBuf.data) {
++ free(piBuf.data);
++ }
++ }
+
+ return p;
+ }
+@@ -483,53 +515,39 @@
+ {
+ int i, j;
+ int retval = 0; /* 0 is the Unfiled category */
+- LOG(fprintf(stderr, "add_category_if_possible: called\n"));
++ LOG(g_message("add_category_if_possible\n"));
+
+ for(i=0; i<16; i++){
+ /* if strlen is 0, then the category is empty
+ the PalmOS doesn't let 0-length strings for
+ categories */
+- LOG(fprintf(stderr, "add_category_if_possible: calling strlen, i==%d\n", i));
+ if(strlen(category->name[i]) == 0){
+ int cat_to_add_len;
+- LOG(fprintf(stderr, "add_category_if_possible: strlen == 0\n"));
+
+ cat_to_add_len = strlen(cat_to_add);
+- LOG(fprintf(stderr, "add_category_if_possible: cat_to_add_len: %d\n",
+- cat_to_add_len));
+ retval = i;
+
+ /* only 15 characters for category, 16th is
+ * '\0' can't do direct mem transfer due to
+ * declaration type
+ */
+- LOG(fprintf(stderr, "add_category_if_possible: copying first 15 of category\n"));
+ for(j=0; j<cat_to_add_len; j++){
+ category->name[i][j] = cat_to_add[j];
+ }
+- LOG(fprintf(stderr,
+- "add_category_if_possible: setting from %d to i==15 to \\0\n",
+- cat_to_add_len));
+
+ for(j=cat_to_add_len; j<16; j++)
+ category->name[i][j] = '\0';
+
+- LOG(fprintf(stderr, "add_category_if_possible: setting ID[%d] to %d\n",
+- category->ID[i], lastDesktopUniqueID));
+ category->ID[i] = lastDesktopUniqueID;
+ lastDesktopUniqueID++;
+-
+- LOG(fprintf(stderr, "add_category_if_possible: setting renamed[%d] to TRUE\n", i));
+ category->renamed[i] = TRUE;
+
+- LOG(g_message("*** adding category '%s', ID %d ***",
+- category->name[i], category->ID[i]));
+ break;
+ }
+ }
+
+ if(retval == 0){
+- LOG(g_message("*** not adding category - category list already full ***"));
++ LOG(g_warning( _("*** not adding category - category list already full ***") ));
+ }
+
+ return retval;
+@@ -554,31 +572,35 @@
+ local->comp = comp;
+ g_object_ref (comp);
+
+- LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_uid\n"));
+ e_cal_component_get_uid (local->comp, &uid);
+- LOG(fprintf(stderr, "local_record_from_comp: got UID - %s, calling e_pilot_map_lookup_pid\n", uid));
+ local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
+- LOG(fprintf(stderr, "local_record_from_comp: local->local.ID == %lu\n", local->local.ID));
+
+ compute_status (ctxt, local, uid);
+-
+- LOG(fprintf(stderr, "local_record_from_comp: local->local.attr: %d\n", local->local.attr));
+
+ local->memo = g_new0 (struct Memo,1);
+
+ /* Don't overwrite the category */
+ if (local->local.ID != 0) {
+- char record[0xffff];
+ int cat = 0;
++ int dlpReadRetval = 0;
++ pi_buffer_t *piBuf;
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN( _("local_record_from_comp: no more memory to allocate") );
++ return;
++ }
+
+- LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
+- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+- ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
++ ctxt->dbi->db_handle,
++ local->local.ID, piBuf,
++ NULL, NULL, &cat);
++
++
++ if (dlpReadRetval > 0) {
+ local->local.category = cat;
+ }
+- LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
++
++ pi_buffer_free(piBuf);
+ }
+
+ /*
+@@ -589,34 +611,23 @@
+ int cat = -1;
+ int i;
+
+- LOG(fprintf(stderr, "local_record_from_comp: trying to set category"));
+- LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_categories_list\n"));
+-
+ e_cal_component_get_categories_list(comp, &categ_list_head);
+- LOG(fprintf(stderr, "local_record_from_comp: got list, setting categ_list_cur to head\n"));
+
+ categ_list_cur = categ_list_head;
+ while (categ_list_cur && cat == -1)
+ {
+- LOG(fprintf(stderr, "local_record_from_comp: iterating, data == %s",
+- (char *)categ_list_cur->data));
+ for(i=0; i<16; i++){
+- LOG(fprintf(stderr, "local_record_from_comp: i == %d\n", i));
+ if(strcmp((char *)categ_list_cur->data,
+ ctxt->ai.category.name[i]) == 0){
+ cat = i;
+- LOG(fprintf(stderr, "local_record_from_comp: found category, name: %s\n",
+- ctxt->ai.category.name[i]));
+ break;
+ }
+ }
+
+- LOG(fprintf(stderr, "local_record_from_comp: calling g_slist_next\n"));
+ categ_list_cur = g_slist_next(categ_list_cur);
+ }
+
+ if(cat != -1){
+- LOG(fprintf(stderr, "local_record_from_comp: setting category\n"));
+ local->local.category = cat;
+ }
+ else if(categ_list_head != NULL){
+@@ -708,7 +719,13 @@
+ g_return_val_if_fail (remote != NULL, NULL);
+
+ memset (&memo, 0, sizeof (struct Memo));
+- unpack_Memo (&memo, remote->record, remote->length);
++ {
++ pi_buffer_t piBuf;
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_Memo(&memo, &piBuf, memo_v1);
++ }
+
+ utc_zone = icaltimezone_get_utc_timezone ();
+ now = icaltime_from_timet_with_zone (time (NULL), FALSE,
+@@ -836,7 +853,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *piBuf;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -929,9 +946,14 @@
+ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
+ num_records, add_records, mod_records, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
+- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
++ gnome_pilot_conduit_error (conduit,
++ _("pre_sync(): Error allocating pi_buffer_t memory"));
++ return -1;
++ }
++ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Memo application block"));
+@@ -940,8 +962,9 @@
+ _("Could not read pilot's Memo application block"));
+ return -1;
+ }
+- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++
++ unpack_MemoAppInfo (&(ctxt->ai), piBuf->data, len);
++ pi_buffer_free(piBuf);
+
+ lastDesktopUniqueID = 128;
+
+@@ -963,6 +986,9 @@
+ unsigned char *buf;
+ int dlpRetVal, len;
+
++ /* Write AppBlock to PDA - updates categories */
++ /* NOTE: not changed for pilot-link 0.12 because the two
++ * functions below didn't change */
+ buf = (unsigned char*)g_malloc (0xffff);
+
+ len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
+@@ -1156,6 +1182,7 @@
+ /* used by the quick compare */
+ GnomePilotRecord local_pilot;
+ int retval = 0;
++ static unsigned char record[0xffff];
+
+ LOG (g_message ("compare: local=%s remote=%s...\n",
+ print_local (local), print_remote (remote)));
+@@ -1163,7 +1190,7 @@
+ g_return_val_if_fail (local!=NULL,-1);
+ g_return_val_if_fail (remote!=NULL,-1);
+
+- local_pilot = local_record_to_pilot_record (local, ctxt);
++ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ if (remote->length != local_pilot.length
+ || memcmp (local_pilot.record, remote->record, remote->length))
+@@ -1319,9 +1346,10 @@
+ GnomePilotRecord *remote,
+ EMemoConduitContext *ctxt)
+ {
++ static unsigned char record[0xffff];
+ LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
+
+- *remote = local_record_to_pilot_record (local, ctxt);
++ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ return 0;
+ }
+diff -Nur evolution-2.8.0/calendar/conduits/todo/todo-conduit.c evolution-2.8.0.new/calendar/conduits/todo/todo-conduit.c
+--- evolution-2.8.0/calendar/conduits/todo/todo-conduit.c 2006-05-13 09:56:49.000000000 +0200
++++ evolution-2.8.0.new/calendar/conduits/todo/todo-conduit.c 2006-09-20 18:50:31.000000000 +0200
+@@ -409,7 +409,13 @@
+ }
+
+ memset (&todo, 0, sizeof (struct ToDo));
+- unpack_ToDo (&todo, remote->record, remote->length);
++ {
++ pi_buffer_t piBuf;
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_ToDo(&todo, &piBuf, todo_v1);
++ }
+
+ g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
+ todo.indefinite,
+@@ -589,12 +595,24 @@
+ }
+ }
+
++/**
++ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
++ *
++ * @param local local Evolution memo record
++ * @param ctxt conduit context
++ * @param record record to use for GnomePilotRecord. Allow the calling
++ * function to determine if the record should be allocated
++ * dynamically or statically.
++ * @param maxRecordLen size of *record (max amount of data that can be put
++ * into record)
++ */
+ static GnomePilotRecord
+ local_record_to_pilot_record (EToDoLocalRecord *local,
+- EToDoConduitContext *ctxt)
++ EToDoConduitContext *ctxt,
++ unsigned char *record,
++ int maxRecordLen)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
+
+ g_assert (local->comp != NULL);
+ g_assert (local->todo != NULL );
+@@ -607,9 +625,24 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset(record, 0, maxRecordLen);
++
+ /* Generate pilot record structure */
+- p.record = record;
+- p.length = pack_ToDo (local->todo, p.record, 0xffff);
++ {
++ pi_buffer_t piBuf;
++ memset (&piBuf, 0, sizeof (piBuf));
++
++ pack_ToDo(local->todo, &piBuf, todo_v1);
++ if(piBuf.used > 0) {
++ memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
++ }
++
++ p.length = piBuf.used;
++ p.record = record;
++ if(piBuf.data) {
++ free(piBuf.data);
++ }
++ }
+
+ return p;
+ }
+@@ -696,15 +729,23 @@
+
+ /* Don't overwrite the category */
+ if (local->local.ID != 0) {
+- char record[0xffff];
+ int cat = 0;
+-
+- if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+- ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ int dlpReadRetval = 0;
++ pi_buffer_t *piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN( _("local_record_from_comp: no more memory to allocate") );
++ return;
++ }
++ dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
++ ctxt->dbi->db_handle,
++ local->local.ID, piBuf,
++ NULL, NULL, &cat);
++
++ if (dlpReadRetval > 0) {
+ local->local.category = cat;
+ }
++
++ pi_buffer_free(piBuf);
+ }
+
+ /*
+@@ -864,7 +905,13 @@
+ g_return_val_if_fail (remote != NULL, NULL);
+
+ memset (&todo, 0, sizeof (struct ToDo));
+- unpack_ToDo (&todo, remote->record, remote->length);
++ {
++ pi_buffer_t piBuf;
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++ unpack_ToDo(&todo, &piBuf, todo_v1);
++ }
+
+ utc_zone = icaltimezone_get_utc_timezone ();
+ now = icaltime_from_timet_with_zone (time (NULL), FALSE,
+@@ -1014,7 +1061,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *piBuf;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -1104,9 +1151,14 @@
+ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
+ num_records, add_records, mod_records, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
+- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ piBuf = pi_buffer_new(0xffff);
++ if(piBuf == NULL) {
++ WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
++ gnome_pilot_conduit_error (conduit,
++ _("pre_sync(): Error allocating pi_buffer_t memory"));
++ return -1;
++ }
++ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's ToDo application block"));
+@@ -1115,8 +1167,9 @@
+ _("Could not read pilot's ToDo application block"));
+ return -1;
+ }
+- unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++
++ unpack_ToDoAppInfo (&(ctxt->ai), piBuf->data, len);
++ pi_buffer_free(piBuf);
+
+ lastDesktopUniqueID = 128;
+
+@@ -1138,6 +1191,9 @@
+ unsigned char *buf;
+ int dlpRetVal, len;
+
++ /* Write AppBlock to PDA - updates categories */
++ /* NOTE: not changed for pilot-link 0.12 because the two
++ * functions below didn't change */
+ buf = (unsigned char*)g_malloc (0xffff);
+
+ len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff);
+@@ -1320,6 +1376,7 @@
+ /* used by the quick compare */
+ GnomePilotRecord local_pilot;
+ int retval = 0;
++ static unsigned char record[0xffff];
+
+ LOG (g_message ("compare: local=%s remote=%s...\n",
+ print_local (local), print_remote (remote)));
+@@ -1327,7 +1384,7 @@
+ g_return_val_if_fail (local!=NULL,-1);
+ g_return_val_if_fail (remote!=NULL,-1);
+
+- local_pilot = local_record_to_pilot_record (local, ctxt);
++ local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ if (remote->length != local_pilot.length
+ || memcmp (local_pilot.record, remote->record, remote->length))
+@@ -1484,9 +1541,11 @@
+ GnomePilotRecord *remote,
+ EToDoConduitContext *ctxt)
+ {
++ static unsigned char record[0xffff];
++
+ LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
+
+- *remote = local_record_to_pilot_record (local, ctxt);
++ *remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
+
+ return 0;
+ }
Added: etch/evolution/debian/patches/91_CVE-2007-1002.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/patches/91_CVE-2007-1002.patch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/patches/91_CVE-2007-1002.patch (added)
+++ etch/evolution/debian/patches/91_CVE-2007-1002.patch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,21 @@
+diff -Nur evolution-2.6.3/calendar/gui/e-cal-component-memo-preview.c evolution-2.6.3.new/calendar/gui/e-cal-component-memo-preview.c
+--- evolution-2.6.3/calendar/gui/e-cal-component-memo-preview.c 2006-02-08 05:06:02.000000000 -0800
++++ evolution-2.6.3.new/calendar/gui/e-cal-component-memo-preview.c 2007-03-22 16:16:17.003756408 -0700
+@@ -144,7 +144,7 @@
+ }
+ }
+
+- gtk_html_stream_printf(stream, string->str);
++ gtk_html_stream_printf(stream, "%s", string->str);
+
+ gtk_html_stream_printf(stream, "</H3>");
+
+@@ -184,7 +184,7 @@
+ string = g_string_append_c (string, text.value[i]);
+ }
+
+- gtk_html_stream_printf (stream, string->str);
++ gtk_html_stream_printf (stream, "%s", string->str);
+ g_string_free (string, TRUE);
+ }
+
Modified: etch/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/rules?rev=862&op=diff
==============================================================================
--- etch/evolution/debian/rules (original)
+++ etch/evolution/debian/rules Thu Jul 19 17:41:03 2007
@@ -1,48 +1,40 @@
#!/usr/bin/make -f
-VERSION = $(shell dpkg-parsechangelog | grep Version | sed -e 's/Version: //g' -e 's/-[\.A-Za-z0-9]*$$//g')
-
-
+include /usr/share/cdbs/1/rules/buildvars.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.4
-DEB_DH_MAKESHLIBS_ARGS_evolution := -V'evolution (>= ${VERSION})'
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
-# DEB_INSTALL_DOCS_ALL :=
-DEB_DH_INSTALL_ARGS :=
+DEB_SHLIBDEPS_INCLUDE += debian/evolution/usr/lib/evolution/2.6
+DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts
+DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts
+DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts
-ELIBDIR := usr/lib/evolution/2.4
+ELIBDIR := usr/lib/evolution/2.6
-clean::
- dh_clean intltool-extract intltool-merge intltool-update \
- .po/.intltool-merge-cache
- find -name '*.desktop' | xargs rm -f
- find -name '*.schemas' | xargs rm -f
- $(MAKE) -f debian/rules reverse-config
+CFLAGS += -fPIC
-CFLAGS := -fPIC
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
- --with-nspr-includes=/usr/include/mozilla/nspr \
- --with-nss-includes=/usr/include/mozilla/nss \
- --with-nspr-libs=/usr/lib/mozilla \
- --with-nss-libs=/usr/lib/mozilla \
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-nspr-includes=/usr/include/nspr \
+ --with-nss-includes=/usr/include/nss \
--with-openldap \
--enable-nls \
--without-openssl-includes \
--without-openssl-libs \
--disable-gtk-doc \
--enable-pilot-conduits \
- --with-krb4=/usr \
+ --without-krb4 \
--with-krb5=/usr \
--enable-ipv6 \
--disable-openssl \
--sysconfdir=/etc \
--enable-nntp \
--libexecdir=/usr/lib \
- --enable-plugins=all
+ --enable-plugins=experimental
+clean::
+ find -name '*.schemas' | xargs rm -f
Added: etch/evolution/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/etch/evolution/debian/watch?rev=862&op=file
==============================================================================
--- etch/evolution/debian/watch (added)
+++ etch/evolution/debian/watch Thu Jul 19 17:41:03 2007
@@ -1,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/evolution/2.6/evolution-([\d\.]+)\.tar\.gz debian uupdate
More information about the pkg-evolution-commits
mailing list