[Pkg-utopia-commits] r3107 - in /packages/unstable/dbus/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed May 6 22:26:20 UTC 2009 

Author: biebl
Date: Wed May  6 22:26:20 2009
New Revision: 3107

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3107
Log:
* Refresh and update patches.
* Remove debian/patches/20-dbus-alpha-unaligned.patch, fixed upstream.

Removed:
    packages/unstable/dbus/debian/patches/20-dbus-alpha-unaligned.patch
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch
    packages/unstable/dbus/debian/patches/01_no-fatal-warnings.patch
    packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
    packages/unstable/dbus/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch
    packages/unstable/dbus/debian/patches/series

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed May  6 22:26:20 2009
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Switch patch management system to quilt.
+  * Refresh and update patches.
+  * Remove debian/patches/20-dbus-alpha-unaligned.patch, fixed upstream.
   * debian/control
     - Drop dependency on debianutils as we no longer require run-parts.
 

Modified: packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch (original)
+++ packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch Wed May  6 22:26:20 2009
@@ -1,6 +1,8 @@
---- dbus-0.20-virgin-patches/bus/config-parser.c	2003-10-14 21:30:21.000000000 +0100
-+++ dbus-0.20/bus/config-parser.c	2004-02-10 00:40:05.000000000 +0000
-@@ -1710,8 +1710,18 @@
+Index: dbus-1.2.14/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 @@
          {
            if (!include_file (parser, &full_path, TRUE, error))
              {

Modified: packages/unstable/dbus/debian/patches/01_no-fatal-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/01_no-fatal-warnings.patch?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/01_no-fatal-warnings.patch (original)
+++ packages/unstable/dbus/debian/patches/01_no-fatal-warnings.patch Wed May  6 22:26:20 2009
@@ -1,6 +1,8 @@
---- dbus/dbus-internals.c.old	2006-11-10 01:02:50.997690889 +0100
-+++ dbus/dbus-internals.c	2006-11-10 01:03:05.662526590 +0100
-@@ -192,7 +192,7 @@
+Index: dbus-1.2.14/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 @@
  
  static dbus_bool_t warn_initted = FALSE;
  static dbus_bool_t fatal_warnings = FALSE;

Modified: packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch (original)
+++ packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch Wed May  6 22:26:20 2009
@@ -1,7 +1,7 @@
-diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
-index 9f7da5b..c66186f 100644
---- a/tools/dbus-monitor.c
-+++ b/tools/dbus-monitor.c
+Index: dbus-1.2.14/tools/dbus-monitor.c
+===================================================================
+--- dbus-1.2.14.orig/tools/dbus-monitor.c	2009-05-06 18:51:18.000000000 +0200
++++ dbus-1.2.14/tools/dbus-monitor.c	2009-05-07 00:19:51.000000000 +0200
 @@ -33,8 +33,6 @@
  
  #include <time.h>
@@ -11,11 +11,11 @@
  #include "dbus-print-message.h"
  
  #ifdef DBUS_WIN
-@@ -195,14 +193,6 @@ usage (char *name, int ecode)
+@@ -195,14 +193,6 @@
    exit (ecode);
  }
  
--dbus_bool_t sigint_received = FALSE;
+-static dbus_bool_t sigint_received = FALSE;
 -
 -static void
 -sigint_handler (int signum)
@@ -26,7 +26,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -294,11 +284,7 @@ main (int argc, char *argv[])
+@@ -294,11 +284,7 @@
      fprintf (stderr, "Couldn't add filter!\n");
      exit (1);
    }

Modified: packages/unstable/dbus/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch (original)
+++ packages/unstable/dbus/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch Wed May  6 22:26:20 2009
@@ -1,5 +1,7 @@
---- dbus-1.0.1/Doxyfile.in.generate-xml-docs	2006-11-25 23:42:59.000000000 -0500
-+++ dbus-1.0.1/Doxyfile.in	2006-11-25 23:43:12.000000000 -0500
+Index: dbus-1.2.14/Doxyfile.in
+===================================================================
+--- dbus-1.2.14.orig/Doxyfile.in	2009-04-17 21:45:29.000000000 +0200
++++ dbus-1.2.14/Doxyfile.in	2009-05-07 00:19:57.000000000 +0200
 @@ -133,7 +133,7 @@
  #---------------------------------------------------------------------------
  # configuration options related to the XML output

Modified: packages/unstable/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/series?rev=3107&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/series (original)
+++ packages/unstable/dbus/debian/patches/series Wed May  6 22:26:20 2009
@@ -1,5 +1,4 @@
 00_dbus-quiesce-startup-errors.patch
-01_no-fatal-warnings.patch -p0
+01_no-fatal-warnings.patch
 02_dbus_monitor_no_sigint_handler.patch
 10_dbus-1.0.1-generate-xml-docs.patch
-20-dbus-alpha-unaligned.patch

More information about the Pkg-utopia-commits mailing list