r24421 - in /desktop/unstable/gconf/debian: changelog patches/03_error_message.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May 29 08:50:31 2010
New Revision: 24421

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24421
Log:
03_error_message.patch: new patch. Replace the error message by
something more accurate nowadays. Closes: #582839.

Added:
    desktop/unstable/gconf/debian/patches/03_error_message.patch
Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/patches/series

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=24421&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Sat May 29 08:50:31 2010
@@ -1,3 +1,10 @@
+gconf (2.28.1-4) UNRELEASED; urgency=low
+
+  * 03_error_message.patch: new patch. Replace the error message by
+    something more accurate nowadays. Closes: #582839.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 29 May 2010 10:50:07 +0200
+
 gconf (2.28.1-3) unstable; urgency=low
 
   * gconf-schemas: don’t error out if there are no schemas to install. 

Added: desktop/unstable/gconf/debian/patches/03_error_message.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/03_error_message.patch?rev=24421&op=file
==============================================================================
--- desktop/unstable/gconf/debian/patches/03_error_message.patch (added)
+++ desktop/unstable/gconf/debian/patches/03_error_message.patch [utf-8] Sat May 29 08:50:31 2010
@@ -1,0 +1,13 @@
+Index: GConf-2.28.1/gconf/gconf-internals.c
+===================================================================
+--- GConf-2.28.1.orig/gconf/gconf-internals.c	2010-05-29 10:45:17.894434221 +0200
++++ GConf-2.28.1/gconf/gconf-internals.c	2010-05-29 10:47:17.758430078 +0200
+@@ -2882,7 +2882,7 @@ gconf_activate_server (gboolean  start_i
+     g_set_error (error,
+                  GCONF_ERROR,
+                  GCONF_ERROR_NO_SERVER,
+-                 _("Failed to contact configuration server; some possible causes are that you need to enable TCP/IP networking for ORBit, or you have stale NFS locks due to a system crash. See http://projects.gnome.org/gconf/ for information. (Details - %s)"),
++                 _("Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - %s)"),
+                  failure_log->len > 0 ? failure_log->str : _("none"));
+ 
+   g_string_free (failure_log, TRUE);

Modified: desktop/unstable/gconf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/series?rev=24421&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/series [utf-8] Sat May 29 08:50:31 2010
@@ -1,3 +1,4 @@
 01_defaults_path.patch
 02_fix_wrong_return_value.patch
+03_error_message.patch
 25_gconf-path-max-hurd.patch