r792 - in /unstable/evolution-data-server/debian: changelog
patches/15_libebook-optimiserd-folding.patch
patches/20_e-book-is-self.patch patches/25_mute-debug-messages.patch
oysteigi-guest at users.alioth.debian.org
oysteigi-guest at users.alioth.debian.org
Sun May 6 22:54:50 UTC 2007
Author: oysteigi-guest
Date: Sun May 6 22:54:48 2007
New Revision: 792
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=792
Log:
* 15_libebook-optimised-folding.patch: Speed up vCard line folding by
orders of magnitude (bugzilla #433782)
* 20_e-book-is-self.patch: Return TRUE when self contact is returned
(bugzilla #378502)
* 25_mute-debug-messages.patch: Mute debug noise
Added:
unstable/evolution-data-server/debian/patches/15_libebook-optimiserd-folding.patch
unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch
unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
Modified:
unstable/evolution-data-server/debian/changelog
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=792&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun May 6 22:54:48 2007
@@ -1,3 +1,13 @@
+evolution-data-server (1.10.1-3) UNRELEASED; urgency=low
+
+ * 15_libebook-optimised-folding.patch: Speed up vCard line folding by
+ orders of magnitude (bugzilla #433782)
+ * 20_e-book-is-self.patch: Return TRUE when self contact is returned
+ (bugzilla #378502)
+ * 25_mute-debug-messages.patch: Mute debug noise
+
+ -- Oystein Gisnas <oystein at gisnas.net> Mon, 07 May 2007 00:54:05 +0200
+
evolution-data-server (1.10.1-2) unstable; urgency=low
* Upload to unstable.
Added: unstable/evolution-data-server/debian/patches/15_libebook-optimiserd-folding.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/15_libebook-optimiserd-folding.patch?rev=792&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/15_libebook-optimiserd-folding.patch (added)
+++ unstable/evolution-data-server/debian/patches/15_libebook-optimiserd-folding.patch Sun May 6 22:54:48 2007
@@ -1,0 +1,43 @@
+--- addressbook/libebook/e-vcard.c.orig 2007-05-01 22:30:24.000000000 +0200
++++ addressbook/libebook/e-vcard.c 2007-05-02 00:13:59.990337883 +0200
+@@ -808,7 +808,8 @@
+ GList *p;
+ EVCardAttribute *attr = l->data;
+ GString *attr_str;
+- int l;
++ int c;
++ gchar *s;
+
+ if (!g_ascii_strcasecmp (attr->name, "VERSION"))
+ continue;
+@@ -884,20 +885,18 @@
+ * 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;
++ s = attr_str->str;
++ while (TRUE)
++ {
++ c = 75;
++ while (c-- > 0 && *(s = g_utf8_next_char (s)))
++ ;
+
+- 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
++ if (!*s)
+ break;
+- } while (l < g_utf8_strlen (attr_str->str, -1));
++ g_string_insert_len (attr_str, s - attr_str->str, CRLF " ", 3);
++ s += 2;
++ }
+
+ g_string_append (attr_str, CRLF);
+
Added: 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=792&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch (added)
+++ unstable/evolution-data-server/debian/patches/20_e-book-is-self.patch Sun May 6 22:54:48 2007
@@ -1,0 +1,11 @@
+--- 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);
+
Added: unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch?rev=792&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch (added)
+++ unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch Sun May 6 22:54:48 2007
@@ -1,0 +1,63 @@
+diff -Nur evolution-data-server-1.10.1/libedataserver/e-categories.c evolution-data-server-1.10.1.new/libedataserver/e-categories.c
+--- evolution-data-server-1.10.1/libedataserver/e-categories.c 2007-04-09 14:42:55.000000000 +0200
++++ evolution-data-server-1.10.1.new/libedataserver/e-categories.c 2007-05-07 00:52:02.000000000 +0200
+@@ -30,6 +30,8 @@
+
+ #include "libedataserver-private.h"
+
++#define d(x)
++
+ typedef struct {
+ char *category;
+ char *icon_file;
+@@ -156,7 +158,7 @@
+
+ filename = build_categories_filename ();
+
+- g_debug ("Saving categories to \"%s\"", filename);
++ d ("Saving categories to \"%s\"", filename);
+
+ /* build the file contents */
+ buffer = g_string_new ("<categories>\n");
+@@ -251,7 +253,7 @@
+ if (!g_file_test (filename, G_FILE_TEST_EXISTS))
+ goto exit;
+
+- g_debug ("Loading categories from \"%s\"", filename);
++ d ("Loading categories from \"%s\"", filename);
+
+ if (!g_file_get_contents (filename, &contents, &length, &error)) {
+ g_warning ("Unable to load categories: %s", error->message);
+@@ -307,7 +309,7 @@
+ if (string == NULL || *string == '\0')
+ goto exit;
+
+- g_debug ("Loading categories from GConf key \"%s\"", key);
++ d ("Loading categories from GConf key \"%s\"", key);
+
+ n_added = parse_categories (string, strlen (string));
+ if (n_added == 0)
+@@ -379,20 +381,20 @@
+
+ n_added = load_categories ();
+ if (n_added > 0) {
+- g_debug ("Loaded %d categories", n_added);
++ d ("Loaded %d categories", n_added);
+ save_is_pending = FALSE;
+ return;
+ }
+
+ n_added = migrate_old_categories ();
+ if (n_added > 0) {
+- g_debug ("Loaded %d categories", n_added);
++ d ("Loaded %d categories", n_added);
+ save_categories ();
+ return;
+ }
+
+ load_default_categories ();
+- g_debug ("Loaded default categories");
++ d ("Loaded default categories");
+ save_categories ();
+ }
+
More information about the pkg-evolution-commits
mailing list