[Pkg-utopia-commits] r277 - in packages/experimental/dbus/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Fri Aug 26 19:57:05 UTC 2005
Author: sjoerd
Date: 2005-08-26 19:57:04 +0000 (Fri, 26 Aug 2005)
New Revision: 277
Added:
packages/experimental/dbus/debian/dbus.prerm
packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch
Removed:
packages/experimental/dbus/debian/patches/dbus-gilstate.patch
packages/experimental/dbus/debian/patches/dbus_cmsgcred.patch
Modified:
packages/experimental/dbus/debian/changelog
packages/experimental/dbus/debian/control
packages/experimental/dbus/debian/dbus-1-utils.install
packages/experimental/dbus/debian/dbus.init
packages/experimental/dbus/debian/dbus.postinst
packages/experimental/dbus/debian/libdbus-1-dev.install
packages/experimental/dbus/debian/libdbus-glib-1-dev.install
packages/experimental/dbus/debian/libdbus-qt-1-dev.install
packages/experimental/dbus/debian/rules
Log:
* New upstream release (Closes: #319593, #324016)
* debian/patches/dbus_cmsgcred.patch
+ Removed. Fixed upstream.
* debian/patches/dbus-gilstate.patch
+ Removed. Fixed upstream.
* Sync with the ubuntu package
+ Remove dbus_bindings.{a,la} from python2.4-dbus
+ debian/patches/dbus-make-libtool-safe.patch
- Added. Replace explicit libtool calls with $(LIBTOOL) in
glib/Makefile.*
+ Don't include the .la files in the dev packages.
+ Don't restart dbus on upgrade. Too many applications don't handle it
correctly.
+ Switched the init script to lsb-base
+ Ship dbus-binding-tool and dbus-viewer with dbus-1-utils
Modified: packages/experimental/dbus/debian/changelog
===================================================================
--- packages/experimental/dbus/debian/changelog 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/changelog 2005-08-26 19:57:04 UTC (rev 277)
@@ -1,3 +1,23 @@
+dbus (0.36-1) experimental; urgency=low
+
+ * New upstream release (Closes: #319593, #324016)
+ * debian/patches/dbus_cmsgcred.patch
+ + Removed. Fixed upstream.
+ * debian/patches/dbus-gilstate.patch
+ + Removed. Fixed upstream.
+ * Sync with the ubuntu package
+ + Remove dbus_bindings.{a,la} from python2.4-dbus
+ + debian/patches/dbus-make-libtool-safe.patch
+ - Added. Replace explicit libtool calls with $(LIBTOOL) in
+ glib/Makefile.*
+ + Don't include the .la files in the dev packages.
+ + Don't restart dbus on upgrade. Too many applications don't handle it
+ correctly.
+ + Switched the init script to lsb-base
+ + Ship dbus-binding-tool and dbus-viewer with dbus-1-utils
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 26 Aug 2005 21:46:23 +0200
+
dbus (0.34-4) experimental; urgency=low
* libdbus-1-cil improvements based on comments from Mirco Bauer
Modified: packages/experimental/dbus/debian/control
===================================================================
--- packages/experimental/dbus/debian/control 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/control 2005-08-26 19:57:04 UTC (rev 277)
@@ -8,7 +8,7 @@
Package: dbus
Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.22.0)
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.22.0), lsb-base
Conflicts: libdbus0, dbus-1
Replaces: libdbus0, dbus-1
Description: simple interprocess messaging system
Modified: packages/experimental/dbus/debian/dbus-1-utils.install
===================================================================
--- packages/experimental/dbus/debian/dbus-1-utils.install 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/dbus-1-utils.install 2005-08-26 19:57:04 UTC (rev 277)
@@ -1,3 +1,5 @@
+debian/tmp/usr/bin/dbus-binding-tool
+debian/tmp/usr/bin/dbus-viewer
debian/tmp/usr/bin/dbus-launch
debian/tmp/usr/bin/dbus-monitor
debian/tmp/usr/bin/dbus-send
Modified: packages/experimental/dbus/debian/dbus.init
===================================================================
--- packages/experimental/dbus/debian/dbus.init 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/dbus.init 2005-08-26 19:57:04 UTC (rev 277)
@@ -15,6 +15,8 @@
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
# Source defaults file; edit that file to configure this script.
ENABLED=1
PARAMS=""
@@ -34,16 +36,16 @@
if [ -e $PIDFILE ]; then
PIDDIR=/proc/$(cat $PIDFILE)
if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
- echo "$DESC already started; not starting."
+ log_success_msg "$DESC already started; not starting."
else
- echo "Removing stale PID file $PIDFILE."
+ log_success_msg "Removing stale PID file $PIDFILE."
rm -f $PIDFILE
fi
fi
- echo -n "Starting $DESC: "
+ log_begin_msg "Starting $DESC: "
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
- echo "$NAME."
+ log_end_msg $?
if [ -d $EVENTDIR ]; then
run-parts --arg=start $EVENTDIR
fi
@@ -54,14 +56,14 @@
if [ -d $EVENTDIR ]; then
run-parts --reverse --arg=stop $EVENTDIR
fi
- echo -n "Stopping $DESC: "
+ log_begin_msg "Stopping $DESC: "
start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \
--user $DAEMONUSER
# We no longer include these arguments so that start-stop-daemon
# can do its job even given that we may have been upgraded.
# We rely on the pidfile being sanely managed
# --exec $DAEMON -- --system $PARAMS
- echo "$NAME."
+ log_end_msg $?
rm -f $PIDFILE
}
Modified: packages/experimental/dbus/debian/dbus.postinst
===================================================================
--- packages/experimental/dbus/debian/dbus.postinst 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/dbus.postinst 2005-08-26 19:57:04 UTC (rev 277)
@@ -10,12 +10,11 @@
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-if [ -x "/etc/init.d/dbus" ] && [ "$1" = "configure" ] && [ "x$2" != "x" ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- /usr/sbin/invoke-rc.d dbus stop
- else
- /etc/init.d/dbus stop
- fi
+# Do not restart dbus on upgrades, only on fresh installations
+if [ "$1" = "configure" ]; then
+ if [ -e /var/run/dbus/pid ] && ps --no-heading -p $(< /var/run/dbus/pid) > /dev/null; then
+ exit 0
+ fi
fi
#DEBHELPER#
Added: packages/experimental/dbus/debian/dbus.prerm
===================================================================
--- packages/experimental/dbus/debian/dbus.prerm 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/dbus.prerm 2005-08-26 19:57:04 UTC (rev 277)
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+# Do not restart dbus on upgrades, only stop if we remove the package
+if [ "$1" = "upgrade" ]; then
+ exit 0
+fi
+
+#DEBHELPER#
Modified: packages/experimental/dbus/debian/libdbus-1-dev.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-1-dev.install 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/libdbus-1-dev.install 2005-08-26 19:57:04 UTC (rev 277)
@@ -3,4 +3,3 @@
debian/tmp/usr/lib/pkgconfig/dbus-1.pc
debian/tmp/usr/lib/libdbus-1*.a
debian/tmp/usr/lib/libdbus-1*.so
-debian/tmp/usr/lib/libdbus-1*.la
Modified: packages/experimental/dbus/debian/libdbus-glib-1-dev.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-glib-1-dev.install 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/libdbus-glib-1-dev.install 2005-08-26 19:57:04 UTC (rev 277)
@@ -2,4 +2,3 @@
debian/tmp/usr/lib/pkgconfig/dbus-glib-1.pc
debian/tmp/usr/lib/libdbus-glib-*.a
debian/tmp/usr/lib/libdbus-glib-*.so
-debian/tmp/usr/lib/libdbus-glib-*.la
Modified: packages/experimental/dbus/debian/libdbus-qt-1-dev.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-qt-1-dev.install 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/libdbus-qt-1-dev.install 2005-08-26 19:57:04 UTC (rev 277)
@@ -4,4 +4,3 @@
debian/tmp/usr/include/dbus*/dbus/message.h
debian/tmp/usr/lib/libdbus-qt*.a
debian/tmp/usr/lib/libdbus-qt*.so
-debian/tmp/usr/lib/libdbus-qt*.la
Deleted: packages/experimental/dbus/debian/patches/dbus-gilstate.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus-gilstate.patch 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/patches/dbus-gilstate.patch 2005-08-26 19:57:04 UTC (rev 277)
@@ -1,85 +0,0 @@
---- python/dbus_bindings.pyx.in.orig 2005-06-24 15:50:05.080480624 +0200
-+++ python/dbus_bindings.pyx.in 2005-06-24 15:56:22.559095152 +0200
-@@ -26,6 +26,13 @@
- void Py_XINCREF (object)
- void Py_XDECREF (object)
- object PyString_FromStringAndSize(char *, int)
-+ ctypedef void *PyGILState_STATE
-+ void PyErr_Clear()
-+ PyGILState_STATE PyGILState_Ensure()
-+ void PyGILState_Release(PyGILState_STATE)
-+
-+cdef extern from "stdio.h":
-+ int printf(char *format,...)
-
- ctypedef struct DBusError:
- char *name
-@@ -150,37 +157,45 @@
- cdef void cunregister_function_handler (DBusConnection *connection,
- void *user_data):
- cdef Connection conn
-- tup = <object>user_data
-- assert (type(tup) == list)
-- function = tup[1]
-- conn = Connection()
-- conn.__cinit__(None, connection)
-+ cdef PyGILState_STATE gil
-
-- args = [conn]
-- function(*args)
-+ gil = PyGILState_Ensure()
-+ try:
-+ tup = <object>user_data
-+ assert (type(tup) == list)
-+ function = tup[1]
-+ conn = Connection()
-+ conn.__cinit__(None, connection)
-+
-+ args = [conn]
-+ function(*args)
-+ finally:
-+ PyGILState_Release(gil)
-
- cdef DBusHandlerResult cmessage_function_handler (DBusConnection *connection,
- DBusMessage *msg,
- void *user_data):
- cdef Connection conn
- cdef Message message
-+ cdef PyGILState_STATE gil
-
-- tup = <object>user_data
-- assert (type(tup) == list)
-- function = tup[0]
-- message = Message(_create=0)
-- message._set_msg(msg)
--
-- conn = Connection()
-- conn.__cinit__(None, connection)
--
-- args = [conn,
-- message]
-- retval = function(*args)
-- if (retval == None):
-- retval = DBUS_HANDLER_RESULT_HANDLED
--
-- return retval
-+ gil = PyGILState_Ensure()
-+ try:
-+ tup = <object>user_data
-+ assert (type(tup) == list)
-+ function = tup[0]
-+ message = Message(_create=0)
-+ message._set_msg(msg)
-+ conn = Connection()
-+ conn.__cinit__(None, connection)
-+ args = [conn,
-+ message]
-+ retval = function(*args)
-+ if (retval == None):
-+ retval = DBUS_HANDLER_RESULT_HANDLED
-+ return retval
-+ finally:
-+ PyGILState_Release(gil)
-
- cdef class Connection:
- cdef DBusConnection *conn
Added: packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch 2005-08-26 19:57:04 UTC (rev 277)
@@ -0,0 +1,87 @@
+--- glib/Makefile.in.orig 2005-08-09 09:51:35.000000000 +1000
++++ glib/Makefile.in 2005-08-09 09:53:02.000000000 +1000
+@@ -971,7 +971,7 @@
+
+
+ dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
+- libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
++ $(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
+
+ regenerate-built-sources:
+ @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
+--- glib/examples/Makefile.am.orig 2005-08-09 10:09:36.000000000 +1000
++++ glib/examples/Makefile.am 2005-08-09 10:09:57.000000000 +1000
+@@ -15,7 +15,7 @@
+ BUILT_SOURCES = example-service-glue.h
+
+ example-service-glue.h: example-service.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
+
+
+ ## Makefile.am bits for another client/server pair
+@@ -31,7 +31,7 @@
+ BUILT_SOURCES += example-signal-emitter-glue.h
+
+ example-signal-emitter-glue.h: example-signal-emitter.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
+
+ CLEANFILES = $(BUILT_SOURCES)
+
+--- glib/examples/Makefile.in.orig 2005-08-09 10:09:39.000000000 +1000
++++ glib/examples/Makefile.in 2005-08-09 10:10:18.000000000 +1000
+@@ -723,10 +723,10 @@
+
+
+ example-service-glue.h: example-service.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
+
+ example-signal-emitter-glue.h: example-signal-emitter.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- glib/examples/statemachine/Makefile.am.orig 2005-08-09 10:10:45.000000000 +1000
++++ glib/examples/statemachine/Makefile.am 2005-08-09 10:11:04.000000000 +1000
+@@ -19,10 +19,10 @@
+ BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h
+
+ statemachine-server-glue.h: statemachine-server.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
+
+ statemachine-glue.h: statemachine.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
+
+ sm-marshal.c: Makefile sm-marshal.list
+ @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
+--- glib/examples/statemachine/Makefile.in.orig 2005-08-09 10:10:43.000000000 +1000
++++ glib/examples/statemachine/Makefile.in 2005-08-09 10:11:20.000000000 +1000
+@@ -595,10 +595,10 @@
+
+
+ statemachine-server-glue.h: statemachine-server.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
+
+ statemachine-glue.h: statemachine.xml
+- libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
++ $(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
+
+ sm-marshal.c: Makefile sm-marshal.list
+ @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
+--- glib/Makefile.am.orig 2005-08-10 02:44:50.000000000 +1000
++++ glib/Makefile.am 2005-08-09 09:52:04.000000000 +1000
+@@ -5,7 +5,7 @@
+ lib_LTLIBRARIES=libdbus-glib-1.la
+
+ dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
+- libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
++ $(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
+
+ BUILT_SOURCES = dbus-glib-error-switch.h
+
Deleted: packages/experimental/dbus/debian/patches/dbus_cmsgcred.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus_cmsgcred.patch 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/patches/dbus_cmsgcred.patch 2005-08-26 19:57:04 UTC (rev 277)
@@ -1,13 +0,0 @@
---- dbus-0.23.4/dbus/dbus-sysdeps.c.orig 2005-06-02 20:00:58.000000000 +0200
-+++ dbus-0.23.4/dbus/dbus-sysdeps.c 2005-06-02 20:01:37.000000000 +0200
-@@ -862,8 +862,8 @@
- #ifdef HAVE_CMSGCRED
- if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS)
- {
-- dbus_set_error (error, DBUS_ERROR_FAILED);
-- _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n");
-+ dbus_set_error (error, DBUS_ERROR_FAILED,
-+ "Message from recvmsg() was not SCM_CREDS");
- return FALSE;
- }
- #endif
Modified: packages/experimental/dbus/debian/rules
===================================================================
--- packages/experimental/dbus/debian/rules 2005-08-23 14:17:21 UTC (rev 276)
+++ packages/experimental/dbus/debian/rules 2005-08-26 19:57:04 UTC (rev 277)
@@ -6,6 +6,7 @@
binary/libdbus-qt-1-1:: binary/libdbus-1-1
binary/dbus-1-utils:: binary/libdbus-glib-1-1
binary/python2.4-dbus::
+ rm debian/python2.4-dbus/usr/lib/python2.4/site-packages/dbus/dbus_bindings.*a
dh_python -ppython2.4-dbus
include /usr/share/cdbs/1/rules/simple-patchsys.mk
More information about the Pkg-utopia-commits
mailing list