# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1242597148 -7200
# Node ID 0586a2e564d51e7242f0b4fc665cebdd6f0b0451
# Parent  4f3e1cae6aea75b7bf79108ca438fc85b64df5f1
Up: hal (0.5.12)

diff -r 4f3e1cae6aea -r 0586a2e564d5 hal-dev/receipt
--- a/hal-dev/receipt	Sun May 17 23:50:50 2009 +0200
+++ b/hal-dev/receipt	Sun May 17 23:52:28 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="hal-dev"
-VERSION="0.5.11"
+VERSION="0.5.12"
 CATEGORY="development"
 SHORT_DESC="Hal devel files."
 WANTED="hal"
diff -r 4f3e1cae6aea -r 0586a2e564d5 hal-extra/receipt
--- a/hal-extra/receipt	Sun May 17 23:50:50 2009 +0200
+++ b/hal-extra/receipt	Sun May 17 23:52:28 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="hal-extra"
-VERSION="0.5.11"
+VERSION="0.5.12"
 CATEGORY="x-window"
 SHORT_DESC="Hal devel files."
 WANTED="hal"
@@ -12,12 +12,12 @@
 hald-addon-cpufreq
 hald-addon-hid-ups
 hald-addon-imac-backlight
+hald-addon-ipw-killswitch
 hald-probe-video4linux
 hald-probe-net-bluetooth
 hald-probe-ieee1394-unit
 hald-probe-pc-floppy
-hald-probe-printer
-hal-ipw-killswitch-linux"
+hald-probe-printer"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 4f3e1cae6aea -r 0586a2e564d5 hal/receipt
--- a/hal/receipt	Sun May 17 23:50:50 2009 +0200
+++ b/hal/receipt	Sun May 17 23:52:28 2009 +0200
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="hal"
-VERSION="0.5.11"
+VERSION="0.5.12"
 CATEGORY="x-window"
 SHORT_DESC="Hardware Abstraction Layer."
-DEPENDS="dbus dbus-glib slitaz-base-files udev"
-BUILD_DEPENDS="dbus-dev dbus-glib-dev udev-dev udev pciutils"
+DEPENDS="dbus dbus-glib slitaz-base-files udev util-linux-ng-blkid"
+BUILD_DEPENDS="dbus-dev dbus-glib-dev udev-dev udev pciutils util-linux-ng-blkid-dev"
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
@@ -15,19 +15,19 @@
 hald-addon-cpufreq
 hald-addon-hid-ups
 hald-addon-imac-backlight
+hald-addon-ipw-killswitch
 hald-probe-video4linux
 hald-probe-net-bluetooth
 hald-probe-ieee1394-unit
 hald-probe-pc-floppy
-hald-probe-printer
-hal-ipw-killswitch-linux"
+hald-probe-printer"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
 	zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids &&
-	patch -p1 < ../stuff/hal-udev.patch || exit 1 &&
+	#patch -p1 < ../stuff/hal-udev.patch || exit 1 &&
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/hal \
diff -r 4f3e1cae6aea -r 0586a2e564d5 hal/stuff/hal-udev.patch
--- a/hal/stuff/hal-udev.patch	Sun May 17 23:50:50 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- hal-0.5.11/hald/linux/blockdev.c	2008-05-08 01:23:41.000000000 +0200
-+++ hal-0.5.11.new/hald/linux/blockdev.c	2008-10-26 17:21:21.317075298 +0100
-@@ -1750,11 +1750,11 @@
-         char *ret;
-         char *u_stdout;
-         int u_exit_status;
--        const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL};
-+        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
-         GError *g_error;
- 
-         ret = NULL;
--        argv[5] = sysfs_path;
-+        argv[6] = sysfs_path;
- 
-         g_error = NULL;
- 
---- hal-0.5.11/hald/linux/coldplug.c	2008-05-08 01:23:32.000000000 +0200
-+++ hal-0.5.11.new/hald/linux/coldplug.c	2008-10-26 17:20:38.451808974 +0100
-@@ -149,8 +149,8 @@
- static gboolean
- hal_util_init_sysfs_to_udev_map (void)
- {
--	char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL };
--	char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
-+	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
-+	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
- 	int udevinfo_exitcode;
- 	UdevInfo *info = NULL;
- 	char *p;