Mailinglist Archive: opensuse-commit (857 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package hal
checked in at Tue Nov 6 00:17:31 CET 2007.

--------
--- hal/hal.changes     2007-10-17 18:59:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes        2007-11-05 
12:27:31.000000000 +0100
@@ -1,0 +2,18 @@
+Sun Nov  4 17:44:19 CET 2007 - dkukawka@xxxxxxx
+
+- added new patch:
+  - hal-fix-dellWirelessCtl_0.13.12.diff: added support for the
+    new libsmbios v0.13.12 where the binaries are moved from
+    /usr/bin to /usr/sbin
+- fixed Requirements for hal-devel (need libsmbios-libs-devel on
+  some Archs)
+
+-------------------------------------------------------------------
+Tue Oct 30 19:44:46 CET 2007 - dkukawka@xxxxxxx
+
+- updated patch:
+  - hal-fix-acpi_on_battery_discharging.diff: free GSList objects
+    and added check to call the additional code only on primary
+    batteries.
+
+-------------------------------------------------------------------
hal-doc.changes: same change

New:
----
  hal-fix-dellWirelessCtl_0.13.12.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.Wi9184/_old  2007-11-06 00:14:20.000000000 +0100
+++ /var/tmp/diff_new_pack.Wi9184/_new  2007-11-06 00:14:20.000000000 +0100
@@ -23,13 +23,13 @@
 License:        Other uncritical OpenSource License
 Group:          System/Daemons
 Version:        0.5.10_git20071017 
-Release:        1
+Release:        12
 AutoReqProv:    on
 Requires:       pm-utils
 BuildRequires:  ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel 
gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted 
parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel 
update-desktop-files
 %ifarch %ix86 x86_64
-BuildRequires:  libsmbios-libs >= 0.13.4
-BuildRequires:  libsmbios-devel >= 0.13.4
+BuildRequires:  libsmbios-libs >= 0.13.12
+BuildRequires:  libsmbios-devel >= 0.13.12
 BuildRequires:  gcc-c++
 #!BuildIgnore:  pciutils-ids
 %endif
@@ -48,7 +48,7 @@
 Provides:       hotplugctl = 0.08
 Obsoletes:      hotplugctl <= 0.08
 %ifarch %ix86 x86_64 ia64
-Requires:       pmtools, libsmbios-libs >= 0.13.4
+Requires:       pmtools, libsmbios-libs >= 0.13.12
 %endif
 %ifarch %ix86 x86_64 
 Requires:       setserial
@@ -75,6 +75,7 @@
 Patch101:       hal-fix-acpi_on_battery_discharging.diff
 Patch102:       hal-fix-prevent_eject_method_for_dm-devices.diff
 Patch103:       hal-fix-missing_includes.diff
+Patch104:       hal-fix-dellWirelessCtl_0.13.12.diff
 # backports from git HEAD:
 #Patch200:       hal-backport.diff
 # revert from HEAD:
@@ -118,6 +119,9 @@
 %else
 Requires:       e2fsprogs-devel
 %endif
+%ifarch %ix86 x86_64
+BuildRequires:  libsmbios-devel >= 0.13.12
+%endif
 AutoReqProv:    on
 Group:          Development/Libraries/Other
 #
@@ -160,6 +164,7 @@
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 #%patch1000 -p1
 # patch hal-info package if needed
 pushd hal-info-%{hal_info_version}
@@ -321,6 +326,18 @@
 %{_libdir}/pkgconfig/*
 %endif
 %changelog
+* Sun Nov 04 2007 - dkukawka@xxxxxxx
+- added new patch:
+  - hal-fix-dellWirelessCtl_0.13.12.diff: added support for the
+  new libsmbios v0.13.12 where the binaries are moved from
+  /usr/bin to /usr/sbin
+- fixed Requirements for hal-devel (need libsmbios-libs-devel on
+  some Archs)
+* Tue Oct 30 2007 - dkukawka@xxxxxxx
+- updated patch:
+  - hal-fix-acpi_on_battery_discharging.diff: free GSList objects
+  and added check to call the additional code only on primary
+  batteries.
 * Wed Oct 17 2007 - dkukawka@xxxxxxx
 - Updated to actual git master (20071017) of hal and hal-info
 - removed upstream gone patches:

++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.Wi9184/_old  2007-11-06 00:14:20.000000000 +0100
+++ /var/tmp/diff_new_pack.Wi9184/_new  2007-11-06 00:14:20.000000000 +0100
@@ -23,13 +23,13 @@
 License:        GPL v2 or later; AFL
 Group:          System/Daemons
 Version:        0.5.10_git20071017 
-Release:        1
+Release:        10
 AutoReqProv:    on
 Requires:       pm-utils
 BuildRequires:  ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel 
gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted 
parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel 
update-desktop-files
 %ifarch %ix86 x86_64
-BuildRequires:  libsmbios-libs >= 0.13.4
-BuildRequires:  libsmbios-devel >= 0.13.4
+BuildRequires:  libsmbios-libs >= 0.13.12
+BuildRequires:  libsmbios-devel >= 0.13.12
 BuildRequires:  gcc-c++
 #!BuildIgnore:  pciutils-ids
 %endif
@@ -48,7 +48,7 @@
 Provides:       hotplugctl = 0.08
 Obsoletes:      hotplugctl <= 0.08
 %ifarch %ix86 x86_64 ia64
-Requires:       pmtools, libsmbios-libs >= 0.13.4
+Requires:       pmtools, libsmbios-libs >= 0.13.12
 %endif
 %ifarch %ix86 x86_64 
 Requires:       setserial
@@ -75,6 +75,7 @@
 Patch101:       hal-fix-acpi_on_battery_discharging.diff
 Patch102:       hal-fix-prevent_eject_method_for_dm-devices.diff
 Patch103:       hal-fix-missing_includes.diff
+Patch104:       hal-fix-dellWirelessCtl_0.13.12.diff
 # backports from git HEAD:
 #Patch200:       hal-backport.diff
 # revert from HEAD:
@@ -118,6 +119,9 @@
 %else
 Requires:       e2fsprogs-devel
 %endif
+%ifarch %ix86 x86_64
+BuildRequires:  libsmbios-devel >= 0.13.12
+%endif
 AutoReqProv:    on
 Group:          Development/Libraries/Other
 #
@@ -160,6 +164,7 @@
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 #%patch1000 -p1
 # patch hal-info package if needed
 pushd hal-info-%{hal_info_version}
@@ -321,6 +326,18 @@
 %{_libdir}/pkgconfig/*
 %endif
 %changelog
+* Sun Nov 04 2007 - dkukawka@xxxxxxx
+- added new patch:
+  - hal-fix-dellWirelessCtl_0.13.12.diff: added support for the
+  new libsmbios v0.13.12 where the binaries are moved from
+  /usr/bin to /usr/sbin
+- fixed Requirements for hal-devel (need libsmbios-libs-devel on
+  some Archs)
+* Tue Oct 30 2007 - dkukawka@xxxxxxx
+- updated patch:
+  - hal-fix-acpi_on_battery_discharging.diff: free GSList objects
+  and added check to call the additional code only on primary
+  batteries.
 * Wed Oct 17 2007 - dkukawka@xxxxxxx
 - Updated to actual git master (20071017) of hal and hal-info
 - removed upstream gone patches:



++++++ hal-fix-acpi_on_battery_discharging.diff ++++++
--- /var/tmp/diff_new_pack.Wi9184/_old  2007-11-06 00:14:20.000000000 +0100
+++ /var/tmp/diff_new_pack.Wi9184/_new  2007-11-06 00:14:20.000000000 +0100
@@ -1,3 +1,5 @@
+diff --git a/hald/device_pm.c b/hald/device_pm.c
+index e84c4ff..c4fee3b 100644
 --- a/hald/device_pm.c
 +++ b/hald/device_pm.c
 @@ -32,6 +32,7 @@
@@ -8,7 +10,7 @@
  #include "logger.h"
  #include "util_pm.h"
  #include "device_pm.h"
-@@ -208,8 +208,55 @@ battery_refresh_poll (HalDevice *d)
+@@ -127,8 +128,58 @@ device_pm_abstract_props (HalDevice *d)
        charging = hal_device_property_get_bool (d, 
"battery.rechargeable.is_charging");
        discharging = hal_device_property_get_bool (d, 
"battery.rechargeable.is_discharging");
  
@@ -19,50 +21,53 @@
 +              GSList *devices;
 +              HalDevice *_d;
 +              gboolean online;
-+              gboolean is_discharing;
 +              const char *bat_type;
 +
 +              online = FALSE;
-+              is_discharing = FALSE;
 +
-+              /* check if the machine is on AC or on battery */ 
-+              devices = hal_device_store_match_multiple_key_value_string 
(hald_get_gdl (),
-+                                                                            
"info.category",
-+                                                                              
    "ac_adapter");
-+              for (i = devices; i != NULL; i = g_slist_next (i)) {
-+                      _d = HAL_DEVICE (i->data);
-+                      if (hal_device_has_property (_d, "linux.acpi_type")) {
-+                              if (hal_device_property_get_bool (_d, 
"ac_adapter.present")) {
-+                                      online = TRUE; 
-+                              }
-+                      }
-+              }
-+              g_slist_free (devices);
++              /* check if this is a primary, mean laptop battery */
++              bat_type = hal_device_property_get_string (d, "battery.type");
++              if (bat_type != NULL && !strncmp (bat_type, "primary", 7)) { 
 +
-+              if (online) {
-+                      normalised_rate = 0;
-+              } else {
-+                      /* check if there is an other battery already 
discharing, if so: set normalised_rate = 0 */ 
-+                      devices = 
hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
-+                                                                              
    "info.category",
-+                                                                              
    "battery");
++                      /* check if the machine is on AC or on battery */ 
++                      devices = 
hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
++                                                                              
    "info.category",
++                                                                              
    "ac_adapter");
 +                      for (i = devices; i != NULL; i = g_slist_next (i)) {
-+                              _d = HAL_DEVICE (i->data);
-+                              if (hal_device_has_property (_d, 
"linux.acpi_type")) {
-+                                      bat_type = 
hal_device_property_get_string (_d, "battery.type");
-+                                      if (bat_type != NULL && !strncmp 
(bat_type, "primary", 7)) {
-+                                              if (strcmp 
(hal_device_get_udi(d), hal_device_get_udi(_d)) != 0) {
-+                                                      if 
(hal_device_property_get_bool (_d, "battery.rechargeable.is_discharging"))
-+                                                              is_discharing = 
TRUE;
-+                                              }       
++                              _d = HAL_DEVICE (i->data);
++                              if (hal_device_has_property (_d, 
"linux.acpi_type")) {
++                                      if (hal_device_property_get_bool (_d, 
"ac_adapter.present")) {
++                                              online = TRUE; 
 +                                      }
-+                                      }
-+                      }
++                              }
++                      }
++                      g_slist_free (devices);
 +
-+                      if (is_discharing)
++                      if (online) {
 +                              normalised_rate = 0;
++                      } else {
++                              /* check if there is an other battery already 
discharing, if so: set normalised_rate = 0 */ 
++                              devices = 
hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
++                                                                              
            "info.category",
++                                                                              
            "battery");
++                              for (i = devices; i != NULL; i = g_slist_next 
(i)) {
++                                      _d = HAL_DEVICE (i->data);
++                                      if (hal_device_has_property (_d, 
"linux.acpi_type")) {
++                                              bat_type = 
hal_device_property_get_string (_d, "battery.type");
++                                              if (bat_type != NULL && 
!strncmp (bat_type, "primary", 7)) {
++                                                      if (strcmp 
(hal_device_get_udi(d), hal_device_get_udi(_d)) != 0) {
++                                                              if 
(hal_device_property_get_bool (_d, "battery.rechargeable.is_discharging"))
++                                                                      
normalised_rate = 0;
++                                                      }       
++                                              }
++                                      }
++                              }
++                              g_slist_free(devices);
++                      }
++              } else {
++                      normalised_rate = 0;
 +              }
 +      }
  
