Attached are a debdiff for this release and its diffstat. It's noisy, as a clean build got rid of *.debhelper.log stuff, but other than that, it's the patch attached. Package builds and works fine, afaict. Jordi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ jordi@sindominio.net jordi@debian.org http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/
diff -Nru evolution-data-server-2.30.3/debian/changelog evolution-data-server-2.30.3/debian/changelog --- evolution-data-server-2.30.3/debian/changelog 2010-09-21 21:00:56.000000000 +0200 +++ evolution-data-server-2.30.3/debian/changelog 2012-03-28 20:26:38.000000000 +0200 @@ -1,3 +1,12 @@ +evolution-data-server (2.30.3-2+squeeze1) unstable; urgency=low + + * Add 02_data_book_respond_get_changes_missing_array_add.patch, to fix + e_book_get_changes() not returning any changes. Fix reported and patch + fished in upstream Git by Chris Frey. Thanks a lot! + (closes: #641898, #658445) + + -- Jordi Mallach <jordi@debian.org> Wed, 28 Mar 2012 20:21:19 +0200 + evolution-data-server (2.30.3-2) unstable; urgency=low [ Josselin Mouette ] diff -Nru evolution-data-server-2.30.3/debian/evolution-data-server-common.debhelper.log evolution-data-server-2.30.3/debian/evolution-data-server-common.debhelper.log --- evolution-data-server-2.30.3/debian/evolution-data-server-common.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/evolution-data-server-common.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/evolution-data-server-dbg.debhelper.log evolution-data-server-2.30.3/debian/evolution-data-server-dbg.debhelper.log --- evolution-data-server-2.30.3/debian/evolution-data-server-dbg.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/evolution-data-server-dbg.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/evolution-data-server.debhelper.log evolution-data-server-2.30.3/debian/evolution-data-server.debhelper.log --- evolution-data-server-2.30.3/debian/evolution-data-server.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/evolution-data-server.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/evolution-data-server-dev.debhelper.log evolution-data-server-2.30.3/debian/evolution-data-server-dev.debhelper.log --- evolution-data-server-2.30.3/debian/evolution-data-server-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/evolution-data-server-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libcamel1.2-14.debhelper.log evolution-data-server-2.30.3/debian/libcamel1.2-14.debhelper.log --- evolution-data-server-2.30.3/debian/libcamel1.2-14.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libcamel1.2-14.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libcamel1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libcamel1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libcamel1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libcamel1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libebackend1.2-0.debhelper.log evolution-data-server-2.30.3/debian/libebackend1.2-0.debhelper.log --- evolution-data-server-2.30.3/debian/libebackend1.2-0.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libebackend1.2-0.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libebackend1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libebackend1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libebackend1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libebackend1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libebook1.2-9.debhelper.log evolution-data-server-2.30.3/debian/libebook1.2-9.debhelper.log --- evolution-data-server-2.30.3/debian/libebook1.2-9.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libebook1.2-9.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libebook1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libebook1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libebook1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libebook1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libecal1.2-7.debhelper.log evolution-data-server-2.30.3/debian/libecal1.2-7.debhelper.log --- evolution-data-server-2.30.3/debian/libecal1.2-7.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libecal1.2-7.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libecal1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libecal1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libecal1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libecal1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedata-book1.2-2.debhelper.log evolution-data-server-2.30.3/debian/libedata-book1.2-2.debhelper.log --- evolution-data-server-2.30.3/debian/libedata-book1.2-2.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedata-book1.2-2.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedata-book1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libedata-book1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libedata-book1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedata-book1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedata-cal1.2-7.debhelper.log evolution-data-server-2.30.3/debian/libedata-cal1.2-7.debhelper.log --- evolution-data-server-2.30.3/debian/libedata-cal1.2-7.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedata-cal1.2-7.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedata-cal1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libedata-cal1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libedata-cal1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedata-cal1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedataserver1.2-13.debhelper.log evolution-data-server-2.30.3/debian/libedataserver1.2-13.debhelper.log --- evolution-data-server-2.30.3/debian/libedataserver1.2-13.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedataserver1.2-13.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedataserver1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libedataserver1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libedataserver1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedataserver1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedataserverui1.2-8.debhelper.log evolution-data-server-2.30.3/debian/libedataserverui1.2-8.debhelper.log --- evolution-data-server-2.30.3/debian/libedataserverui1.2-8.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedataserverui1.2-8.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libedataserverui1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libedataserverui1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libedataserverui1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libedataserverui1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libegroupwise1.2-13.debhelper.log evolution-data-server-2.30.3/debian/libegroupwise1.2-13.debhelper.log --- evolution-data-server-2.30.3/debian/libegroupwise1.2-13.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libegroupwise1.2-13.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libegroupwise1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libegroupwise1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libegroupwise1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libegroupwise1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libgdata1.2-1.debhelper.log evolution-data-server-2.30.3/debian/libgdata1.2-1.debhelper.log --- evolution-data-server-2.30.3/debian/libgdata1.2-1.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libgdata1.2-1.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libgdata1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libgdata1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libgdata1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libgdata1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libgdata-google1.2-1.debhelper.log evolution-data-server-2.30.3/debian/libgdata-google1.2-1.debhelper.log --- evolution-data-server-2.30.3/debian/libgdata-google1.2-1.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libgdata-google1.2-1.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/libgdata-google1.2-dev.debhelper.log evolution-data-server-2.30.3/debian/libgdata-google1.2-dev.debhelper.log --- evolution-data-server-2.30.3/debian/libgdata-google1.2-dev.debhelper.log 2010-09-21 21:15:24.000000000 +0200 +++ evolution-data-server-2.30.3/debian/libgdata-google1.2-dev.debhelper.log 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru evolution-data-server-2.30.3/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch evolution-data-server-2.30.3/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch --- evolution-data-server-2.30.3/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch 1970-01-01 01:00:00.000000000 +0100 +++ evolution-data-server-2.30.3/debian/patches/02_data_book_respond_get_changes_missing_array_add.patch 2012-03-28 20:20:44.000000000 +0200 @@ -0,0 +1,35 @@ +From 15ad5dc232f493afef212a8217e82eedd0fe6e64 Mon Sep 17 00:00:00 2001 +From: Chris Frey <cdfrey@foursquare.net> +Date: Thu, 22 Sep 2011 23:07:29 -0400 +Subject: [PATCH] Fixed libedata-book's e_data_book_respond_get_changes(): missing array add + +When building the get_changes DBUS response, the code forgot to add the +values to the response array, resulting in get_changes calls that never +returned any data. + +This fixes Ubuntu bug: +https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/658459 + +and Debian bug: +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641898 +--- + addressbook/libedata-book/e-data-book.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c +index 7794e8b..d7a2a80 100644 +--- a/addressbook/libedata-book/e-data-book.c ++++ b/addressbook/libedata-book/e-data-book.c +@@ -620,6 +620,10 @@ e_data_book_respond_get_changes (EDataBook *book, guint32 opid, EDataBookStatus + /* Now change->vcard is owned by the GValue */ + + g_free (change); ++ ++ /* append vals to array */ ++ g_ptr_array_add(array, vals); ++ + changes = g_list_remove (changes, change); + } + +-- +1.7.2.3 diff -Nru evolution-data-server-2.30.3/debian/patches/series evolution-data-server-2.30.3/debian/patches/series --- evolution-data-server-2.30.3/debian/patches/series 2010-09-21 00:02:06.000000000 +0200 +++ evolution-data-server-2.30.3/debian/patches/series 2012-03-28 20:21:07.000000000 +0200 @@ -1,4 +1,5 @@ 01_imapx_lockup.patch +02_data_book_respond_get_changes_missing_array_add.patch 25_mute-debug-messages.patch 45_libcamel_providers_version.patch 65_evolution-color.patch
changelog | 9 ++ evolution-data-server-common.debhelper.log | 1 evolution-data-server-dbg.debhelper.log | 1 evolution-data-server-dev.debhelper.log | 1 evolution-data-server.debhelper.log | 1 libcamel1.2-14.debhelper.log | 1 libcamel1.2-dev.debhelper.log | 1 libebackend1.2-0.debhelper.log | 1 libebackend1.2-dev.debhelper.log | 1 libebook1.2-9.debhelper.log | 1 libebook1.2-dev.debhelper.log | 1 libecal1.2-7.debhelper.log | 1 libecal1.2-dev.debhelper.log | 1 libedata-book1.2-2.debhelper.log | 1 libedata-book1.2-dev.debhelper.log | 1 libedata-cal1.2-7.debhelper.log | 1 libedata-cal1.2-dev.debhelper.log | 1 libedataserver1.2-13.debhelper.log | 1 libedataserver1.2-dev.debhelper.log | 1 libedataserverui1.2-8.debhelper.log | 1 libedataserverui1.2-dev.debhelper.log | 1 libegroupwise1.2-13.debhelper.log | 1 libegroupwise1.2-dev.debhelper.log | 1 libgdata-google1.2-1.debhelper.log | 1 libgdata-google1.2-dev.debhelper.log | 1 libgdata1.2-1.debhelper.log | 1 libgdata1.2-dev.debhelper.log | 1 patches/02_data_book_respond_get_changes_missing_array_add.patch | 35 ++++++++++ patches/series | 1 29 files changed, 45 insertions(+), 26 deletions(-)
Attachment:
signature.asc
Description: Digital signature