Merge dbus 1.0 package from experimental

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@1140 ceb527fc-18e6-0310-9fe2-813c157c29e7

5 files changed, 11 insertions, 617 deletions

diff --git a/debian/patches/01_no-fatal-warnings.patch b/debian/patches/01_no-fatal-warnings.patch
new file mode 100644
index 00000000..4f85f584
--- /dev/null
+++ b/debian/patches/01_no-fatal-warnings.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ 
+ static dbus_bool_t warn_initted = FALSE;
+ static dbus_bool_t fatal_warnings = FALSE;
+-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;
++static dbus_bool_t fatal_warnings_on_check_failed = FALSE;
+ 
+ static void
+ init_warnings(void)
diff --git a/debian/patches/10_dbus_uuid_in_var.patch b/debian/patches/10_dbus_uuid_in_var.patch
deleted file mode 100644
index c7ae4657..00000000
--- a/debian/patches/10_dbus_uuid_in_var.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: dbus/Makefile.am
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/Makefile.am,v
-retrieving revision 1.85
-diff -u -r1.85 Makefile.am
---- dbus/Makefile.am	1 Oct 2006 15:36:18 -0000	1.85
-+++ dbus/Makefile.am	24 Oct 2006 07:42:23 -0000
-@@ -1,7 +1,7 @@
- 
- configdir=$(sysconfdir)/dbus-1
- 
--INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
-+INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
- 
- dbusincludedir=$(includedir)/dbus-1.0/dbus
- dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
-Index: tools/Makefile.am
-===================================================================
-RCS file: /cvs/dbus/dbus/tools/Makefile.am,v
-retrieving revision 1.26
-diff -u -r1.26 Makefile.am
---- tools/Makefile.am	2 Oct 2006 18:45:27 -0000	1.26
-+++ tools/Makefile.am	24 Oct 2006 07:42:23 -0000
-@@ -1,6 +1,6 @@
- configdir=$(sysconfdir)/dbus-1
- 
--INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
-+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
- 
- bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen
- 
-Index: tools/dbus-uuidgen.1
-===================================================================
-RCS file: /cvs/dbus/dbus/tools/dbus-uuidgen.1,v
-retrieving revision 1.1
-diff -u -r1.1 dbus-uuidgen.1
---- tools/dbus-uuidgen.1	1 Oct 2006 03:18:47 -0000	1.1
-+++ tools/dbus-uuidgen.1	24 Oct 2006 08:08:19 -0000
-@@ -25,7 +25,7 @@
- .fi
- 
- .PP
--This will ensure that /etc/dbus-1/machine-id exists and has the uuid in it.
-+This will ensure that /var/lib/dbus/machine-id exists and has the uuid in it.
- It won't overwrite an existing uuid, since this id should remain fixed
- for a single machine until the next reboot at least.
- 
-@@ -50,31 +50,25 @@
- UUIDs compatible with that spec.
- 
- .PP
--If you try to change an existing /etc/dbus-1/machine-id on a running
-+If you try to change an existing machine-id on a running
- system, it will probably result in bad things happening. Don't try 
- to change this file. Also, don't make it the same on two different 
- systems; it needs to be different anytime there are two different 
- kernels running.
- 
--.PP
--If you need to share /etc between two different kernels, a possible solution
--is to symlink the machine ID to /var, and run "dbus-uuidgen
----ensure=/var/whatever" from an early boot script or the system
--message bus boot script.
--
- .SH OPTIONS
- The following options are supported:
- .TP
- .I "--get[=FILENAME]"
--If a filename is not given, defaults to sysconfdir/dbus-1/machine-id
-+If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
- (sysconfdir is usually /etc). If this file exists and is valid, the
- uuid in the file is printed on stdout. Otherwise, the command exits 
- with a nonzero status.
- 
- .TP
- .I "--ensure[=FILENAME]"
--If a filename is not given, defaults to sysconfdir/dbus-1/machine-id
--(sysconfdir is usually /etc). If this file exists then it will be
-+If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
-+(localstatedir is usually /var). If this file exists then it will be
- validated, and a failure code returned if it contains the wrong thing.
- If the file does not exist, it will be created with a new uuid in it.
- On success, prints no output.
diff --git a/debian/patches/20_dbus_uuid_world_readable.patch b/debian/patches/20_dbus_uuid_world_readable.patch
deleted file mode 100644
index 24c96b3a..00000000
--- a/debian/patches/20_dbus_uuid_world_readable.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: dbus/dbus-internals.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-internals.c,v
-retrieving revision 1.53
-retrieving revision 1.54
-diff -u -r1.53 -r1.54
---- dbus/dbus-internals.c	20 Oct 2006 03:25:22 -0000	1.53
-+++ dbus/dbus-internals.c	24 Oct 2006 20:25:01 -0000	1.54
-@@ -639,6 +639,8 @@
-   if (!_dbus_string_save_to_file (&encoded, filename, error))
-     goto error;
- 
-+  if (!_dbus_make_file_world_readable (filename, error))
-+    goto error;
- 
-   _dbus_string_free (&encoded);
- 
-Index: dbus/dbus-sysdeps-unix.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-unix.c,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -r1.13 -r1.14
---- dbus/dbus-sysdeps-unix.c	21 Oct 2006 18:17:02 -0000	1.13
-+++ dbus/dbus-sysdeps-unix.c	24 Oct 2006 20:25:01 -0000	1.14
-@@ -1802,6 +1802,33 @@
-   return retval;
- }
- 
-+/** Makes the file readable by every user in the system.
-+ *
-+ * @param filename the filename
-+ * @param error error location
-+ * @returns #TRUE if the file's permissions could be changed.
-+ */
-+dbus_bool_t
-+_dbus_make_file_world_readable(const DBusString *filename,
-+                               DBusError *error)
-+{
-+  const char *filename_c;
-+
-+  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-+
-+  filename_c = _dbus_string_get_const_data (filename);
-+  if (chmod (filename_c, 0644) == -1)
-+    {
-+      dbus_set_error (error,
-+                      DBUS_ERROR_FAILED,
-+                      "Could not change permissions of file %s: %s\n",
-+                      filename_c,
-+                      _dbus_strerror (errno));
-+      return FALSE;
-+    }
-+  return TRUE;
-+}
-+
- /** Creates the given file, failing if the file already exists.
-  *
-  * @param filename the filename
-Index: dbus/dbus-sysdeps.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
-retrieving revision 1.63
-retrieving revision 1.64
-diff -u -r1.63 -r1.64
---- dbus/dbus-sysdeps.h	21 Oct 2006 23:09:18 -0000	1.63
-+++ dbus/dbus-sysdeps.h	24 Oct 2006 20:25:01 -0000	1.64
-@@ -273,6 +273,9 @@
-                                        const DBusString *filename,
-                                        DBusError        *error);
- 
-+dbus_bool_t _dbus_make_file_world_readable   (const DBusString *filename,
-+                                              DBusError *error);
-+
- dbus_bool_t    _dbus_create_file_exclusively (const DBusString *filename,
-                                               DBusError        *error);
- dbus_bool_t    _dbus_delete_file             (const DBusString *filename,
diff --git a/debian/patches/30_dbus_send_close_shared_connection.patch b/debian/patches/30_dbus_send_close_shared_connection.patch
deleted file mode 100644
index ec228dfa..00000000
--- a/debian/patches/30_dbus_send_close_shared_connection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus/tools/dbus-send.c	2006/08/03 20:34:36	1.21
-+++ dbus/tools/dbus-send.c	2006/10/17 22:31:16	1.22
-@@ -484,7 +484,7 @@
- 
-   dbus_message_unref (message);
- 
--  dbus_connection_close (connection);
-+  dbus_connection_unref (connection);
- 
-   exit (0);
- }
-
diff --git a/debian/patches/99_rerun_automake.patch b/debian/patches/99_rerun_automake.patch
deleted file mode 100644
index 16a5c33f..00000000
--- a/debian/patches/99_rerun_automake.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-diff -Naur dbus-0.94.vanilla/Makefile.in dbus-0.94/Makefile.in
---- dbus-0.94.vanilla/Makefile.in	2006-10-24 10:03:52.000000000 +0200
-+++ dbus-0.94/Makefile.in	2006-10-24 10:11:02.000000000 +0200
-@@ -176,6 +176,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -222,17 +223,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -249,23 +248,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff -Naur dbus-0.94.vanilla/bus/Makefile.in dbus-0.94/bus/Makefile.in
---- dbus-0.94.vanilla/bus/Makefile.in	2006-10-24 10:03:52.000000000 +0200
-+++ dbus-0.94/bus/Makefile.in	2006-10-24 10:10:59.000000000 +0200
-@@ -205,6 +205,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -251,17 +252,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -278,23 +277,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff -Naur dbus-0.94.vanilla/dbus/Makefile.in dbus-0.94/dbus/Makefile.in
---- dbus-0.94.vanilla/dbus/Makefile.in	2006-10-24 10:03:52.000000000 +0200
-+++ dbus-0.94/dbus/Makefile.in	2006-10-24 10:11:00.000000000 +0200
-@@ -197,6 +197,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -243,17 +244,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -270,23 +269,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -296,7 +302,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
- dbusincludedir = $(includedir)/dbus-1.0/dbus
- dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
- lib_LTLIBRARIES = libdbus-1.la
-diff -Naur dbus-0.94.vanilla/doc/Makefile.in dbus-0.94/doc/Makefile.in
---- dbus-0.94.vanilla/doc/Makefile.in	2006-10-24 10:03:52.000000000 +0200
-+++ dbus-0.94/doc/Makefile.in	2006-10-24 10:11:00.000000000 +0200
-@@ -130,6 +130,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -176,17 +177,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -203,23 +202,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff -Naur dbus-0.94.vanilla/test/Makefile.in dbus-0.94/test/Makefile.in
---- dbus-0.94.vanilla/test/Makefile.in	2006-10-24 10:03:51.000000000 +0200
-+++ dbus-0.94/test/Makefile.in	2006-10-24 10:11:01.000000000 +0200
-@@ -198,6 +198,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -244,17 +245,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -271,23 +270,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff -Naur dbus-0.94.vanilla/test/name-test/Makefile.in dbus-0.94/test/name-test/Makefile.in
---- dbus-0.94.vanilla/test/name-test/Makefile.in	2006-10-24 10:03:51.000000000 +0200
-+++ dbus-0.94/test/name-test/Makefile.in	2006-10-24 10:11:01.000000000 +0200
-@@ -166,6 +166,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -212,17 +213,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -239,23 +238,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff -Naur dbus-0.94.vanilla/tools/Makefile.in dbus-0.94/tools/Makefile.in
---- dbus-0.94.vanilla/tools/Makefile.in	2006-10-24 10:03:52.000000000 +0200
-+++ dbus-0.94/tools/Makefile.in	2006-10-24 10:11:01.000000000 +0200
-@@ -175,6 +175,7 @@
- F77 = @F77@
- FFLAGS = @FFLAGS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GREP = @GREP@
- HAVE_CONSOLE_OWNER_FILE_FALSE = @HAVE_CONSOLE_OWNER_FILE_FALSE@
- HAVE_CONSOLE_OWNER_FILE_TRUE = @HAVE_CONSOLE_OWNER_FILE_TRUE@
- HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-@@ -221,17 +222,15 @@
- TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
- TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
- VERSION = @VERSION@
-+XMKMF = @XMKMF@
- XMLTO = @XMLTO@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -248,23 +247,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -274,7 +280,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
-+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
- dbus_send_SOURCES = \
- 	dbus-print-message.c			\
- 	dbus-print-message.h			\