Hello community, here is the log from the commit of package hal checked in at Thu Sep 7 01:16:27 CEST 2006. -------- --- hal/hal.changes 2006-08-22 18:03:58.000000000 +0200 +++ hal/hal.changes 2006-09-06 19:13:50.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 6 19:13:22 CEST 2006 - seife@suse.de + +- add hal-panasonic-acpi-suse.diff to match our pcc_acpi driver + +------------------------------------------------------------------- New: ---- hal-panasonic-acpi-suse.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.2ZGTFQ/_old 2006-09-07 01:15:54.000000000 +0200 +++ /var/tmp/diff_new_pack.2ZGTFQ/_new 2006-09-07 01:15:54.000000000 +0200 @@ -18,7 +18,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: System/Daemons Version: 0.5.8_git20060822 -Release: 1 +Release: 4 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches @@ -28,8 +28,9 @@ Patch3: %{name}-performance-properties2.diff Patch4: %{name}-performance-properties_fix_compiler_warnings.diff Patch5: %{name}-fix-mount_options.diff +Patch6: %{name}-panasonic-acpi-suse.diff # only on SLED10 to avoid dbus update -Patch6: hal-back_to_dbus_0.6.0.diff +Patch7: hal-back_to_dbus_0.6.0.diff # # submitted (or planed to do in next time) upstream patches Patch100: hal-performance-pci_ids_v2.patch @@ -137,7 +138,8 @@ #%patch3 -p1 #%patch4 %patch5 -p1 -#%patch6 -p1 +%patch6 -p0 +#%patch7 -p1 %patch101 %patch102 -p1 %patch103 -p1 @@ -252,6 +254,8 @@ %{_bindir}/hal-device-manager %changelog -n hal +* Wed Sep 06 2006 - seife@suse.de +- add hal-panasonic-acpi-suse.diff to match our pcc_acpi driver * Tue Aug 22 2006 - dkukawka@suse.de - updated to current HAL git HEAD (v0.5.8_git20060822) - updated patches: ++++++ hal-add-cpufreq_addon.diff ++++++ --- /var/tmp/diff_new_pack.2ZGTFQ/_old 2006-09-07 01:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2ZGTFQ/_new 2006-09-07 01:15:55.000000000 +0200 @@ -1,8 +1,6 @@ -diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml -index 7c1eddd..b81aa9e 100644 ---- a/doc/spec/hal-spec-properties.xml -+++ b/doc/spec/hal-spec-properties.xml -@@ -5491,6 +5491,218 @@ +--- hal-0.5.8_git20060822/doc/spec/hal-spec-properties.xml ++++ hal-0.5.8_git20060822/doc/spec/hal-spec-properties.xml +@@ -5503,6 +5503,218 @@ </tbody> </tgroup> </informaltable> @@ -221,10 +219,8 @@ </sect2> <sect2 id="device-properties-tape"> <title> -diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi -index 2c2705a..c0b4845 100644 ---- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi -+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi +--- hal-0.5.8_git20060822/fdi/policy/10osvendor/10-power-mgmt-policy.fdi ++++ hal-0.5.8_git20060822/fdi/policy/10osvendor/10-power-mgmt-policy.fdi @@ -26,6 +26,8 @@ <match key="info.udi" string="/org/freedesktop/Hal/devices/computer"> <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.SystemPowerManagement</append> @@ -234,11 +230,9 @@ <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_names" type="strlist">Suspend</append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist">i</append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist">num_seconds_to_sleep</append> -diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am -index 48226af..63e2d60 100644 ---- a/hald/linux/addons/Makefile.am -+++ b/hald/linux/addons/Makefile.am -@@ -15,7 +15,8 @@ libexec_PROGRAMS = \ +--- hal-0.5.8_git20060822/hald/linux/addons/Makefile.am ++++ hal-0.5.8_git20060822/hald/linux/addons/Makefile.am +@@ -15,7 +15,8 @@ hald-addon-hid-ups \ hald-addon-keyboard \ hald-addon-pmu \ @@ -248,7 +242,7 @@ if HAVE_LIBPCI libexec_PROGRAMS += hald-addon-macbookpro-backlight -@@ -25,6 +26,10 @@ libexec_PROGRAMS += hald-addon-usb-csr +@@ -25,6 +26,10 @@ endif endif @@ -259,11 +253,8 @@ hald_addon_acpi_SOURCES = addon-acpi.c ../../logger.c ../../util_helper.c hald_addon_acpi_LDADD = $(top_builddir)/libhal/libhal.la -diff --git a/hald/linux/addons/addon-cpufreq-userspace.c b/hald/linux/addons/addon-cpufreq-userspace.c -new file mode 100644 -index 0000000..953d46a ---- /dev/null -+++ b/hald/linux/addons/addon-cpufreq-userspace.c +--- hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq-userspace.c ++++ hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq-userspace.c @@ -0,0 +1,525 @@ +/*************************************************************************** + * * @@ -790,11 +781,8 @@ + return config.consider_nice; +} +/********************* userspace end *********************/ -diff --git a/hald/linux/addons/addon-cpufreq-userspace.h b/hald/linux/addons/addon-cpufreq-userspace.h -new file mode 100644 -index 0000000..4424de2 ---- /dev/null -+++ b/hald/linux/addons/addon-cpufreq-userspace.h +--- hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq-userspace.h ++++ hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq-userspace.h @@ -0,0 +1,61 @@ +/*************************************************************************** + * * @@ -857,11 +845,8 @@ +void free_cpu_load_data (void); + +#endif /* ADDON_CPUFREQ_USERSPACE_H */ -diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c -new file mode 100644 -index 0000000..a74fecb ---- /dev/null -+++ b/hald/linux/addons/addon-cpufreq.c +--- hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq.c ++++ hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq.c @@ -0,0 +1,1214 @@ +/*************************************************************************** + * * @@ -2077,11 +2062,8 @@ + + return 0; +} -diff --git a/hald/linux/addons/addon-cpufreq.h b/hald/linux/addons/addon-cpufreq.h -new file mode 100644 -index 0000000..d812219 ---- /dev/null -+++ b/hald/linux/addons/addon-cpufreq.h +--- hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq.h ++++ hal-0.5.8_git20060822/hald/linux/addons/addon-cpufreq.h @@ -0,0 +1,72 @@ +/*************************************************************************** + * * @@ -2155,25 +2137,20 @@ +gboolean dbus_init (void); + +#endif /* ADDON_CPUFREQ_H */ -diff --git a/privileges/Makefile.am b/privileges/Makefile.am -index f32ab1c..d300a60 100644 ---- a/privileges/Makefile.am -+++ b/privileges/Makefile.am -@@ -9,7 +9,8 @@ dist_polkit_privilege_DATA = - hal-power-suspend.privilege \ +--- hal-0.5.8_git20060822/privileges/Makefile.am ++++ hal-0.5.8_git20060822/privileges/Makefile.am +@@ -10,7 +10,8 @@ + hal-power-standby.privilege \ hal-power-hibernate.privilege \ hal-power-poweroff.privilege \ - hal-power-reboot.privilege + hal-power-reboot.privilege \ + hal-power-cpufreq.privilege - clean-local : - rm -f *~ -diff --git a/privileges/hal-power-cpufreq.privilege b/privileges/hal-power-cpufreq.privilege -new file mode 100644 -index 0000000..cee08b4 ---- /dev/null -+++ b/privileges/hal-power-cpufreq.privilege + DISTCLEANFILES = Makefile.in + +--- hal-0.5.8_git20060822/privileges/hal-power-cpufreq.privilege ++++ hal-0.5.8_git20060822/privileges/hal-power-cpufreq.privilege @@ -0,0 +1,12 @@ + +# This privilege specifies who is allowed to control CPUFreq ++++++ hal-add-standby-support.diff ++++++ --- /var/tmp/diff_new_pack.2ZGTFQ/_old 2006-09-07 01:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2ZGTFQ/_new 2006-09-07 01:15:55.000000000 +0200 @@ -1,11 +1,8 @@ Index: doc/spec/hal-spec-properties.xml -=================================================================== -RCS file: /cvs/hal/hal/doc/spec/hal-spec-properties.xml,v -retrieving revision 1.7 -diff -u -3 -p -u -r1.7 hal-spec-properties.xml ---- doc/spec/hal-spec-properties.xml 31 May 2006 17:31:32 -0000 1.7 -+++ doc/spec/hal-spec-properties.xml 20 Jul 2006 17:16:50 -0000 -@@ -5190,7 +5190,7 @@ +================================================================================ +--- doc/spec/hal-spec-properties.xml ++++ doc/spec/hal-spec-properties.xml +@@ -5396,7 +5396,7 @@ <entry></entry> <entry>Yes</entry> <entry> @@ -14,7 +11,7 @@ NB. This may not mean the machine is able to suspend successfully. </entry> -@@ -5202,19 +5202,31 @@ +@@ -5408,19 +5408,31 @@ <entry></entry> <entry>Yes</entry> <entry> @@ -48,7 +45,7 @@ NB. This may not mean the machine is able to suspend successfully. WARNING: This key is depreciated and power_management.can_suspend -@@ -5228,7 +5240,7 @@ +@@ -5434,7 +5446,7 @@ <entry></entry> <entry>No</entry> <entry> @@ -57,13 +54,8 @@ NB. This may not mean the machine is able to hibernate successfully. WARNING: This key is depreciated and power_management.can_hibernate -Index: fdi/policy/10osvendor/10-power-mgmt-policy.fdi -=================================================================== -RCS file: /cvs/hal/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi,v -retrieving revision 1.5 -diff -u -3 -p -u -r1.5 10-power-mgmt-policy.fdi ---- fdi/policy/10osvendor/10-power-mgmt-policy.fdi 6 Jun 2006 23:56:09 -0000 1.5 -+++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi 20 Jul 2006 17:16:50 -0000 +--- fdi/policy/10osvendor/10-power-mgmt-policy.fdi ++++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi @@ -36,6 +36,11 @@ <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist"></append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-hibernate</append> @@ -76,14 +68,9 @@ <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_names" type="strlist">Shutdown</append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist"></append> <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist"></append> -Index: hald/linux/osspec.c -=================================================================== -RCS file: /cvs/hal/hal/hald/linux/osspec.c,v -retrieving revision 1.48 -diff -u -3 -p -u -r1.48 osspec.c ---- hald/linux/osspec.c 21 May 2006 00:58:24 -0000 1.48 -+++ hald/linux/osspec.c 20 Jul 2006 17:16:50 -0000 -@@ -449,10 +449,12 @@ out: +--- hald/linux/osspec.c ++++ hald/linux/osspec.c +@@ -434,10 +434,12 @@ } static void @@ -99,7 +86,7 @@ ssize_t read; size_t len; char *poweroptions; -@@ -460,6 +462,7 @@ set_suspend_hibernate_keys (HalDevice *d +@@ -445,6 +447,7 @@ can_suspend = FALSE; can_hibernate = FALSE; @@ -107,7 +94,7 @@ /* try to find 'mem' and 'disk' in /sys/power/state */ fp = fopen ("/sys/power/state", "r"); -@@ -479,6 +482,8 @@ set_suspend_hibernate_keys (HalDevice *d +@@ -464,6 +467,8 @@ can_suspend = TRUE; if (strstr (poweroptions, "disk")) can_hibernate = TRUE; @@ -116,7 +103,7 @@ free (poweroptions); /* check for the presence of suspend2 */ -@@ -489,6 +494,7 @@ set_suspend_hibernate_keys (HalDevice *d +@@ -476,6 +481,7 @@ out: hal_device_property_set_bool (d, "power_management.can_suspend", can_suspend); hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate); @@ -124,7 +111,7 @@ /* WARNING: These keys are depreciated and power_management.can_suspend * and power_management.can_hibernate should be used instead. -@@ -546,7 +552,7 @@ osspec_probe (void) +@@ -533,7 +539,7 @@ * or hibernate successfully, only that the machine has * support compiled into the kernel. */ @@ -133,14 +120,9 @@ /* TODO: add prober for PowerMac's */ if (should_decode_dmi) { -Index: privileges/Makefile.am -=================================================================== -RCS file: /cvs/hal/hal/privileges/Makefile.am,v -retrieving revision 1.1 -diff -u -3 -p -u -r1.1 Makefile.am ---- privileges/Makefile.am 5 Jun 2006 23:56:00 -0000 1.1 -+++ privileges/Makefile.am 20 Jul 2006 17:16:50 -0000 -@@ -7,6 +7,7 @@ dist_polkit_privilege_DATA = +--- privileges/Makefile.am ++++ privileges/Makefile.am +@@ -7,6 +7,7 @@ hal-storage-removable-mount.privilege \ hal-storage-removable-mount-all-options.privilege \ hal-power-suspend.privilege \ @@ -148,12 +130,8 @@ hal-power-hibernate.privilege \ hal-power-poweroff.privilege \ hal-power-reboot.privilege -Index: privileges/hal-power-standby.privilege -=================================================================== -RCS file: privileges/hal-power-standby.privilege -diff -N privileges/hal-power-standby.privilege ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ privileges/hal-power-standby.privilege 20 Jul 2006 17:16:50 -0000 +--- privileges/hal-power-standby.privilege ++++ privileges/hal-power-standby.privilege @@ -0,0 +1,12 @@ + +# This privilege specifies who is allowed to suspend the system. @@ -167,14 +145,9 @@ +CanGrant=True +ObtainRequireRoot=False + -Index: tools/Makefile.am -=================================================================== -RCS file: /cvs/hal/hal/tools/Makefile.am,v -retrieving revision 1.41 -diff -u -3 -p -u -r1.41 Makefile.am ---- tools/Makefile.am 6 Jun 2006 03:17:27 -0000 1.41 -+++ tools/Makefile.am 20 Jul 2006 17:16:50 -0000 -@@ -68,6 +68,7 @@ script_SCRIPTS = \ +--- tools/Makefile.am ++++ tools/Makefile.am +@@ -88,6 +88,7 @@ hal-system-power-suspend \ hal-system-power-hibernate \ hal-system-power-shutdown \ @@ -182,12 +155,8 @@ hal-system-power-reboot \ hal-system-lcd-get-brightness \ hal-system-lcd-set-brightness \ -Index: tools/hal-system-power-standby -=================================================================== -RCS file: tools/hal-system-power-standby -diff -N tools/hal-system-power-standby ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ tools/hal-system-power-standby 20 Jul 2006 17:16:50 -0000 +--- tools/hal-system-power-standby ++++ tools/hal-system-power-standby @@ -0,0 +1,22 @@ +#!/bin/sh + @@ -211,14 +180,9 @@ + echo "No back-end for your operating system" >&2 + exit 1 +fi -Index: tools/linux/Makefile.am -=================================================================== -RCS file: /cvs/hal/hal/tools/linux/Makefile.am,v -retrieving revision 1.22 -diff -u -3 -p -u -r1.22 Makefile.am ---- tools/linux/Makefile.am 6 Jun 2006 01:52:07 -0000 1.22 -+++ tools/linux/Makefile.am 20 Jul 2006 17:16:50 -0000 -@@ -12,6 +12,7 @@ script_SCRIPTS = \ +--- tools/linux/Makefile.am ++++ tools/linux/Makefile.am +@@ -12,6 +12,7 @@ hal-system-power-suspend-linux \ hal-system-power-hibernate-linux \ hal-system-power-shutdown-linux \ @@ -226,12 +190,8 @@ hal-system-power-reboot-linux \ hal-system-lcd-get-brightness-linux \ hal-system-lcd-set-brightness-linux \ -Index: tools/linux/hal-system-power-standby-linux -=================================================================== -RCS file: tools/linux/hal-system-power-standby-linux -diff -N tools/linux/hal-system-power-standby-linux ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ tools/linux/hal-system-power-standby-linux 20 Jul 2006 17:16:50 -0000 +--- tools/linux/hal-system-power-standby-linux ++++ tools/linux/hal-system-power-standby-linux @@ -0,0 +1,58 @@ +#!/bin/sh + ++++++ hal-fix-util_compute_time_remaining_warning_highTime.diff ++++++ --- /var/tmp/diff_new_pack.2ZGTFQ/_old 2006-09-07 01:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.2ZGTFQ/_new 2006-09-07 01:15:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- a/hald/util_pm.c 2006-08-22 15:49:40.000000000 +0200 -+++ b/hald/util_pm.c 2006-08-22 17:33:01.000000000 +0200 +--- hal-0.5.8_git20060822/hald/util_pm.c ++++ hal-0.5.8_git20060822/hald/util_pm.c @@ -39,6 +39,7 @@ typedef struct { int last_level; ++++++ hal-panasonic-acpi-suse.diff ++++++ --- hald/linux/acpi.c +++ hald/linux/acpi.c @@ -1026,7 +1026,7 @@ */ acpi_synthesize_display ("acpi/toshiba", "lcd", ACPI_TYPE_TOSHIBA_DISPLAY); acpi_synthesize_display ("acpi/asus", "brn", ACPI_TYPE_ASUS_DISPLAY); - acpi_synthesize_display ("acpi/pcc", "brightness", ACPI_TYPE_PANASONIC_DISPLAY); + acpi_synthesize_display ("acpi/panasonic", "ac_brightness", ACPI_TYPE_PANASONIC_DISPLAY); acpi_synthesize_display ("acpi/ibm", "brightness", ACPI_TYPE_IBM_DISPLAY); acpi_synthesize_display ("acpi/sony", "brightness", ACPI_TYPE_SONY_DISPLAY); /* omnibook does not live under acpi GNOME#331458 */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org