r969 - in /unstable/evolution-data-server/debian: changelog patches/25_mute-debug-messages.patch patches/30_iconv-gb2312-gb18030.patch patches/45_libcamel_providers_version.patch
heikkih-guest at users.alioth.debian.org
heikkih-guest at users.alioth.debian.org
Tue Mar 11 20:16:08 UTC 2008
Author: heikkih-guest
Date: Tue Mar 11 20:16:08 2008
New Revision: 969
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=969
Log:
* Remove patches:
- 10_camel-pkg-config-requires.patch - included upstream
- 30_iconv-gb2312-gb18030.patch - iconv-cjk-handling is changed
* Update patches:
- 25_mute-debug-messages.patch
- 45_libcamel_providers_version.patch
Removed:
unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=969&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Tue Mar 11 20:16:08 2008
@@ -12,7 +12,12 @@
- libgdata
- libgdata-google
* Update base-version to 2.22 in *.install
- * Remove patch 10_camel-pkg-config-requires.patch - included upstream
+ * Remove patches:
+ - 10_camel-pkg-config-requires.patch - included upstream
+ - 30_iconv-gb2312-gb18030.patch - iconv-cjk-handling is changed
+ * Update patches:
+ - 25_mute-debug-messages.patch
+ - 45_libcamel_providers_version.patch
-- Heikki Henriksen <heikkih at gmail.com> Tue, 11 Mar 2008 20:11:36 +0100
Modified: 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=969&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch (original)
+++ unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch Tue Mar 11 20:16:08 2008
@@ -1,6 +1,6 @@
-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 01:08:13.000000000 +0200
+diff -ruN evolution-data-server-2.22.0.orig/libedataserver/e-categories.c evolution-data-server-2.22.0/libedataserver/e-categories.c
+--- evolution-data-server-2.22.0.orig/libedataserver/e-categories.c 2007-11-29 13:53:48.000000000 +0100
++++ evolution-data-server-2.22.0/libedataserver/e-categories.c 2008-03-11 21:01:54.000000000 +0100
@@ -30,6 +30,8 @@
#include "libedataserver-private.h"
@@ -10,39 +10,39 @@
typedef struct {
char *category;
char *icon_file;
-@@ -156,7 +158,7 @@
+@@ -162,7 +164,7 @@
filename = build_categories_filename ();
- g_debug ("Saving categories to \"%s\"", filename);
-+ d (g_debug ("Saving categories to \"%s\"", filename));
++ d (g_debug ("Saving categories to \"%s\"", filename) );
/* build the file contents */
buffer = g_string_new ("<categories>\n");
-@@ -251,7 +253,7 @@
+@@ -268,7 +270,7 @@
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
goto exit;
- g_debug ("Loading categories from \"%s\"", filename);
-+ d (g_debug ("Loading categories from \"%s\"", filename));
++ d ( g_debug ("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 @@
+@@ -324,7 +326,7 @@
if (string == NULL || *string == '\0')
goto exit;
- g_debug ("Loading categories from GConf key \"%s\"", key);
-+ d (g_debug ("Loading categories from GConf key \"%s\"", key));
++ d (g_debug ("Loading categories from GConf key \"%s\"", key) );
n_added = parse_categories (string, strlen (string));
if (n_added == 0)
-@@ -379,20 +381,20 @@
+@@ -401,20 +403,20 @@
n_added = load_categories ();
if (n_added > 0) {
- g_debug ("Loaded %d categories", n_added);
-+ d (g_debug ("Loaded %d categories", n_added));
++ d ( g_debug ("Loaded %d categories", n_added) );
save_is_pending = FALSE;
return;
}
@@ -50,14 +50,14 @@
n_added = migrate_old_categories ();
if (n_added > 0) {
- g_debug ("Loaded %d categories", n_added);
-+ d (g_debug ("Loaded %d categories", n_added));
++ d ( g_debug ("Loaded %d categories", n_added) );
save_categories ();
return;
}
load_default_categories ();
- g_debug ("Loaded default categories");
-+ d (g_debug ("Loaded default categories"));
++ d ( g_debug ("Loaded default categories") );
save_categories ();
}
Modified: unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch?rev=969&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch (original)
+++ unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch Tue Mar 11 20:16:08 2008
@@ -1,7 +1,7 @@
-diff -ruN evolution-data-server-1.8.0.orig/configure evolution-data-server-1.8.0/configure
---- evolution-data-server-1.8.0.orig/configure 2006-09-04 06:53:00.000000000 +0200
-+++ evolution-data-server-1.8.0/configure 2006-09-06 23:10:36.000000000 +0200
-@@ -32370,7 +32370,7 @@
+diff -ruN evolution-data-server-2.22.0.orig/configure evolution-data-server-2.22.0/configure
+--- evolution-data-server-2.22.0.orig/configure 2008-03-09 18:55:24.000000000 +0100
++++ evolution-data-server-2.22.0/configure 2008-03-11 21:12:06.000000000 +0100
+@@ -31861,7 +31861,7 @@
weatherdatadir="$privdatadir/weather"
@@ -10,15 +10,15 @@
-diff -ruN evolution-data-server-1.8.0.orig/configure.in evolution-data-server-1.8.0/configure.in
---- evolution-data-server-1.8.0.orig/configure.in 2006-09-02 13:32:05.000000000 +0200
-+++ evolution-data-server-1.8.0/configure.in 2006-09-06 23:10:07.000000000 +0200
-@@ -1368,7 +1368,8 @@
+diff -ruN evolution-data-server-2.22.0.orig/configure.in evolution-data-server-2.22.0/configure.in
+--- evolution-data-server-2.22.0.orig/configure.in 2008-03-09 18:18:32.000000000 +0100
++++ evolution-data-server-2.22.0/configure.in 2008-03-11 21:13:10.000000000 +0100
+@@ -1519,7 +1519,8 @@
AC_SUBST(weatherdatadir)
dnl separate camel from e-d-s? or should it be under the same spot? same for now.
-camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
-+dnl add version to dir to avoid filename conflict between versions
++dnl add version to dir to avoid filename conflict between versions
+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
AC_SUBST(camel_providerdir)
More information about the pkg-evolution-commits
mailing list