[Pkg-utopia-commits] r1092 - in packages/unstable/dbus/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Tue Oct 24 09:31:53 UTC 2006
Author: sjoerd
Date: 2006-10-24 09:31:53 +0000 (Tue, 24 Oct 2006)
New Revision: 1092
Added:
packages/unstable/dbus/debian/dbus.dirs
packages/unstable/dbus/debian/libdbus-1-3.shlibs
packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch
packages/unstable/dbus/debian/patches/10_dbus_uuid_in_var.patch
packages/unstable/dbus/debian/patches/99_rerun_automake.patch
packages/unstable/dbus/debian/shlibs.local
Removed:
packages/unstable/dbus/debian/patches/dbus-quiesce-startup-errors.patch
Modified:
packages/unstable/dbus/debian/changelog
packages/unstable/dbus/debian/dbus.init
packages/unstable/dbus/debian/dbus.install
packages/unstable/dbus/debian/rules
Log:
- Patch from David H?\195?\131?\194?\164rdeman <david at 2gen.com
* New upstream release (aka 1.0 RC2)
* debian/dbus.init: Create the machine-id on start
* debian/patches/10_dbus_uuid_in_var.patch
+ Added. Put the generated machine-id file in /var. Next upstream version
will also have it there
* debian/patches/99_rerun_automake.patch
+ Added. Re-automake because of the changes in the previous patch
* debian/rules: Use list-missing to list files missing from the package
* debin/dbus.dirs: Add /var/lib/dbus
* debian/dbus.install: Include dbus-uuidgen and it's manpage
* debian/libdbus-1-3.shlibs, debian/shlibs.local: Added. New symbols were
added in this release.
Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog 2006-10-23 23:08:25 UTC (rev 1091)
+++ packages/unstable/dbus/debian/changelog 2006-10-24 09:31:53 UTC (rev 1092)
@@ -1,11 +1,26 @@
-dbus (0.93-2) unstable; urgency=low
+dbus (0.94-1) unstable; urgency=low
+ [ Riccardo Setti ]
* Fixed dbus description. (closes: #388186)
* Improved dbus.init script. (closes: #384859)
- - Patch from David Härdeman <david at 2gen.com
-
- -- Riccardo Setti <giskard at debian.org> Sat, 7 Oct 2006 15:37:10 +0200
+ - Patch from David Härdeman <david at 2gen.com
+ [ Sjoerd Simons ]
+ * New upstream release (aka 1.0 RC2)
+ * debian/dbus.init: Create the machine-id on start
+ * debian/patches/10_dbus_uuid_in_var.patch
+ + Added. Put the generated machine-id file in /var. Next upstream version
+ will also have it there
+ * debian/patches/99_rerun_automake.patch
+ + Added. Re-automake because of the changes in the previous patch
+ * debian/rules: Use list-missing to list files missing from the package
+ * debin/dbus.dirs: Add /var/lib/dbus
+ * debian/dbus.install: Include dbus-uuidgen and it's manpage
+ * debian/libdbus-1-3.shlibs, debian/shlibs.local: Added. New symbols were
+ added in this release.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Tue, 24 Oct 2006 11:27:18 +0200
+
dbus (0.93-1) unstable; urgency=low
* New upstream release
Added: packages/unstable/dbus/debian/dbus.dirs
===================================================================
--- packages/unstable/dbus/debian/dbus.dirs (rev 0)
+++ packages/unstable/dbus/debian/dbus.dirs 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1 @@
+/var/lib/dbus
Modified: packages/unstable/dbus/debian/dbus.init
===================================================================
--- packages/unstable/dbus/debian/dbus.init 2006-10-23 23:08:25 UTC (rev 1091)
+++ packages/unstable/dbus/debian/dbus.init 2006-10-24 09:31:53 UTC (rev 1092)
@@ -14,6 +14,8 @@
set -e
DAEMON=/usr/bin/dbus-daemon
+UUIDGEN=/usr/bin/dbus-uuidgen
+UUIDGEN_OPTS=--ensure
NAME=dbus
DAEMONUSER=messagebus
PIDDIR=/var/run/dbus
@@ -50,6 +52,11 @@
rm -f $PIDFILE
fi
fi
+ # Create machine-id file
+ if [ -x $UUIDGEN ]; then
+ $UUIDGEN $UUIDGEN_OPTS
+ fi
+
log_daemon_msg "Starting $DESC" "$NAME"
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
Modified: packages/unstable/dbus/debian/dbus.install
===================================================================
--- packages/unstable/dbus/debian/dbus.install 2006-10-23 23:08:25 UTC (rev 1091)
+++ packages/unstable/dbus/debian/dbus.install 2006-10-24 09:31:53 UTC (rev 1092)
@@ -6,8 +6,10 @@
debian/tmp/usr/bin/dbus-cleanup-sockets
debian/tmp/usr/bin/dbus-launch
debian/tmp/usr/bin/dbus-send
+debian/tmp/usr/bin/dbus-uuidgen
debian/tmp/usr/share/man/man1/dbus-daemon.1
debian/tmp/usr/share/man/man1/dbus-cleanup-sockets.1
debian/tmp/usr/share/dbus-1/services
debian/tmp/usr/share/man/man1/dbus-launch.1
debian/tmp/usr/share/man/man1/dbus-send.1
+debian/tmp/usr/share/man/man1/dbus-uuidgen.1
Added: packages/unstable/dbus/debian/libdbus-1-3.shlibs
===================================================================
--- packages/unstable/dbus/debian/libdbus-1-3.shlibs (rev 0)
+++ packages/unstable/dbus/debian/libdbus-1-3.shlibs 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1 @@
+libdbus-1 3 libdbus-1-3 (>= 0.94)
Copied: packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch (from rev 1091, packages/unstable/dbus/debian/patches/dbus-quiesce-startup-errors.patch)
===================================================================
--- packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch (rev 0)
+++ packages/unstable/dbus/debian/patches/00_dbus-quiesce-startup-errors.patch 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1,23 @@
+--- 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 @@
+ {
+ 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",
++ error->message,
++ _dbus_string_get_const_data(&full_path));
++ dbus_error_free (error);
++ }
+ }
+ }
+
Added: packages/unstable/dbus/debian/patches/10_dbus_uuid_in_var.patch
===================================================================
--- packages/unstable/dbus/debian/patches/10_dbus_uuid_in_var.patch (rev 0)
+++ packages/unstable/dbus/debian/patches/10_dbus_uuid_in_var.patch 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1,83 @@
+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.
Added: packages/unstable/dbus/debian/patches/99_rerun_automake.patch
===================================================================
--- packages/unstable/dbus/debian/patches/99_rerun_automake.patch (rev 0)
+++ packages/unstable/dbus/debian/patches/99_rerun_automake.patch 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1,445 @@
+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 \
Deleted: packages/unstable/dbus/debian/patches/dbus-quiesce-startup-errors.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-quiesce-startup-errors.patch 2006-10-23 23:08:25 UTC (rev 1091)
+++ packages/unstable/dbus/debian/patches/dbus-quiesce-startup-errors.patch 2006-10-24 09:31:53 UTC (rev 1092)
@@ -1,23 +0,0 @@
---- 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 @@
- {
- 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",
-+ error->message,
-+ _dbus_string_get_const_data(&full_path));
-+ dbus_error_free (error);
-+ }
- }
- }
-
Modified: packages/unstable/dbus/debian/rules
===================================================================
--- packages/unstable/dbus/debian/rules 2006-10-23 23:08:25 UTC (rev 1091)
+++ packages/unstable/dbus/debian/rules 2006-10-24 09:31:53 UTC (rev 1092)
@@ -8,10 +8,12 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+# List any files which are not installed
+common-binary-post-install-arch:: list-missing
DEB_CONFIGURE_EXTRA_FLAGS := --enable-xml-docs --enable-doxygen-docs
-DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/libdbus-1-2/usr/lib/
+DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/libdbus-1-3/usr/lib/
binary-post-install/dbus::
mkdir -p debian/dbus/etc/dbus-1/event.d
Added: packages/unstable/dbus/debian/shlibs.local
===================================================================
--- packages/unstable/dbus/debian/shlibs.local (rev 0)
+++ packages/unstable/dbus/debian/shlibs.local 2006-10-24 09:31:53 UTC (rev 1092)
@@ -0,0 +1 @@
+libdbus-1 3 libdbus-1-3 (>= 0.94)
More information about the Pkg-utopia-commits
mailing list