r2324 - in /unstable/evolution-data-server/debian: changelog control patches/01_Save_also_UID_REV_in_WebDAV_backend.patch patches/02-Check_email_value_in_e_destination_set_contact.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Thu Jan 31 12:55:23 UTC 2013
Author: bigon
Date: Thu Jan 31 12:55:22 2013
New Revision: 2324
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2324
Log:
* d/p/01_Save_also_UID_REV_in_WebDAV_backend.patch: Save contact UID value
when exporting to WebDAV (CardDAV) backend (Closes: #699353)
* d/p/02-Check_email_value_in_e_destination_set_contact.patch: Properly
check email value in e_destination_set_contact() to avoid crash in some
conditions (Closes: #687951)
* debian/control: Add myself as an Uploaders
Added:
unstable/evolution-data-server/debian/patches/01_Save_also_UID_REV_in_WebDAV_backend.patch
unstable/evolution-data-server/debian/patches/02-Check_email_value_in_e_destination_set_contact.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/patches/series
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2324&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Thu Jan 31 12:55:22 2013
@@ -1,3 +1,14 @@
+evolution-data-server (3.4.4-2) UNRELEASED; urgency=low
+
+ * d/p/01_Save_also_UID_REV_in_WebDAV_backend.patch: Save contact UID value
+ when exporting to WebDAV (CardDAV) backend (Closes: #699353)
+ * d/p/02-Check_email_value_in_e_destination_set_contact.patch: Properly
+ check email value in e_destination_set_contact() to avoid crash in some
+ conditions (Closes: #687951)
+ * debian/control: Add myself as an Uploaders
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 31 Jan 2013 10:51:58 +0100
+
evolution-data-server (3.4.4-1) unstable; urgency=low
* New upstream bugfix release.
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=2324&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Thu Jan 31 12:55:22 2013
@@ -12,7 +12,8 @@
Pedro Fragoso <ember at ubuntu.com>,
Josselin Mouette <joss at debian.org>,
David Weinehall <tao at debian.org>,
- Sjoerd Simons <sjoerd at debian.org>
+ Sjoerd Simons <sjoerd at debian.org>,
+ Laurent Bigonville <bigon at debian.org>
Standards-Version: 3.9.3
Dm-Upload-Allowed: yes
Homepage: http://www.gnome.org/projects/evolution/
Added: unstable/evolution-data-server/debian/patches/01_Save_also_UID_REV_in_WebDAV_backend.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_Save_also_UID_REV_in_WebDAV_backend.patch?rev=2324&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_Save_also_UID_REV_in_WebDAV_backend.patch (added)
+++ unstable/evolution-data-server/debian/patches/01_Save_also_UID_REV_in_WebDAV_backend.patch Thu Jan 31 12:55:22 2013
@@ -1,0 +1,19 @@
+From a540f318df15819167108671a472c2b34d3ef0a3 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 22 Oct 2012 09:25:00 +0000
+Subject: Bug #640594 - Save also UID/REV in WebDAV backend (for CardDAV)
+
+---
+--- a/addressbook/backends/webdav/e-book-backend-webdav.c
++++ b/addressbook/backends/webdav/e-book-backend-webdav.c
+@@ -238,10 +238,6 @@ upload_contact (EBookBackendWebdav *webd
+ }
+ }
+
+- /* don't upload the UID and REV fields, they're only interesting inside
+- * evolution and not on the webdav server */
+- e_contact_set (contact, E_CONTACT_UID, NULL);
+- e_contact_set (contact, E_CONTACT_REV, NULL);
+ request = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
+ soup_message_set_request(message, "text/vcard", SOUP_MEMORY_TEMPORARY,
+ request, strlen (request));
Added: unstable/evolution-data-server/debian/patches/02-Check_email_value_in_e_destination_set_contact.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/02-Check_email_value_in_e_destination_set_contact.patch?rev=2324&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/02-Check_email_value_in_e_destination_set_contact.patch (added)
+++ unstable/evolution-data-server/debian/patches/02-Check_email_value_in_e_destination_set_contact.patch Thu Jan 31 12:55:22 2013
@@ -1,0 +1,32 @@
+From ac7de1ebff192bab4e0bc508aa4603132f83e4d5 Mon Sep 17 00:00:00 2001
+From: Paul Menzel <paulepanter at users.sourceforge.net>
+Date: Tue, 27 Nov 2012 08:33:25 +0000
+Subject: Bug #684175 - Check email value in e_destination_set_contact()
+
+---
+diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
+index 0a165a5..e4dd576 100644
+--- a/addressbook/libebook/e-destination.c
++++ b/addressbook/libebook/e-destination.c
+@@ -468,13 +468,13 @@ e_destination_set_contact (EDestination *dest,
+
+ raw = e_vcard_attribute_get_value (attr->data);
+ addr = camel_internet_address_new ();
+- camel_address_unformat (CAMEL_ADDRESS (addr), raw);
+- camel_internet_address_get (addr, 0, &name, &email);
++ if (camel_address_unformat (CAMEL_ADDRESS (addr), raw) > 0 &&
++ camel_internet_address_get (addr, 0, &name, &email)) {
++ e_destination_set_name (s_dest, name);
++ e_destination_set_email (s_dest, email);
+
+- e_destination_set_name (s_dest, name);
+- e_destination_set_email (s_dest, email);
+-
+- dest->priv->list_alldests = g_list_append (dest->priv->list_alldests, s_dest);
++ dest->priv->list_alldests = g_list_append (dest->priv->list_alldests, s_dest);
++ }
+
+ g_object_unref (addr);
+ g_free (raw);
+--
+cgit v0.9.0.2
Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2324&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Thu Jan 31 12:55:22 2013
@@ -1,1 +1,3 @@
+01_Save_also_UID_REV_in_WebDAV_backend.patch
+02-Check_email_value_in_e_destination_set_contact.patch
20_gettext_intltool.patch
More information about the pkg-evolution-commits
mailing list