[Pkg-utopia-commits] r3660 - in /packages/experimental/dbus/debian: changelog patches/00_dbus-quiesce-startup-errors.patch patches/01_no-fatal-warnings.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 13:18:54 2010
New Revision: 3660

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3660
Log:
Refresh patches to apply cleanly.

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

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3660&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Sat Jul 17 13:18:54 2010
@@ -1,8 +1,9 @@
 dbus (1.3.2~git20100715.821f99c-1) UNRELEASED; urgency=low
 
   * New upstream Git snapshot (up to 821f99c).
-
- -- Michael Biebl <biebl at debian.org>  Sat, 17 Jul 2010 15:11:47 +0200
+  * Refresh patches to apply cleanly.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 17 Jul 2010 15:18:24 +0200
 
 dbus (1.2.24-2) unstable; urgency=low
 

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=3660&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 Sat Jul 17 13:18:54 2010
@@ -1,8 +1,8 @@
-Index: dbus-1.2.14/bus/config-parser.c
+Index: b/bus/config-parser.c
 ===================================================================
---- dbus-1.2.14.orig/bus/config-parser.c	2009-05-05 22:51:37.000000000 +0200
-+++ dbus-1.2.14/bus/config-parser.c	2009-05-07 00:16:25.000000000 +0200
-@@ -2193,8 +2193,18 @@
+--- 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 @@
          {
            if (!include_file (parser, &full_path, TRUE, error))
              {

Modified: packages/experimental/dbus/debian/patches/01_no-fatal-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/01_no-fatal-warnings.patch?rev=3660&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/01_no-fatal-warnings.patch (original)
+++ packages/experimental/dbus/debian/patches/01_no-fatal-warnings.patch Sat Jul 17 13:18:54 2010
@@ -1,8 +1,8 @@
-Index: dbus-1.2.14/dbus/dbus-internals.c
+Index: b/dbus/dbus-internals.c
 ===================================================================
---- dbus-1.2.14.orig/dbus/dbus-internals.c	2009-04-17 21:45:29.000000000 +0200
-+++ dbus-1.2.14/dbus/dbus-internals.c	2009-05-07 00:16:33.000000000 +0200
-@@ -193,7 +193,7 @@
+--- a/dbus/dbus-internals.c	2010-07-14 00:43:38.000000000 +0200
++++ b/dbus/dbus-internals.c	2010-07-17 15:16:54.478407971 +0200
+@@ -199,7 +199,7 @@
  
  static dbus_bool_t warn_initted = FALSE;
  static dbus_bool_t fatal_warnings = FALSE;