-       /*
-        * Some laptops report current charge much larger than
+       /* Some laptops report current charge much larger than
+        * full charge when at 100%.  Clamp back down to 100%. */

++++++ hal-fix-dellWirelessCtl_0.13.12.diff ++++++
diff --git a/tools/linux/hal-system-killswitch-get-power-linux 
b/tools/linux/hal-system-killswitch-get-power-linux
index f19d1f4..c24253f 100755
--- a/tools/linux/hal-system-killswitch-get-power-linux
+++ b/tools/linux/hal-system-killswitch-get-power-linux
@@ -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 $DELL_WCTL ]; 
then
        # TODO: write our own binary that links with libsmbios?
-       /usr/bin/dellWirelessCtl --st_bt
+       $DELL_WCTL --st_bt
        value=$?
        if [ "$value" = "0" ]; then
            exit 1
@@ -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 $DELL_WCTL ]; then
        # TODO: write our own binary that links with libsmbios?
-       /usr/bin/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..2ef9ebe 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -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 $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
+           $DELL_WCTL --sw_bt 0 --bt 1
            ret=$?
        else
-           /usr/bin/dellWirelessCtl --sw_bt 0 --bt 0
+           $DELL_WCTL --sw_bt 0 --bt 0
            ret=$?
        fi
        if [ "$ret" != "0" ]; 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 $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
+           $DELL_WCTL --sw_wlan 0 --wlan 1
            ret=$?
        else
-           /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 0
+           $DELL_WCTL --sw_wlan 0 --wlan 0
            ret=$?
        fi
        if [ "$ret" != "0" ]; then




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx