Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Fri Mar 26 00:57:35 CET 2010. -------- --- hal/hal-doc.changes 2010-03-11 19:14:57.000000000 +0100 +++ hal/hal-doc.changes 2010-03-26 00:56:02.710632000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 23 12:58:42 CET 2010 - hmacht@suse.de + +- add hal-fix-docking.patch ((bnc#561617): + - The logic in detecting the kernel version is flawed. Due to the + fact that HAL is supposed to die anyway, add a simple workaround + - fix docking flags + +------------------------------------------------------------------- hal.changes: same change calling whatdependson for head-i586 New: ---- hal-fix-docking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.z7Isff/_old 2010-03-26 00:56:16.000000000 +0100 +++ /var/tmp/diff_new_pack.z7Isff/_new 2010-03-26 00:56:16.000000000 +0100 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 3 +Release: 4 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -65,6 +65,7 @@ Patch2: hal-path_max.diff Patch3: hal-use-at-console.patch Patch4: hal-nonpolkit-mount-policy.patch +Patch5: hal-fix-docking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -113,6 +114,7 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 chmod 644 tools/hal-functions pushd hal-info-%{hal_info_version} popd hal.spec: same change ++++++ hal-fix-docking.patch ++++++ Index: hal-0.5.14/hald/linux/device.c =================================================================== --- hal-0.5.14.orig/hald/linux/device.c +++ hal-0.5.14/hald/linux/device.c @@ -93,6 +93,9 @@ static gboolean battery_poll_running = F static gboolean compare_ge_kernel_version (int major, int minor, int micro) { + /* this does not do what it should, so return TRUE in the SUSE package */ + return TRUE; + HalDevice *root; root = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer"); @@ -2174,7 +2177,7 @@ platform_refresh (HalDevice *d) /* undock still in progress? */ hal_util_get_int_from_file (sysfs_path, "flags", &flags, 0); if (compare_ge_kernel_version (2,6,28)) { - if (flags == 2) { + if (flags == 18) { g_timeout_add (DOCK_STATION_UNDOCK_POLL_INTERVAL, platform_refresh_undock, d); return TRUE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org