r878 - in /unstable/evolution-data-server/debian: ./ patches/
giskard at users.alioth.debian.org
giskard at users.alioth.debian.org
Sun Sep 23 14:43:12 UTC 2007
Author: giskard
Date: Sun Sep 23 14:43:12 2007
New Revision: 878
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=878
Log:
* New upstream release
* Adjusted Build-Deps
* Adjusted .install paths to reflect the new upstream.
* Dropped patch:
15_libebook-optimised-folding.patch - Applied upstream.
20_e-book-is-self.patch - Applied upstream.
30_vcf-import-linebreak.patch - Applied upstream.
35_warn-on-server-service-init-failure.patch - Applied upstream.
50_libebook-get-contact-list-prepend.patch - Applied upstream.
65_imap-negative-array-index.patch - Applied upstream.
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/evolution-data-server-common.install
unstable/evolution-data-server/debian/libcamel1.2-dev.install
unstable/evolution-data-server/debian/libebook1.2-dev.install
unstable/evolution-data-server/debian/libecal1.2-dev.install
unstable/evolution-data-server/debian/libedata-book1.2-dev.install
unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
unstable/evolution-data-server/debian/libedataserver1.2-dev.install
unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install
unstable/evolution-data-server/debian/patches/15_libebook-optimised-folding.patch
unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch
unstable/evolution-data-server/debian/patches/30_vcf-import-linebreak.patch
unstable/evolution-data-server/debian/patches/35_warn-on-server-service-init-failure.patch
unstable/evolution-data-server/debian/patches/50_libebook-get-contact-list-prepend.patch
unstable/evolution-data-server/debian/patches/65_imap-negative-array-index.patch
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun Sep 23 14:43:12 2007
@@ -1,3 +1,18 @@
+evolution-data-server (1.12.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Adjusted Build-Deps
+ * Adjusted .install paths to reflect the new upstream.
+ * Dropped patch:
+ 15_libebook-optimised-folding.patch - Applied upstream.
+ 20_e-book-is-self.patch - Applied upstream.
+ 30_vcf-import-linebreak.patch - Applied upstream.
+ 35_warn-on-server-service-init-failure.patch - Applied upstream.
+ 50_libebook-get-contact-list-prepend.patch - Applied upstream.
+ 65_imap-negative-array-index.patch - Applied upstream.
+
+ -- Riccardo Setti <giskard at debian.org> Sun, 23 Sep 2007 12:07:20 +0200
+
evolution-data-server (1.10.3-1) unstable; urgency=low
* New upstream stable release; no API change; bug fixes.
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sun Sep 23 14:43:12 2007
@@ -6,7 +6,9 @@
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>
+ Oystein Gisnas <oystein at gisnas.net>,
+ Riccardo Setti <giskard at debian.org>
+
Build-Depends: debhelper (>= 5.0.0),
cdbs (>= 0.4.37),
dpkg-dev (>= 1.13.19),
@@ -26,10 +28,10 @@
libxml2-dev,
libgconf2-dev,
libnss3-dev,
- libgtk2.0-dev,
+ libgtk2.0-dev (>= 2.10.0),
libgnome2-dev,
libgnomevfs2-dev,
- libsoup2.2-dev (>= 2.2.2),
+ libsoup2.2-dev (>= 2.2.91),
gtk-doc-tools
Standards-Version: 3.7.2
@@ -94,7 +96,8 @@
libglib2.0-dev,
libgconf2-dev,
libbonobo2-dev (>= 2.4.2),
- liborbit2-dev (>= 1:2.9.8)
+ liborbit2-dev (>= 1:2.9.8),
+ libnspr4-dev
Description: Utility library for evolution data servers (development files)
The data server, called "Evolution Data Server" is responsible for managing
calendar and addressbook information.
Modified: unstable/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server-common.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server-common.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/evolution-data-server-1.10
+debian/tmp/usr/share/evolution-data-server-1.12
debian/tmp/usr/share/locale
debian/tmp/usr/share/pixmaps
Modified: unstable/evolution-data-server/debian/libcamel1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libcamel1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/libcamel*.so
debian/tmp/usr/lib/pkgconfig/camel*
-debian/tmp/usr/include/evolution-data-server-1.10/camel
+debian/tmp/usr/include/evolution-data-server-1.12/camel
Modified: unstable/evolution-data-server/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libebook1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebook1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,5 +1,5 @@
debian/tmp/usr/lib/pkgconfig/libebook-1.2.pc
debian/tmp/usr/lib/libebook-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libebook
+debian/tmp/usr/include/evolution-data-server-1.12/libebook
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
debian/tmp/usr/share/gtk-doc/html/libebook
Modified: unstable/evolution-data-server/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libecal1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libecal1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,6 +1,6 @@
debian/tmp/usr/lib/pkgconfig/libecal-1.2.pc
debian/tmp/usr/lib/libecal-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libecal
-debian/tmp/usr/include/evolution-data-server-1.10/libical
+debian/tmp/usr/include/evolution-data-server-1.12/libecal
+debian/tmp/usr/include/evolution-data-server-1.12/libical
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
debian/tmp/usr/share/gtk-doc/html/libecal
Modified: unstable/evolution-data-server/debian/libedata-book1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-book1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-book1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/pkgconfig/libedata-book-1.2.pc
debian/tmp/usr/lib/libedata-book-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libedata-book
+debian/tmp/usr/include/evolution-data-server-1.12/libedata-book
Modified: unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-cal1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-cal1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/pkgconfig/libedata-cal-1.2.pc
debian/tmp/usr/lib/libedata-cal-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libedata-cal
+debian/tmp/usr/include/evolution-data-server-1.12/libedata-cal
debian/tmp/usr/share/gtk-doc/html/libedata-cal
Modified: unstable/evolution-data-server/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserver1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserver1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,5 +1,5 @@
debian/tmp/usr/lib/pkgconfig/libedataserver-1.2.pc
debian/tmp/usr/lib/libedataserver-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libedataserver
+debian/tmp/usr/include/evolution-data-server-1.12/libedataserver
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
debian/tmp/usr/share/gtk-doc/html/libedataserver
Modified: unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserverui1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserverui1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/pkgconfig/libedataserverui-1.2.pc
debian/tmp/usr/lib/libedataserverui-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/libedataserverui
+debian/tmp/usr/include/evolution-data-server-1.12/libedataserverui
Modified: unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libegroupwise1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libegroupwise1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/pkgconfig/libegroupwise-1.2.pc
debian/tmp/usr/lib/libegroupwise-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/groupwise
+debian/tmp/usr/include/evolution-data-server-1.12/groupwise
Modified: unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install Sun Sep 23 14:43:12 2007
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/pkgconfig/libexchange-storage-1.2.pc
debian/tmp/usr/lib/libexchange-storage-1.2.so
-debian/tmp/usr/include/evolution-data-server-1.10/exchange
+debian/tmp/usr/include/evolution-data-server-1.12/exchange
Modified: unstable/evolution-data-server/debian/patches/15_libebook-optimised-folding.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/15_libebook-optimised-folding.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/15_libebook-optimised-folding.patch (original)
+++ unstable/evolution-data-server/debian/patches/15_libebook-optimised-folding.patch Sun Sep 23 14:43:12 2007
@@ -1,51 +1,0 @@
-diff -Nur evolution-data-server-1.10.1/addressbook/libebook/e-vcard.c evolution-data-server-1.10.1.new/addressbook/libebook/e-vcard.c
---- evolution-data-server-1.10.1/addressbook/libebook/e-vcard.c 2007-04-09 14:42:56.000000000 +0200
-+++ evolution-data-server-1.10.1.new/addressbook/libebook/e-vcard.c 2007-05-10 08:19:55.000000000 +0200
-@@ -807,7 +807,7 @@
- GList *p;
- EVCardAttribute *attr = l->data;
- GString *attr_str;
-- int l;
-+ glong len;
-
- if (!g_ascii_strcasecmp (attr->name, "VERSION"))
- continue;
-@@ -883,21 +883,23 @@
- * When generating a content line, lines longer than 75
- * characters SHOULD be folded
- */
-- l = 0;
-- do {
--
-- if ((g_utf8_strlen (attr_str->str, -1) -l) > 75) {
-- char *p;
--
-- l += 75;
-- p = g_utf8_offset_to_pointer (attr_str->str, l);
--
-- g_string_insert_len (attr_str, (p - attr_str->str), CRLF " ", sizeof (CRLF " ") - 1);
-- }
-- else
-- break;
-- } while (l < g_utf8_strlen (attr_str->str, -1));
--
-+ len = g_utf8_strlen (attr_str->str, -1);
-+ if (len > 75) {
-+ GString *fold_str = g_string_sized_new (attr_str->len + len/74*3);
-+ gchar *pos1 = attr_str->str;
-+ gchar *pos2 = pos1;
-+ pos2 = g_utf8_offset_to_pointer (pos2, 75);
-+
-+ do {
-+ g_string_append_len (fold_str, pos1, pos2 - pos1);
-+ g_string_append (fold_str, CRLF " ");
-+ pos1 = pos2;
-+ pos2 = g_utf8_offset_to_pointer (pos2, 74);
-+ } while (pos2 < attr_str->str + attr_str->len);
-+ g_string_append (fold_str, pos1);
-+ g_string_free (attr_str, TRUE);
-+ attr_str = fold_str;
-+ }
- g_string_append (attr_str, CRLF);
-
- g_string_append (str, attr_str->str);
Modified: unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch (original)
+++ unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch Sun Sep 23 14:43:12 2007
@@ -1,11 +1,0 @@
---- addressbook/libebook/e-book.c.orig 2007-04-22 22:31:25.263966048 +0200
-+++ addressbook/libebook/e-book.c 2007-04-22 22:33:18.211024798 +0200
-@@ -3639,7 +3639,7 @@
- uid = gconf_client_get_string (gconf, SELF_UID_KEY, NULL);
- g_object_unref (gconf);
-
-- rv = (uid && strcmp (uid, e_contact_get_const (contact, E_CONTACT_UID)));
-+ rv = (uid && !strcmp (uid, e_contact_get_const (contact, E_CONTACT_UID)));
-
- g_free (uid);
-
Modified: unstable/evolution-data-server/debian/patches/30_vcf-import-linebreak.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/30_vcf-import-linebreak.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/30_vcf-import-linebreak.patch (original)
+++ unstable/evolution-data-server/debian/patches/30_vcf-import-linebreak.patch Sun Sep 23 14:43:12 2007
@@ -1,11 +1,0 @@
-diff -Nur evolution-data-server-1.8.2/addressbook/libebook/e-vcard.c evolution-data-server-1.8.2.new/addressbook/libebook/e-vcard.c
---- evolution-data-server-1.8.2/addressbook/libebook/e-vcard.c 2006-09-29 17:51:41.000000000 +0200
-+++ evolution-data-server-1.8.2.new/addressbook/libebook/e-vcard.c 2007-01-25 07:53:52.000000000 +0100
-@@ -273,6 +273,7 @@
- g_string_append_c (str, '\\');
- break;
- }
-+ lp = skip_newline(lp, quoted_printable);
- switch (*lp) {
- case 'n': g_string_append_c (str, '\n'); break;
- case 'N': g_string_append_c (str, '\n'); break;
Modified: unstable/evolution-data-server/debian/patches/35_warn-on-server-service-init-failure.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/35_warn-on-server-service-init-failure.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/35_warn-on-server-service-init-failure.patch (original)
+++ unstable/evolution-data-server/debian/patches/35_warn-on-server-service-init-failure.patch Sun Sep 23 14:43:12 2007
@@ -1,11 +1,0 @@
---- trunk/src/server.c 2007/04/20 04:47:09 7711
-+++ trunk/src/server.c 2007/05/08 09:33:03 7732
-@@ -369,7 +369,7 @@
- else if (!did_cals)
- failed = "CALS";
-
-- g_error (G_STRLOC ": could not initialize Server service \"%s\"; terminating", failed);
-+ g_warning (G_STRLOC ": could not initialize Server service \"%s\"; terminating", failed);
-
- if (e_data_book_factory) {
- bonobo_object_unref (BONOBO_OBJECT (e_data_book_factory));
Modified: unstable/evolution-data-server/debian/patches/50_libebook-get-contact-list-prepend.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/50_libebook-get-contact-list-prepend.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/50_libebook-get-contact-list-prepend.patch (original)
+++ unstable/evolution-data-server/debian/patches/50_libebook-get-contact-list-prepend.patch Sun Sep 23 14:43:12 2007
@@ -1,21 +1,0 @@
-diff -Nur evolution-data-server-1.10.0/addressbook/backends/file/e-book-backend-file.c evolution-data-server-1.10.0.new/addressbook/backends/file/e-book-backend-file.c
---- evolution-data-server-1.10.0/addressbook/backends/file/e-book-backend-file.c 2007-01-03 11:09:30.000000000 +0100
-+++ evolution-data-server-1.10.0.new/addressbook/backends/file/e-book-backend-file.c 2007-04-04 23:48:48.000000000 +0200
-@@ -412,7 +412,7 @@
-
- db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
- if (db_error == 0) {
-- contact_list = g_list_append (contact_list, vcard_dbt.data);
-+ contact_list = g_list_prepend (contact_list, vcard_dbt.data);
- } else {
- g_warning (G_STRLOC ": db->get failed with %d", db_error);
- status = GNOME_Evolution_Addressbook_OtherError ;
-@@ -451,7 +451,7 @@
- || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
-
- if ((!search_needed) || (card_sexp != NULL && e_book_backend_sexp_match_vcard (card_sexp, vcard_dbt.data))) {
-- contact_list = g_list_append (contact_list, vcard_dbt.data);
-+ contact_list = g_list_prepend (contact_list, vcard_dbt.data);
- }
- }
-
Modified: unstable/evolution-data-server/debian/patches/65_imap-negative-array-index.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/65_imap-negative-array-index.patch?rev=878&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/65_imap-negative-array-index.patch (original)
+++ unstable/evolution-data-server/debian/patches/65_imap-negative-array-index.patch Sun Sep 23 14:43:12 2007
@@ -1,29 +1,0 @@
-SECURITY; GNOME #447414; FEDORA-2007-0464; Debian #429876; fixes potential
-negative array index usage in IMAP code (remote).
-
-2007-06-14 Philip Van Hoof <pvanhoof at gnome.org>
-
- * camel-imap-folder.c: Security bugfix. The sequence can be a negative
- value while it is being used as the index of an array (#447414)
-
-diff -Nur evolution-data-server-1.10.2/camel/providers/imap/camel-imap-folder.c evolution-data-server-1.10.2.new/camel/providers/imap/camel-imap-folder.c
---- evolution-data-server-1.10.2/camel/providers/imap/camel-imap-folder.c 2007-04-09 14:42:39.000000000 +0200
-+++ evolution-data-server-1.10.2.new/camel/providers/imap/camel-imap-folder.c 2007-06-21 10:33:01.000000000 +0200
-@@ -655,7 +655,7 @@
- uid = g_datalist_get_data (&data, "UID");
- flags = GPOINTER_TO_UINT (g_datalist_get_data (&data, "FLAGS"));
-
-- if (!uid || !seq || seq > summary_len) {
-+ if (!uid || !seq || seq > summary_len || seq < 0) {
- g_datalist_clear (&data);
- continue;
- }
-@@ -2789,7 +2789,7 @@
-
- if (*response != '*' || *(response + 1) != ' ')
- return NULL;
-- seq = strtol (response + 2, &response, 10);
-+ seq = strtoul (response + 2, &response, 10);
- if (seq == 0)
- return NULL;
- if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)
More information about the pkg-evolution-commits
mailing list