r1580 - in /experimental/evolution-data-server/debian: changelog patches/25_mute-debug-messages.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Apr 23 06:25:11 2010
New Revision: 1580

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1580
Log:
debian/patches/25_mute-debug-messages.patch updated.

Added:
    experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch
      - copied, changed from r1575, experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch
Modified:
    experimental/evolution-data-server/debian/changelog

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1580&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Fri Apr 23 06:25:11 2010
@@ -4,12 +4,11 @@
   * debian/watch updated to track stable releases.
   * debian/control:
     - bump required GTK+ version to 2.18.
-  * debian/patches/25_mute-debug-messages.patch dropped, doesn't apply anymore
-    and shouldn't be needed.
+  * debian/patches/25_mute-debug-messages.patch updated.
   * debian/libcamel1.2-14.shlibs: bump shlibs dependencies to 2.30, conflicts
     against 2.31.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 22 Apr 2010 08:10:26 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 23 Apr 2010 08:24:02 +0200
 
 evolution-data-server (2.29.92-1) experimental; urgency=low
 

Copied: experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch (from r1575, experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch?rev=1580&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch (original)
+++ experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch Fri Apr 23 06:25:11 2010
@@ -1,6 +1,7 @@
-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
+diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
+index 24ee076..5ef17cd 100644
+--- a/libedataserver/e-categories.c
++++ b/libedataserver/e-categories.c
 @@ -30,6 +30,8 @@
  
  #include "libedataserver-private.h"
@@ -8,41 +9,41 @@
 +#define d(x)
 +
  typedef struct {
- 	char *category;
- 	char *icon_file;
-@@ -162,7 +164,7 @@
+ 	gchar *category;
+ 	gchar *icon_file;
+@@ -202,7 +204,7 @@ idle_saver_cb (gpointer user_data)
  
  	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");
-@@ -268,7 +270,7 @@
+@@ -303,7 +305,7 @@ load_categories (void)
  	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);
-@@ -324,7 +326,7 @@
+@@ -359,7 +361,7 @@ migrate_old_categories (void)
  	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)
-@@ -401,20 +403,20 @@
+@@ -440,20 +442,20 @@ initialize_categories (void)
  
  	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 +51,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 ();
  }