[Pkg-utopia-commits] r1869 - in /packages/unstable/hal/debian: changelog patches/70_killswitch_dell.patch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Nov 18 22:25:09 UTC 2007
Author: sjoerd
Date: Sun Nov 18 22:25:09 2007
New Revision: 1869
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1869
Log:
* debian/patches/70_killswitch_dell.patch
- Replaced by the version as applied to upstream git.
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/patches/70_killswitch_dell.patch
Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1869&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sun Nov 18 22:25:09 2007
@@ -9,6 +9,8 @@
upstream git)
* debian/patches/80_fix_int_outof.patch
- Added. Fixes int_outof match target in fdi files (from upstream git)
+ * debian/patches/70_killswitch_dell.patch
+ - Replaced by the version as applied to upstream git.
-- Michael Biebl <biebl at debian.org> Wed, 24 Oct 2007 16:19:33 +0200
Modified: 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=1869&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/70_killswitch_dell.patch (original)
+++ packages/unstable/hal/debian/patches/70_killswitch_dell.patch Sun Nov 18 22:25:09 2007
@@ -1,72 +1,111 @@
+commit 64e4ac8ff8570f315c6a99cdf6d221ba845dcf5a
+Author: Danny Kukawka <danny.kukawka at web.de>
+Date: Mon Nov 12 19:48:59 2007 +0100
+
+ fix hal to work with libsmbios v0.13.12
+
+ Fixed HAL to work again with libsmbios v0.13.12 where the binaries
+ get moved from /usr/bin/ to /usr/sbin/. Needed to change some paths
+ in hal-system-killswitch-{g,s}et-power-linux to work with the new
+ and older versions correctly.
+
diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
-index f19d1f4..0d1906f 100755
+index f19d1f4..c24253f 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
+@@ -8,6 +8,13 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
++if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
++ DELL_WCTL=/usr/bin/dellWirelessCtl
++ if [ -x /usr/sbin/dellWirelessCtl ]; then
++ DELL_WCTL=/usr/sbin/dellWirelessCtl
++ fi
++fi
++
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ value="`hal-system-sonypic getbluetooth`"
+@@ -17,9 +24,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
++ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
# TODO: write our own binary that links with libsmbios?
- /usr/bin/dellWirelessCtl --st_bt
-+ /usr/sbin/dellWirelessCtl --st_bt
++ $DELL_WCTL --st_bt
value=$?
if [ "$value" = "0" ]; then
exit 1
-@@ -35,9 +35,9 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+@@ -35,9 +42,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
++ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
# TODO: write our own binary that links with libsmbios?
- /usr/bin/dellWirelessCtl --st_wlan
-+ /usr/sbin/dellWirelessCtl --st_wlan
++ $DELL_WCTL --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
+index 85a4548..2ef9ebe 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
+@@ -8,6 +8,13 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
++if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
++ DELL_WCTL=/usr/bin/dellWirelessCtl
++ if [ -x /usr/sbin/dellWirelessCtl ]; then
++ DELL_WCTL=/usr/sbin/dellWirelessCtl
++ fi
++fi
++
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ hal-system-sonypic setbluetooth $value
+@@ -16,16 +23,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
++ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; 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
++ $DELL_WCTL --sw_bt 0 --bt 1
ret=$?
else
- /usr/bin/dellWirelessCtl --sw_bt 0 --bt 0
-+ /usr/sbin/dellWirelessCtl --sw_bt 0 --bt 0
++ $DELL_WCTL --sw_bt 0 --bt 0
ret=$?
fi
if [ "$ret" != "0" ]; then
-@@ -38,16 +38,16 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+@@ -38,16 +45,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
++ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; 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
++ $DELL_WCTL --sw_wlan 0 --wlan 1
ret=$?
else
- /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 0
-+ /usr/sbin/dellWirelessCtl --sw_wlan 0 --wlan 0
++ $DELL_WCTL --sw_wlan 0 --wlan 0
ret=$?
fi
if [ "$ret" != "0" ]; then
More information about the Pkg-utopia-commits
mailing list