[Pkg-utopia-commits] r1801 - in /packages/unstable/hal/debian: changelog patches/70_killswitch_dell.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 22 07:15:27 2007
New Revision: 1801

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1801
Log:
  - Correctly initializes the dbus error struct in the acpi addon
* Remove patches that were merged upstream
* debian/patches/70_killswitch_dell.patch
  - Fix the path for the dellWirelessCtl utility (Closes: #443583).

Added:
    packages/unstable/hal/debian/patches/70_killswitch_dell.patch
Modified:
    packages/unstable/hal/debian/changelog

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1801&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Mon Oct 22 07:15:27 2007
@@ -3,7 +3,7 @@
   * New upstream release.
     - Ships the x11-input.fdi file which is required for the xorg input
       hotplugging (Closes: #446851).
-    - Correctly initializes the dbus error struct in the acpi addon 
+    - Correctly initializes the dbus error struct in the acpi addon
       (Closes: #438802).
 
     hal-device-manager has been removed from the upstream tarball. There is
@@ -27,12 +27,14 @@
     - Bump shlibs to >= 0.5.10 as the ABI has changed.
   * debian/hal.install
     - Install the hal-setup-keymap binary.
-  * Remove patches that were merged upstream 
+  * Remove patches that were merged upstream
     - debian/patches/68-pass-noquirks-to-pm-utils.patch
     - debian/patches/70-libhal-changeset-memleak.patch
     - debian/patches/75-hal-serial-null.patch
-
- -- Michael Biebl <biebl at debian.org>  Mon, 22 Oct 2007 08:50:30 +0200
+  * debian/patches/70_killswitch_dell.patch
+    - Fix the path for the dellWirelessCtl utility (Closes: #443583).
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 22 Oct 2007 09:12:51 +0200
 
 hal (0.5.9.1-6) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/70_killswitch_dell.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/70_killswitch_dell.patch?rev=1801&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/70_killswitch_dell.patch (added)
+++ packages/unstable/hal/debian/patches/70_killswitch_dell.patch Mon Oct 22 07:15:27 2007
@@ -1,0 +1,72 @@
+diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
+index f19d1f4..0d1906f 100755
+--- a/tools/linux/hal-system-killswitch-get-power-linux
++++ b/tools/linux/hal-system-killswitch-get-power-linux
+@@ -17,9 +17,9 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ 	    exit 1
+ 	fi
+ 	exit ${value}
+-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
++    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/sbin/dellWirelessCtl ]; then
+ 	# TODO: write our own binary that links with libsmbios?
+-	/usr/bin/dellWirelessCtl --st_bt
++	/usr/sbin/dellWirelessCtl --st_bt
+ 	value=$?
+ 	if [ "$value" = "0" ]; then
+ 	    exit 1
+@@ -35,9 +35,9 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ 	exit 1
+     fi
+ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
++    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/sbin/dellWirelessCtl ]; then
+ 	# TODO: write our own binary that links with libsmbios?
+-	/usr/bin/dellWirelessCtl --st_wlan
++	/usr/sbin/dellWirelessCtl --st_wlan
+ 	value=$?
+ 	if [ "$value" = "0" ]; then
+ 	    exit 1
+diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
+index 85a4548..1913c5d 100755
+--- a/tools/linux/hal-system-killswitch-set-power-linux
++++ b/tools/linux/hal-system-killswitch-set-power-linux
+@@ -16,16 +16,16 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ 	    exit 1
+ 	fi
+ 	exit 0
+-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
++    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/sbin/dellWirelessCtl ]; then
+ 
+ 	# As a side effect we disable the physical kill switch
+ 
+ 	# TODO: write our own binary that links with libsmbios?
+ 	if [ "$value" = "true" ]; then
+-	    /usr/bin/dellWirelessCtl --sw_bt 0 --bt 1
++	    /usr/sbin/dellWirelessCtl --sw_bt 0 --bt 1
+ 	    ret=$?
+ 	else
+-	    /usr/bin/dellWirelessCtl --sw_bt 0 --bt 0
++	    /usr/sbin/dellWirelessCtl --sw_bt 0 --bt 0
+ 	    ret=$?
+ 	fi
+ 	if [ "$ret" != "0" ]; then
+@@ -38,16 +38,16 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ 	exit 1
+     fi
+ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
++    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/sbin/dellWirelessCtl ]; then
+ 
+ 	# As a side effect we disable the physical kill switch
+ 
+ 	# TODO: write our own binary that links with libsmbios?
+ 	if [ "$value" = "true" ]; then
+-	    /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 1
++	    /usr/sbin/dellWirelessCtl --sw_wlan 0 --wlan 1
+ 	    ret=$?
+ 	else
+-	    /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 0
++	    /usr/sbin/dellWirelessCtl --sw_wlan 0 --wlan 0
+ 	    ret=$?
+ 	fi
+ 	if [ "$ret" != "0" ]; then