[Pkg-utopia-commits] r3796 - in /packages/experimental/dbus/debian: changelog patches/00_dbus-quiesce-startup-errors.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Thu Jan  6 17:48:59 2011
New Revision: 3796

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3796
Log:
Remove commented-out code from 00_dbus-quiesce-startup-errors.patch and
forward it upstream

Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3796&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Thu Jan  6 17:48:59 2011
@@ -1,3 +1,10 @@
+dbus (1.4.1-2) UNRELEASED; urgency=low
+
+  * Remove commented-out code from 00_dbus-quiesce-startup-errors.patch and
+    forward it upstream
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 06 Jan 2011 17:43:18 +0000
+
 dbus (1.4.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/experimental/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch?rev=3796&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch (original)
+++ packages/experimental/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch Thu Jan  6 17:48:59 2011
@@ -1,18 +1,23 @@
-Index: b/bus/config-parser.c
-===================================================================
---- a/bus/config-parser.c	2010-07-14 00:43:38.000000000 +0200
-+++ b/bus/config-parser.c	2010-07-17 15:16:44.226404084 +0200
-@@ -2236,8 +2236,18 @@
+From: Daniel Silverstone <dsilvers at debian.org>
+Date: Tue, 10 Feb 2004 00:46:52 +0000
+Subject: [PATCH] Quiesce error reports in system.d/*.conf files when loading
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19186
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=230231
+---
+ bus/config-parser.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/bus/config-parser.c b/bus/config-parser.c
+index f128b91..83dc880 100644
+--- a/bus/config-parser.c
++++ b/bus/config-parser.c
+@@ -2237,8 +2237,13 @@ include_dir (BusConfigParser   *parser,
          {
            if (!include_file (parser, &full_path, TRUE, error))
              {
 -              _dbus_string_free (&full_path);
 -              goto failed;
-+              /* Debian patch to skip malformed /etc/dbus-1/system.d entries */
-+              /*
-+               * _dbus_string_free (&full_path);
-+               * goto failed;
-+               */
 +              if (dbus_error_is_set (error))
 +                {
 +                  _dbus_warn("\nEncountered error '%s' while parsing '%s'\n",