[Pkg-utopia-commits] r1914 - in /packages/unstable/hal/debian: changelog patches/86_fix_killswitch_callout.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Dec  8 18:49:37 2007
New Revision: 1914

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1914
Log:
  - Don't ignore addgroup errors.
* debian/patches/86_fix_killswitch_callout.patch:
  - Added. Fixes errors from the killswitch callouts on non-dell machines
    (Closes: #453203)

Added:
    packages/unstable/hal/debian/patches/86_fix_killswitch_callout.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=1914&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sat Dec  8 18:49:37 2007
@@ -1,9 +1,15 @@
 hal (0.5.10-5) UNRELEASED; urgency=low
 
+  [ Michael Biebl ]
   * debian/hal.postinst
     - Remove superfluous getent calls. adduser is clever enough to omit
       creating accounts if they already exist.
-    - Don't ignore addgroup errors. 
+    - Don't ignore addgroup errors.
+
+  [ Sjoerd Simons ]
+  * debian/patches/86_fix_killswitch_callout.patch:
+    - Added. Fixes errors from the killswitch callouts on non-dell machines
+      (Closes: #453203)
 
  -- Michael Biebl <biebl at debian.org>  Mon, 03 Dec 2007 00:27:14 +0100
 

Added: packages/unstable/hal/debian/patches/86_fix_killswitch_callout.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/86_fix_killswitch_callout.patch?rev=1914&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/86_fix_killswitch_callout.patch (added)
+++ packages/unstable/hal/debian/patches/86_fix_killswitch_callout.patch Sat Dec  8 18:49:37 2007
@@ -1,0 +1,47 @@
+commit c573f7a5d3d6e8e7d3480ba45517a5cd3203c44c
+Author: Sjoerd Simons <sjoerd at luon.net>
+Date:   Sat Dec 8 19:30:00 2007 +0100
+
+    always define DELL_WCTL
+    
+    This fixes errors from some shell when running the killswitch callouts
+    because DEL_WCTL is undefined when the killswitch access method is not dell.
+
+diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
+index c24253f..5a1fb3f 100755
+--- a/tools/linux/hal-system-killswitch-get-power-linux
++++ b/tools/linux/hal-system-killswitch-get-power-linux
+@@ -8,11 +8,9 @@
+ # 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
++DELL_WCTL=/usr/bin/dellWirelessCtl
++if [ -x /usr/sbin/dellWirelessCtl ]; then
++  DELL_WCTL=/usr/sbin/dellWirelessCtl
+ fi
+ 
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
+index 2ef9ebe..4120c2d 100755
+--- a/tools/linux/hal-system-killswitch-set-power-linux
++++ b/tools/linux/hal-system-killswitch-set-power-linux
+@@ -8,11 +8,9 @@
+ # 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
++DELL_WCTL=/usr/bin/dellWirelessCtl
++if [ -x /usr/sbin/dellWirelessCtl ]; then
++    DELL_WCTL=/usr/sbin/dellWirelessCtl
+ fi
+ 
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then