[Pkg-utopia-commits] r1297 - in packages/experimental/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-21 18:15:19 +0000 (Wed, 21 Mar 2007)
New Revision: 1297

Removed:
   packages/experimental/hal/debian/patches/19_sonypi_support.patch
Modified:
   packages/experimental/hal/debian/changelog
Log:
Delete obsolete patch. spicctrl is not used anymore.
See commit 8c6718bea8e57b6165ec164e55246b29f350e0aa for further details.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-21 14:35:17 UTC (rev 1296)
+++ packages/experimental/hal/debian/changelog	2007-03-21 18:15:19 UTC (rev 1297)
@@ -17,6 +17,9 @@
     - debian/patches/25_correctly_free_lists.patch
     - debian/patches/26_fix_hald_not_running_coredump.patch
     - debian/patches/27_hal_fix_dbus_error_is_set.patch
+  * debian/patches/19_sonypi_support.patch
+    - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
+      is used directly.
   * debian/patches/55_nonpolkit-mount-policy.patch
     - Removed. We depend on PolicyKit now to check if a user is authorized to
       mount local partitions.

Deleted: packages/experimental/hal/debian/patches/19_sonypi_support.patch
===================================================================
--- packages/experimental/hal/debian/patches/19_sonypi_support.patch	2007-03-21 14:35:17 UTC (rev 1296)
+++ packages/experimental/hal/debian/patches/19_sonypi_support.patch	2007-03-21 18:15:19 UTC (rev 1297)
@@ -1,33 +0,0 @@
-diff -aur hal-0.5.8.vanilla/tools/linux/hal-system-lcd-get-brightness-linux hal-0.5.8/tools/linux/hal-system-lcd-get-brightness-linux
---- hal-0.5.8.vanilla/tools/linux/hal-system-lcd-get-brightness-linux	2006-09-11 23:56:40.000000000 +0200
-+++ hal-0.5.8/tools/linux/hal-system-lcd-get-brightness-linux	2006-09-17 12:20:05.000000000 +0200
-@@ -55,7 +55,7 @@
- 	# spicctrl -B
- 	# 70
- 	# 0..255
--	value="`/usr/sbin/spicctrl -B`"
-+	value="`/usr/bin/spicctrl -B`"
- 	RETVAL=$?
- 	if [ $RETVAL != 0 ]; then
- 		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
---- hal-0.5.8.vanilla/tools/linux/hal-system-lcd-set-brightness-linux
-+++ hal-0.5.8/tools/linux/hal-system-lcd-set-brightness-linux
-@@ -46,16 +46,7 @@ 
- elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then
- 	# http://bugzilla.gnome.org/show_bug.cgi?id=331458
- 	echo "$value" > $HAL_PROP_LINUX_ACPI_PATH
- elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sonypi" ]; then
--	# spicctrl -B
--	# 70
--	# 0..255
--	value="`/usr/sbin/spicctrl -B`"
--	RETVAL=$?
--	if [ $RETVAL != 0 ]; then
--		echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
--		exit 1;
--	fi
--	exit ${value}
-+	/usr/bin/spicctrl -b ${value}
- else
- 	echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2
- 	echo "No ACPI method found" >&2