# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1318819090 0
# Node ID e02c4bd5b85511a892cb7c22df36cff2678d1c02
# Parent  53665c5f3df680fd25ee649b6c7574be6e83c7f4
Up: dbus to 1.4.16.

diff -r 53665c5f3df6 -r e02c4bd5b855 dbus-dev/receipt
--- a/dbus-dev/receipt	Mon Oct 17 02:35:46 2011 +0000
+++ b/dbus-dev/receipt	Mon Oct 17 02:38:10 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dbus-dev"
-VERSION="1.4.8"
+VERSION="1.4.16"
 CATEGORY="development"
 SHORT_DESC="D-Bus is a message bus system devel files."
 DEPENDS="dbus"
@@ -13,8 +13,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/dbus-1.0 $fs/usr/lib
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/dbus-1.0 $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 }
diff -r 53665c5f3df6 -r e02c4bd5b855 dbus/receipt
--- a/dbus/receipt	Mon Oct 17 02:35:46 2011 +0000
+++ b/dbus/receipt	Mon Oct 17 02:38:10 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dbus"
-VERSION="1.4.8"
+VERSION="1.4.16"
 CATEGORY="x-window"
 SHORT_DESC="D-Bus is a message bus system."
 DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
@@ -29,16 +29,16 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $_pkg/etc $fs
-	cp -a $_pkg/var $fs
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/dbus $fs/usr/lib
+	cp -a $install/etc $fs
+	cp -a $install/var $fs
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/dbus $fs/usr/lib
 	# Remove helper (600 Kb).
 	rm $fs/usr/lib/dbus/dbus-daemon-launch-helper
-	cp -a $_pkg/usr/share/dbus* $fs/usr/share
+	cp -a $install/usr/share/dbus* $fs/usr/share
 	# Init script
-	cp -a stuff/etc $fs
+	cp -a $stuff/etc $fs
 	chown -R root.root $fs
 }
 
@@ -69,6 +69,8 @@
 
 pre_remove()
 {
-	/etc/init.d/dbus stop
-	deluser messagebus
+	if [ -z "$1" ]; then
+		/etc/init.d/dbus stop
+		deluser messagebus
+	fi
 }