wok-next diff dbus/receipt @ rev 11298

Fix: pidgin menu icon
author Alexander Medvedev <devl547@gmail.com>
date Sat Nov 12 18:20:29 2011 +0000 (2011-11-12)
parents 7cd6fe509e75
children 73641efed1cc
line diff
     1.1 --- a/dbus/receipt	Fri May 20 16:14:39 2011 +0000
     1.2 +++ b/dbus/receipt	Sat Nov 12 18:20:29 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dbus"
     1.7 -VERSION="1.4.8"
     1.8 +VERSION="1.4.16"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="D-Bus is a message bus system."
    1.11  DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
    1.12 @@ -29,16 +29,16 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr/lib $fs/usr/share
    1.16 -	cp -a $_pkg/etc $fs
    1.17 -	cp -a $_pkg/var $fs
    1.18 -	cp -a $_pkg/usr/bin $fs/usr
    1.19 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.20 -	cp -a $_pkg/usr/lib/dbus $fs/usr/lib
    1.21 +	cp -a $install/etc $fs
    1.22 +	cp -a $install/var $fs
    1.23 +	cp -a $install/usr/bin $fs/usr
    1.24 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.25 +	cp -a $install/usr/lib/dbus $fs/usr/lib
    1.26  	# Remove helper (600 Kb).
    1.27  	rm $fs/usr/lib/dbus/dbus-daemon-launch-helper
    1.28 -	cp -a $_pkg/usr/share/dbus* $fs/usr/share
    1.29 +	cp -a $install/usr/share/dbus* $fs/usr/share
    1.30  	# Init script
    1.31 -	cp -a stuff/etc $fs
    1.32 +	cp -a $stuff/etc $fs
    1.33  	chown -R root.root $fs
    1.34  }
    1.35  
    1.36 @@ -69,6 +69,8 @@
    1.37  
    1.38  pre_remove()
    1.39  {
    1.40 -	/etc/init.d/dbus stop
    1.41 -	deluser messagebus
    1.42 +	if [ -z "$1" ]; then
    1.43 +		/etc/init.d/dbus stop
    1.44 +		deluser messagebus
    1.45 +	fi
    1.46  }