Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2005a02b5e9108562e53455d4bfb6e594c851bce
commit 2005a02b5e9108562e53455d4bfb6e594c851bce Author: Priyank <[email protected]> Date: Mon Jan 26 16:48:08 2009 +0530 dbus-1.2.12-4-i686 * Removed unwanted check in rc.dbus [thanks crazy] * Removed messages (no longer work with new initscript) * Removed rc.dbus.new (we already have the new one now) diff --git a/source/apps/dbus/FrugalBuild b/source/apps/dbus/FrugalBuild index bd5b083..abbe464 100644 --- a/source/apps/dbus/FrugalBuild +++ b/source/apps/dbus/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dbus pkgver=1.2.12 -pkgrel=3 +pkgrel=4 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus"; depends=('libxml2' 'expat') @@ -15,7 +15,7 @@ up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ rc.$pkgname dbus-1-launch dbus-1-launch.desktop) sha1sums=('13de8dc28c9edae7b9d2928ff691549bb2bef21a' \ - 'df54704a1ac4fc0125e8b181f5307ff8a26df554' \ + 'b624f50a56ac56c6d6fbe0a9873c4672d3584e02' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ 'da9efab479aa3a2a8fb365a89ed658646486c39f') diff --git a/source/apps/dbus/messages/dbus.en b/source/apps/dbus/messages/dbus.en deleted file mode 100644 index 01542c9..0000000 --- a/source/apps/dbus/messages/dbus.en +++ /dev/null @@ -1,2 +0,0 @@ -stopdbus="Stopping system message bus" -startdbus="Starting system message bus" diff --git a/source/apps/dbus/messages/dbus.hu b/source/apps/dbus/messages/dbus.hu deleted file mode 100644 index 0cd29f5..0000000 --- a/source/apps/dbus/messages/dbus.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopdbus="A rendszerüzenetbusz leállítása" -startdbus="A rendszerüzenetbusz indítása" diff --git a/source/apps/dbus/rc.dbus b/source/apps/dbus/rc.dbus index c09341b..ca4685a 100644 --- a/source/apps/dbus/rc.dbus +++ b/source/apps/dbus/rc.dbus @@ -31,9 +31,7 @@ rc_start() [ -d /usr/share/dbus-1/services ] || mkdir -p /usr/share/dbus-1/services ## this need be here /usr/bin/dbus-uuidgen --ensure - if [ ! -e $DPID ]; then - /usr/bin/dbus-daemon --system - fi + /usr/bin/dbus-daemon --system ok $? fi } diff --git a/source/apps/dbus/rc.dbus.new b/source/apps/dbus/rc.dbus.new deleted file mode 100644 index 7d55606..0000000 --- a/source/apps/dbus/rc.dbus.new +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2004 Laszlo Dvornik <[email protected]> -# rc.dbus for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 97 03 -# description: This is a daemon which broadcasts notifications of system events -# and other messages. - -source /lib/initscripts/functions -TEXTDOMAIN=dbus - -actions=(restart start status stop) -daemon=$"system message bus" - -pid="$(pidof dbus-daemon 2> /dev/null)" - -rc_start() -{ - start_msg - if [ -z ${pid} ] ; then - /usr/bin/dbus-daemon --system - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z ${pid} ] ; then - killall dbus-daemon - rm -f /var/run/dbus.pid - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
