Hello community, here is the log from the commit of package hal checked in at Fri Oct 24 17:15:10 CEST 2008. -------- --- hal/hal.changes 2008-10-12 21:03:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-10-24 16:23:14.000000000 +0200 @@ -1,0 +2,68 @@ +Fri Oct 24 16:09:25 CEST 2008 - dkukawka@suse.de + +- update HAL to latest git (98c2686104fc1c) and updated hal-info to + 20081024 +- this udate includes fixes for: + - bnc#437930: add another USB music player + - fixed problems with Dell Bluetooth killswitches + - added mmc_host slot_name (mmc_host.slot_name) support + - fixed HP keymapping to handle only laptops + - fixed Acer keymapping (use only valid keys) + - fixed keymap-check.sh to validate keymaps +- added new patches: + - hal-20081023-add_biometric_namespaces.diff: add new biometic & + biometric.fingerprint_reader namespaces to spec (bnc#438187) + - hal-20081023-add_fingerprint_reader_ACL.diff: ACL rules for + fingerprint readers (bnc#438187) +- removed patches: + - hal-info-20080828-fix-acer-keymapping.diff: removed for now + need to be rewritten and commited upstream. + +------------------------------------------------------------------- +Thu Oct 23 18:51:44 CEST 2008 - dkukawka@suse.de + +- update HAL to latest git (090e5a8bae8110) and updated hal-info to + 20081023 +- this udate includes fixes for: + - support pci as storage bus + - support bdi as storage bus/interface (bnc#433772) + - add DVD-R DL device capablity detection (storage.cdrom.dvdrdl) + - fixed spec (cleanups, alphabetical order and other) + - fixed usage of *_outof/';' in hal-info +- removed upstream gone patches: + - hal-20081021-add-pci_as_storage_bus.diff + - hal-20081022-add-bdi_subsystem.diff + +------------------------------------------------------------------- +Wed Oct 22 11:05:23 CEST 2008 - dkukawka@suse.de + +- added new patch: + - hal-20081022-add-bdi_subsystem.diff: support the BDI (Backing + Device Information) subsystem + +------------------------------------------------------------------- +Tue Oct 21 15:16:56 CEST 2008 - dkukawka@suse.de + +- added new patch: + - hal-20081021-add-pci_as_storage_bus.diff: support pci as + storage bus for cciss storage device (bnc#433772) + +------------------------------------------------------------------- +Tue Oct 21 12:36:29 CEST 2008 - dkukawka@suse.de + +- update HAL to latest git (6c7a7aeea3aef5) and updated hal-info to + 20081021 +- this version includes fixes for: + - unified handling of volume.ignore for recovery partitions + - fixed udi handling to prevent crashes (fd.o#16040) + - added ppdev (Parallel Port Devices) subsystem and ACL/device + access policy (bnc#235059) + - support for virtual network devices (e.g. loopback, tun* etc) + - new obex namespace and ACL/device access policy + - fixed pda ACL rules + - fixed spec formating +- added new patch: + - hal-20081021-fix-docking-support.diff: was reverted upstream, + separated into a patch for now. + +------------------------------------------------------------------- @@ -15,0 +84,6 @@ +Wed Oct 1 19:34:26 CEST 2008 - dkukawka@suse.de + +- updated patch: + - hal-20081001-fix-get_storage.model_from_SCSI.diff + +------------------------------------------------------------------- hal-doc.changes: same change calling whatdependson for head-i586 Old: ---- hal-info-20080828-fix-acer-keymapping.diff hal-info-20081012.tar.bz2 New: ---- hal-20081021-fix-docking-support.diff hal-20081023-add_biometric_namespaces.diff hal-20081023-add_fingerprint_reader_ACL.diff hal-info-20081024.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.c27319/_old 2008-10-24 17:14:36.000000000 +0200 +++ /var/tmp/diff_new_pack.c27319/_new 2008-10-24 17:14:36.000000000 +0200 @@ -26,10 +26,10 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20081012 +%define hal_info_version 20081024 %define libsmbios_version 2.0.2 Version: 0.5.12 -Release: 1 +Release: 2 Url: http://freedesktop.org/Software/hal License: Other uncritical OpenSource License Group: System/Daemons @@ -81,7 +81,9 @@ # SUSE specific temporary patches Patch10: hal-20080828-add-standby-support_v3.diff # submitted (or planed to do in next time) upstream patches -#Patch100: +Patch100: hal-20081021-fix-docking-support.diff +Patch101: hal-20081023-add_biometric_namespaces.diff +Patch102: hal-20081023-add_fingerprint_reader_ACL.diff # backports from git master: #Patch200: hal-update-to_.diff # revert from HEAD: @@ -89,7 +91,7 @@ # patches from ML: #Patch300: hal-ML.diff # hal-info related patches: -Patch400: hal-info-20080828-fix-acer-keymapping.diff +#Patch400: hal-info-2008XX.diff # currently unused patches: Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff # temporary debug patches @@ -169,13 +171,15 @@ %patch1 -p0 %patch2 -p1 %patch10 -p0 -#%patch100 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 #%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 # patch hal-info package if needed pushd hal-info-%{hal_info_version} -%patch400 -p1 +#%patch400 -p1 popd %build @@ -364,6 +368,59 @@ %endif %changelog +* Fri Oct 24 2008 dkukawka@suse.de +- update HAL to latest git (98c2686104fc1c) and updated hal-info to + 20081024 +- this udate includes fixes for: + - bnc#437930: add another USB music player + - fixed problems with Dell Bluetooth killswitches + - added mmc_host slot_name (mmc_host.slot_name) support + - fixed HP keymapping to handle only laptops + - fixed Acer keymapping (use only valid keys) + - fixed keymap-check.sh to validate keymaps +- added new patches: + - hal-20081023-add_biometric_namespaces.diff: add new biometic & + biometric.fingerprint_reader namespaces to spec (bnc#438187) + - hal-20081023-add_fingerprint_reader_ACL.diff: ACL rules for + fingerprint readers (bnc#438187) +- removed patches: + - hal-info-20080828-fix-acer-keymapping.diff: removed for now + need to be rewritten and commited upstream. +* Thu Oct 23 2008 dkukawka@suse.de +- update HAL to latest git (090e5a8bae8110) and updated hal-info to + 20081023 +- this udate includes fixes for: + - support pci as storage bus + - support bdi as storage bus/interface (bnc#433772) + - add DVD-R DL device capablity detection (storage.cdrom.dvdrdl) + - fixed spec (cleanups, alphabetical order and other) + - fixed usage of *_outof/';' in hal-info +- removed upstream gone patches: + - hal-20081021-add-pci_as_storage_bus.diff + - hal-20081022-add-bdi_subsystem.diff +* Wed Oct 22 2008 dkukawka@suse.de +- added new patch: + - hal-20081022-add-bdi_subsystem.diff: support the BDI (Backing + Device Information) subsystem +* Tue Oct 21 2008 dkukawka@suse.de +- added new patch: + - hal-20081021-add-pci_as_storage_bus.diff: support pci as + storage bus for cciss storage device (bnc#433772) +* Tue Oct 21 2008 dkukawka@suse.de +- update HAL to latest git (6c7a7aeea3aef5) and updated hal-info to + 20081021 +- this version includes fixes for: + - unified handling of volume.ignore for recovery partitions + - fixed udi handling to prevent crashes (fd.o#16040) + - added ppdev (Parallel Port Devices) subsystem and ACL/device + access policy (bnc#235059) + - support for virtual network devices (e.g. loopback, tun* etc) + - new obex namespace and ACL/device access policy + - fixed pda ACL rules + - fixed spec formating +- added new patch: + - hal-20081021-fix-docking-support.diff: was reverted upstream, + separated into a patch for now. * Sun Oct 12 2008 dkukawka@suse.de - update HAL to latest git (122e41a10aeb3c) and set package version to upcomming 0.5.12, updated hal-info to 20081012 @@ -375,6 +432,9 @@ - bnc#419403/432340: locale is not supported on kernel ntfs - removed upstream gone patches: - hal-20080701-fix-get_storage.model_from_SCSI.diff +* Wed Oct 01 2008 dkukawka@suse.de +- updated patch: + - hal-20081001-fix-get_storage.model_from_SCSI.diff * Tue Sep 30 2008 dkukawka@suse.de - updated HAL to latest git from today to integrate patch from Gabriel Burt <gburt@suse.de> to export seconds_to_sleep to ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.c27319/_old 2008-10-24 17:14:36.000000000 +0200 +++ /var/tmp/diff_new_pack.c27319/_new 2008-10-24 17:14:36.000000000 +0200 @@ -26,10 +26,10 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20081012 +%define hal_info_version 20081024 %define libsmbios_version 2.0.2 Version: 0.5.12 -Release: 1 +Release: 2 Url: http://freedesktop.org/Software/hal License: GPL v2 or later; AFL Group: System/Daemons @@ -81,7 +81,9 @@ # SUSE specific temporary patches Patch10: hal-20080828-add-standby-support_v3.diff # submitted (or planed to do in next time) upstream patches -#Patch100: +Patch100: hal-20081021-fix-docking-support.diff +Patch101: hal-20081023-add_biometric_namespaces.diff +Patch102: hal-20081023-add_fingerprint_reader_ACL.diff # backports from git master: #Patch200: hal-update-to_.diff # revert from HEAD: @@ -89,7 +91,7 @@ # patches from ML: #Patch300: hal-ML.diff # hal-info related patches: -Patch400: hal-info-20080828-fix-acer-keymapping.diff +#Patch400: hal-info-2008XX.diff # currently unused patches: Patch500: hal-20070803-cleanup-deprecated_libhal-storage.diff # temporary debug patches @@ -168,13 +170,15 @@ %patch1 -p0 %patch2 -p1 %patch10 -p0 -#%patch100 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 #%patch200 -p1 #%patch300 -p1 #%patch1000 -p1 # patch hal-info package if needed pushd hal-info-%{hal_info_version} -%patch400 -p1 +#%patch400 -p1 popd %build @@ -363,6 +367,59 @@ %endif %changelog +* Fri Oct 24 2008 dkukawka@suse.de +- update HAL to latest git (98c2686104fc1c) and updated hal-info to + 20081024 +- this udate includes fixes for: + - bnc#437930: add another USB music player + - fixed problems with Dell Bluetooth killswitches + - added mmc_host slot_name (mmc_host.slot_name) support + - fixed HP keymapping to handle only laptops + - fixed Acer keymapping (use only valid keys) + - fixed keymap-check.sh to validate keymaps +- added new patches: + - hal-20081023-add_biometric_namespaces.diff: add new biometic & + biometric.fingerprint_reader namespaces to spec (bnc#438187) + - hal-20081023-add_fingerprint_reader_ACL.diff: ACL rules for + fingerprint readers (bnc#438187) +- removed patches: + - hal-info-20080828-fix-acer-keymapping.diff: removed for now + need to be rewritten and commited upstream. +* Thu Oct 23 2008 dkukawka@suse.de +- update HAL to latest git (090e5a8bae8110) and updated hal-info to + 20081023 +- this udate includes fixes for: + - support pci as storage bus + - support bdi as storage bus/interface (bnc#433772) + - add DVD-R DL device capablity detection (storage.cdrom.dvdrdl) + - fixed spec (cleanups, alphabetical order and other) + - fixed usage of *_outof/';' in hal-info +- removed upstream gone patches: + - hal-20081021-add-pci_as_storage_bus.diff + - hal-20081022-add-bdi_subsystem.diff +* Wed Oct 22 2008 dkukawka@suse.de +- added new patch: + - hal-20081022-add-bdi_subsystem.diff: support the BDI (Backing + Device Information) subsystem +* Tue Oct 21 2008 dkukawka@suse.de +- added new patch: + - hal-20081021-add-pci_as_storage_bus.diff: support pci as + storage bus for cciss storage device (bnc#433772) +* Tue Oct 21 2008 dkukawka@suse.de +- update HAL to latest git (6c7a7aeea3aef5) and updated hal-info to + 20081021 +- this version includes fixes for: + - unified handling of volume.ignore for recovery partitions + - fixed udi handling to prevent crashes (fd.o#16040) + - added ppdev (Parallel Port Devices) subsystem and ACL/device + access policy (bnc#235059) + - support for virtual network devices (e.g. loopback, tun* etc) + - new obex namespace and ACL/device access policy + - fixed pda ACL rules + - fixed spec formating +- added new patch: + - hal-20081021-fix-docking-support.diff: was reverted upstream, + separated into a patch for now. * Sun Oct 12 2008 dkukawka@suse.de - update HAL to latest git (122e41a10aeb3c) and set package version to upcomming 0.5.12, updated hal-info to 20081012 @@ -374,6 +431,9 @@ - bnc#419403/432340: locale is not supported on kernel ntfs - removed upstream gone patches: - hal-20080701-fix-get_storage.model_from_SCSI.diff +* Wed Oct 01 2008 dkukawka@suse.de +- updated patch: + - hal-20081001-fix-get_storage.model_from_SCSI.diff * Tue Sep 30 2008 dkukawka@suse.de - updated HAL to latest git from today to integrate patch from Gabriel Burt <gburt@suse.de> to export seconds_to_sleep to ++++++ hal-0.5.12.tar.bz2 ++++++ ++++ 19172 lines of diff (skipped) ++++++ hal-20081021-fix-docking-support.diff ++++++
From 122e41a10aeb3c6b6f1b6590d5c788fb01e0577a Mon Sep 17 00:00:00 2001 From: Holger Macht <hmacht@suse.de> Date: Sun, 12 Oct 2008 20:27:57 +0200 Subject: [PATCH] adapt HAL to changes in the kernel regarding to docking stations
Adapted HAL to recent changes in the kernel regarding to docking stations. --- hald/linux/device.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/hald/linux/device.c b/hald/linux/device.c index 26f6c1b..94b3ab5 100644 --- a/hald/linux/device.c +++ b/hald/linux/device.c @@ -2017,9 +2017,15 @@ platform_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare if (strncmp (dev_id, "dock", 4) == 0) { int docked; - - hal_util_get_int_from_file (sysfs_path, "docked", &docked, 0); - hal_device_property_set_bool (d, "info.docked", docked); + gchar *type; + + type = hal_util_get_string_from_file (sysfs_path, "type"); + if (strcmp (type, "dock_station") == 0) { + hal_device_property_set_string (d, "info.type", type); + hal_device_add_capability (d, "dock_station"); + hal_util_get_int_from_file (sysfs_path, "docked", &docked, 0); + hal_device_property_set_bool (d, "info.docked", docked); + } } return d; @@ -2052,8 +2058,8 @@ platform_refresh_undock (gpointer data) sysfs_path = hal_device_property_get_string(d, "linux.sysfs_path"); hal_util_get_int_from_file (sysfs_path, "flags", &flags, 0); - /* check for != 0, maybe the user did an immediate dock */ - if (flags != 0) + /* check for != 16, maybe the user did an immediate dock */ + if (flags != 16) return TRUE; hal_util_get_int_from_file (sysfs_path, "docked", &docked, 0); @@ -2065,20 +2071,24 @@ platform_refresh_undock (gpointer data) static gboolean platform_refresh (HalDevice *d) { - const gchar *id, *sysfs_path; + const gchar *id, *sysfs_path, *type; gint docked, flags; id = hal_device_property_get_string (d, "platform.id"); if (strncmp (id, "dock", 4) != 0) return TRUE; + type = hal_device_property_get_string(d, "info.type"); + if (strcmp (type, "dock_station") != 0) + return TRUE; + sysfs_path = hal_device_property_get_string(d, "linux.sysfs_path"); hal_util_get_int_from_file (sysfs_path, "docked", &docked, 0); if (docked == 1) { /* undock still in progress? */ hal_util_get_int_from_file (sysfs_path, "flags", &flags, 0); - if (flags == 2) { + if (flags == 18) { g_timeout_add (DOCK_STATION_UNDOCK_POLL_INTERVAL, platform_refresh_undock, d); return TRUE; -- 1.5.6 ++++++ hal-20081023-add_biometric_namespaces.diff ++++++ diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml index e5d6012..6163805 100644 --- a/doc/spec/hal-spec-properties.xml +++ b/doc/spec/hal-spec-properties.xml @@ -4288,6 +4288,56 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'} </informaltable> </sect2> + <sect2 id="device-properties-biometric"> + <title> + biometric namespace + </title> + <para> + Device objects with the capability <literal>biometric</literal> represent + a biometric device (e.g. fingerprint reader) . No namespace specific + properties. + </para> + </sect2> + + <sect2 id="device-properties-biometric-fingerprint_reader"> + <title> + biometric.fingerprint_reader namespace + </title> + <para> + Device objects with the capabilities <literal>biometric.fingerprint_reader</literal> + and <literal>biometric</literal> represent a biometric fingerprint reader. + </para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>Key (type)</entry> + <entry>Values</entry> + <entry>Mandatory</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry> + <literal>biometric.fingerprint_reader.access_method</literal> (strlist) + </entry> + <entry>example: libfprint</entry> + <entry>No</entry> + <entry> + Indicates installed device driver libraries that can handle this device. + These drivers can export information in + <literal>biometric.fingerprint_reader.[access_method]</literal> sub-namespaces. + Can also be used by libraries or programs providing extra device information + to indicate the presence of this information in the appropriate sub-namespace. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </sect2> + + <sect2 id="device-properties-button"> <title> button namespace ++++++ hal-20081023-add_fingerprint_reader_ACL.diff ++++++ diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi index c380807..4b0c616 100644 --- a/fdi/policy/10osvendor/20-acl-management.fdi +++ b/fdi/policy/10osvendor/20-acl-management.fdi @@ -74,6 +74,13 @@ <merge key="access_control.type" type="string">scanner</merge> </match> </match> + <match key="info.capabilities" contains="usbraw"> + <match key="info.capabilities" sibling_contains="biometic.fingerprint_reader"> + <append key="info.capabilities" type="strlist">access_control</append> + <merge key="access_control.file" type="copy_property">usbraw.device</merge> + <merge key="access_control.type" type="string">fingerprint-reader</merge> + </match> + </match> <!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) --> <match key="info.subsystem" string="usb"> @@ -98,6 +105,11 @@ <merge key="access_control.type" type="string">obex</merge> <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge> </match> + <match key="info.capabilities" contains="biometric.fingerprint_reader"> + <append key="info.capabilities" type="strlist">access_control</append> + <merge key="access_control.type" type="string">fingerprint-reader</merge> + <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge> + </match> </match> </match> diff --git a/policy/org.freedesktop.hal.device-access.policy b/policy/org.freedesktop.hal.device-access.policy index 41c0afe..3c07e72 100644 --- a/policy/org.freedesktop.hal.device-access.policy +++ b/policy/org.freedesktop.hal.device-access.policy @@ -19,6 +19,15 @@ NOTE: Please keep the actions in alpabetical order <policyconfig> + <action id="org.freedesktop.hal.device-access.fingerprint-reader"> + <description>Directly access to fingerprint reader devices</description> + <message>System policy prevents access to fingerprint readers</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + <action id="org.freedesktop.hal.device-access.audio-player"> <description>Directly access audio players</description> <message>System policy prevents access to audio players</message> ++++++ hal-info-20081012.tar.bz2 -> hal-info-20081024.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/ChangeLog new/hal-info-20081024/ChangeLog --- old/hal-info-20081012/ChangeLog 2008-10-12 21:00:14.000000000 +0200 +++ new/hal-info-20081024/ChangeLog 2008-10-24 16:15:25.000000000 +0200 @@ -1,3 +1,409 @@ +commit bc781bd454aff0bf51378c425c086552f3be4504 +Author: Michael Meeks <mmeeks@novell.com> +Date: Fri Oct 24 14:50:12 2008 +0200 + + add a ALBA MP3128D as USB music player + + Added a ALBA MP3128D as USB music player. + + .../10freedesktop/10-usb-music-players.fdi | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit 709d54ad6b99efbe7e8f90bf537f45e2452b188b +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Fri Oct 24 11:22:56 2008 +0200 + + fixed HP keymap to match for now only laptops + + Fixed HP keymap to match for now only laptops to prevent trouble + e.g. with workstations. + + fdi/information/10freedesktop/30-keymap-hp.fdi | 71 + +++++++++++++----------- + 1 files changed, 39 insertions(+), 32 deletions(-) + +commit 965b374d87f3901d1b3db4a43c487001cbfd84b9 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Fri Oct 24 11:06:25 2008 +0200 + + fixed acer keymapping + + Fixed acer keymapping, changed some keys to be valid with actual + kernel input.h. + + fdi/information/10freedesktop/30-keymap-acer.fdi | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 1e039e5193181828b1226a6f019eab6a2c248d05 +Author: Saleem Abdulrasool <compnerd@compnerd.org> +Date: Fri Oct 24 11:04:40 2008 +0200 + + fix keymap-check.sh to validate keymaps + + Fixed keymap-check.sh to validate keymaps. Only check if the map'ed + value is + valid if there is a value. This prevented + 30-keymap-module-sony-laptop.fdi + from being validated. + + tools/keymap-check.sh | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +commit 1799df7fbaa51dcbfb6cc9dcc8cd07c5a32cd9cb +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Thu Oct 23 13:35:22 2008 +0200 + + fixed usage of *_outof and ';' + + Fixed usage of *_outof and ';'. Removed ';' from comment lines to + make it easier to grep for misusage of *_outof. + + VERSION | 2 +- + fdi/information/10freedesktop/10-modem.fdi | 8 ++++---- + .../10freedesktop/20-video-quirk-pm-dell.fdi | 2 +- + .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +- + .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +- + fdi/preprobe/10osvendor/10-ide-drives.fdi | 12 ++++++------ + 6 files changed, 14 insertions(+), 14 deletions(-) + +commit 647978a980ee813fd1570770535053bdc690553b +Author: Richard Hughes <richard@hughsie.com> +Date: Wed Oct 22 13:41:12 2008 +0100 + + Released hal-info 20081022 + + VERSION | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 05cdf8a7f02c27561905285e37a381877831fcbc +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:30:51 2008 +0200 + + updated misc suspend quirks with s2ram whitelist entries from -r1.134 + + Updated misc suspend quirks with s2ram whitelist entries from -r1.134. + New: + - JVC J2N + - MEDION WIM 2140 + - MICRO-STAR MS-1003 + + .../10freedesktop/20-video-quirk-pm-misc.fdi | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +commit 7c3b408797bfc45d78438f39af454dfdf24e50d3 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:26:09 2008 +0200 + + updated Sony suspend quirks with s2ram whitelist entries from -r1.134 + + Updated Sony suspend quirks with s2ram whitelist entries from -r1.134. + New: + - VGN-C240E, VGN-FS215M, VGN-TX670P, VGN-Z90S + Fixed: + - VGN-C2S_H, VGN-FW11 (wider match) + + .../10freedesktop/20-video-quirk-pm-sony.fdi | 12 ++++-------- + 1 files changed, 4 insertions(+), 8 deletions(-) + +commit 07603d6a8e37afaaabaa78f268baba8a3d6adcc4 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:22:43 2008 +0200 + + updated Toshiba suspend quirks with s2ram whitelist entries from + -r1.134 + + Updated Toshiba suspend quirks with s2ram whitelist entries from + -r1.134. + Fixed: + - Satellite 1130 + + .../10freedesktop/20-video-quirk-pm-toshiba.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 93b5dac870047d0080c5071cd08ba289a7ab685b +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:20:18 2008 +0200 + + updated Lenovo suspend quirks with s2ram whitelist entries from + -r1.134 + + Updated Lenovo suspend quirks with s2ram whitelist entries from + -r1.134. + New: + - another 3000 N200 (0769AH9) + Fixed: + - 6457 + + .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +commit c9c8f148e538e1ebeed8d18d79db071f59235329 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:15:59 2008 +0200 + + updated HP suspend quirks with s2ram whitelist entries from -r1.134 + + Updated HP suspend quirks with s2ram whitelist entries from -r1.134. + New: + - HP 550 + - Presario: 2200, C700 + - Pavilion: dv6700, dv9700, xz275, PC098A-ABA M1070N + Fixed: + - HP Compaq 6710b (different versions) + + .../10freedesktop/20-video-quirk-pm-hp.fdi | 25 + +++++++++++++++---- + 1 files changed, 19 insertions(+), 6 deletions(-) + +commit b036003b4f5894187c9852d8c8eecae71e41e113 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:05:01 2008 +0200 + + updated FSC suspend quirks with s2ram whitelist entries from -r1.134 + + Updated FSC suspend quirks with s2ram whitelist entries from -r1.134. + New: + - AMILO Pro Series V3525 + - LIFEBOOK: P8010, T3010 + Fixed: + - LifeBook S7110 + + .../10freedesktop/20-video-quirk-pm-fujitsu.fdi | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit f3d6d30ba0db10d237346b49dee789999310ac50 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 16:01:01 2008 +0200 + + updated Dell suspend quirks with s2ram whitelist entries from -r1.134 + + Updated Dell suspend quirks with s2ram whitelist entries from -r1.134. + New: + - Latitude LS + - OptiPlex 170L + - Vostro 1000 + - Dimension 9100 + + Reorganised OptiPlex machines, put them together. + + .../10freedesktop/20-video-quirk-pm-dell.fdi | 42 + +++++++++++++------- + 1 files changed, 28 insertions(+), 14 deletions(-) + +commit 71a8596afe62f4d5abec11ee62251d7b7395da84 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 15:54:21 2008 +0200 + + fixed typo from commit 39c1f01f + + Fixed typo from commit 39c1f01f. + + .../10freedesktop/20-video-quirk-pm-asus.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 834053ac81f22c2bf3284363fa58ab0f46cf5f33 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 15:52:47 2008 +0200 + + updated Asus suspend quirks with s2ram whitelist entries from -r1.134 + + Updated Asus suspend quirks with s2ram whitelist entries from -r1.134. + New: + - EEE 1000H + - F3Ka, V1J, ASUS A7V8X-X ACPI BIOS Revision + + .../10freedesktop/20-video-quirk-pm-asus.fdi | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 deletions(-) + +commit 1b8bce5a0492995fb8f89d78574a6821a4b2ef3b +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 15:47:22 2008 +0200 + + updated Acer suspend quirks with s2ram whitelist entries from -r1.134 + + Updated Acer suspend quirks with s2ram whitelist entries from -r1.134. + New: + - Aspire One 150 (AOA150) + - Aspire: 1670, 4520, 5920G + - TravelMate 6492 + - Xspire 1650 + + .../10freedesktop/20-video-quirk-pm-acer.fdi | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +commit 370d778d8eb79529b874212ca504824f808f4dc0 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Oct 20 15:38:34 2008 +0200 + + added 10-usb-obex.fdi to identify obex devices + + Added 10-usb-obex.fdi to identify obex devices. Adopted (to final + spec of the obex namespace) version of a patch from Alex Kanavin + <ak@sensi.org>, contributed via HAL ML. + + fdi/information/10freedesktop/10-usb-obex.fdi | 26 + +++++++++++++++++++++++++ + fdi/information/10freedesktop/Makefile.am | 3 +- + 2 files changed, 28 insertions(+), 1 deletions(-) + +commit 37f8917ce2d3cf768da2ae181559a1380e91e991 +Author: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon Oct 20 08:47:27 2008 +0200 + + fix typo in previous commit (Nokia N82 music player) + + .../10freedesktop/10-usb-music-players.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1cd2ea3001c56d46c0c4c1ae5b6af95ca6f06861 +Author: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon Oct 20 08:44:21 2008 +0200 + + add Nokia N82 mobile music player + + Add Nokia N82 mobile music player, as reported by Germán Pabón (no + public email address provided) in https://launchpad.net/bugs/282957 + + .../10freedesktop/10-usb-music-players.fdi | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit 2c96add3f912d1c9d0c1ec9cab0c33845eaf2985 +Author: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon Oct 20 08:35:46 2008 +0200 + + add Nokia N82 mobile modem + + Add Nokia N82 mobile modem, as reported by Germán Pabón (no public + email address provided) in https://launchpad.net/bugs/262566 + + fdi/information/10freedesktop/10-modem.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit d6fa6d205320d4278b67d6ef668c289b30b9913f +Author: Nafallo Bjälevik <nafallo@ubuntu.com> +Date: Mon Oct 20 08:31:17 2008 +0200 + + add Nokia N95-2 and N96 mobile modems + + Add Nokia N95-2 and N96 mobile modems, as reported by Nafallo + Bjälevik + in https://launchpad.net/bugs/285494 + + fdi/information/10freedesktop/10-modem.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 9f13a999774e767ed531a998c6ec8acefcd37ed5 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Fri Oct 17 11:46:50 2008 +0200 + + updated and extended keymap for Toshiba Satellite A110 + + Updated and extended keymap for Toshiba Satellite A110. + + fdi/information/10freedesktop/30-keymap-misc.fdi | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +commit 4fa54694c7f1ddbad28e8a0399edaf4527e41a34 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Fri Oct 17 11:32:44 2008 +0200 + + set HP Compaq 2510p as machine which handle brightness in hardware + + Set HP Compaq 2510p as machine which handle brightness in hardware. + + .../10freedesktop/10-laptop-panel-hardware.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5733d3b5078a538af7304b8abc1eebe2e8a779a6 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Thu Oct 16 11:09:37 2008 +0200 + + fixed typo in keymap fdi-file + + Fixed typo in keymap fdi-file. + + fdi/information/10freedesktop/30-keymap-misc.fdi | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit 9b31d19898df1dae1757cd8b820f170fab9fbea5 +Merge: 98c8e59... 39a0d15... +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Thu Oct 16 11:03:04 2008 +0200 + + Merge branch 'master' of + ssh://dkukawka@git.freedesktop.org/git/hal-info + +commit 98c8e5910a4d7666bf30a86820845f2944b22ea9 +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Thu Oct 16 11:01:44 2008 +0200 + + add keymap for a Toshiba Satellite A110 + + Added keymap for a Toshiba Satellite A110. + + fdi/information/10freedesktop/30-keymap-misc.fdi | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +commit c710029449e7cf9b82fbbf861a9e199085829a1d +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Thu Oct 16 10:56:01 2008 +0200 + + optimised misc keymap file: set input.keymap at the end + + Optimised misc keymap file: set input.keymap only one time at the end + of the fdi-file. + + fdi/information/10freedesktop/30-keymap-misc.fdi | 23 + +++++++++------------ + 1 files changed, 10 insertions(+), 13 deletions(-) + +commit 39a0d153b548730a813bc53af3a9f83a5b2199e0 +Author: Mario Limonciello <mario_limonciello@dell.com> +Date: Thu Oct 16 09:19:00 2008 +0200 + + fix "Media STOP" key assignment on Dell computers + + It was previously acting as "Cancel". As reported on the ML by Mario + Limonciello. + + fdi/information/10freedesktop/30-keymap-dell.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 84a5dc285a018c5b75e3e17becc9de3951733eab +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Wed Oct 15 11:38:52 2008 +0200 + + added suspend quirk for HP 530 Notebook PC + + Added suspend quirk for HP 530 Notebook PC as reported by Pavel + Šefránek + <ps@pjoul.cz>. + + Machine info: + system.firmware.vendor = 'Hewlett-Packard' (string) + system.firmware.version = '68MVU Ver. F.04' (string) + system.hardware.primary_video.product = 10146 (0x27a2) (int) + system.hardware.primary_video.vendor = 32902 (0x8086) (int) + system.hardware.product = 'HP 530 Notebook PC(GN797AA#AKB)' + (string) + system.hardware.vendor = 'Hewlett-Packard' (string) + system.hardware.version = 'F.04' (string) + system.kernel.machine = 'i686' (string) + system.kernel.name = 'Linux' (string) + system.kernel.version = '2.6.25-0.95.rc4.fc9' (string) + + .../10freedesktop/20-video-quirk-pm-hp.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 62ded732314edf73bfc3fe52e941870a4145a6e4 +Author: Richard Hughes <richard@hughsie.com> +Date: Mon Oct 13 12:18:48 2008 +0100 + + Released hal-info 20081013 + + VERSION | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 07d17e5f54ac668cbf2bae719415cea3770c2869 Author: Danny Kukawka <danny.kukawka@web.de> Date: Thu Oct 9 12:36:04 2008 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/configure new/hal-info-20081024/configure --- old/hal-info-20081012/configure 2008-10-12 20:59:31.000000000 +0200 +++ new/hal-info-20081024/configure 2008-10-24 16:14:44.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for hal-info 20081012. +# Generated by GNU Autoconf 2.61 for hal-info 20081024. # # Report bugs to <hal@lists.freedesktop.org>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='hal-info' PACKAGE_TARNAME='hal-info' -PACKAGE_VERSION='20081012' -PACKAGE_STRING='hal-info 20081012' +PACKAGE_VERSION='20081024' +PACKAGE_STRING='hal-info 20081024' PACKAGE_BUGREPORT='hal@lists.freedesktop.org' ac_subst_vars='SHELL @@ -1187,7 +1187,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures hal-info 20081012 to adapt to many kinds of systems. +`configure' configures hal-info 20081024 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1253,7 +1253,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hal-info 20081012:";; + short | recursive ) echo "Configuration of hal-info 20081024:";; esac cat <<_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -hal-info configure 20081012 +hal-info configure 20081024 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hal-info $as_me 20081012, which was +It was created by hal-info $as_me 20081024, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2050,7 +2050,7 @@ # Define the identity of the package. PACKAGE=hal-info - VERSION=20081012 + VERSION=20081024 cat >>confdefs.h <<_ACEOF @@ -4048,7 +4048,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hal-info $as_me 20081012, which was +This file was extended by hal-info $as_me 20081024, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4101,7 +4101,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -hal-info config.status 20081012 +hal-info config.status 20081024 configured by $0, generated by GNU Autoconf 2.61, with options \"`echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi new/hal-info-20081024/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -21,7 +21,7 @@ </match> </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard"> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2710p;nc2400"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p;2710p;nc2400"> <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081024/fdi/information/10freedesktop/10-modem.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/10-modem.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/10-modem.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -29,9 +29,9 @@ <!-- Option --> <match key="@info.parent:usb.vendor_id" int="0x0af0"> - <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light;Ricola Ndis Quad,Ricola Ndis Quad Light, + <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light, Ricola Ndis Quad,Ricola Ndis Quad Light, Cobra,Cobra Bus,Viper,Viper Bus,Gt Max Ready,Gt Max,Fuji Modem Light,Fuji Modem Gt,Fuji Modem Ex,Fuji Network Light,Fuji Network Gt, - Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite;Etna Modem Gt, + Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite, Etna Modem Gt, Etna Modem Ex,Etna Network Lite,Etna Network Gt,Etna Network Ex,Etna Koi Modem,Etna Koi Network --> <match key="@info.parent:usb.product_id" int_outof="0x5000;0x6000;0x6100;0x6200;0x6300;0x6050;0x6150;0x6250;0x6350;0x6500;0x6501;0x6600;0x6601;0x6701;0x6711;0x6721;0x6741;0x6761;0x6731;0x6751;0x6771;0x6800;0x6811;0x6901;0x6911;0x7001;0x7011;0x7021;0x7041;0x7061;0x7031;0x7051;0x7071;0x7100;0x7111"> <match key="@info.parent:usb.interface.number" int="0"> @@ -173,7 +173,7 @@ <!-- Pantech --> <match key="@info.parent:usb.vendor_id" int="0x106c"> - <!-- PC5740;PC5750;UM150 EVDO rev A card --> + <!-- PC5740, PC5750, UM150 EVDO rev A card --> <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711"> <match key="@info.parent:usb.interface.number" int="0"> <append key="modem.command_sets" type="strlist">IS-707-A</append> @@ -343,8 +343,8 @@ <!-- Nokia --> <match key="@info.parent:usb.vendor_id" int="0x421"> - <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61 --> - <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d"> + <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82 --> + <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72"> <match key="@info.parent:usb.interface.class" int="0x02"> <match key="@info.parent:usb.interface.subclass" int="0x02"> <append key="modem.command_sets" type="strlist">V.250</append> @@ -358,7 +358,7 @@ <!-- LG --> <match key="@info.parent:usb.vendor_id" int="0x1004"> <!-- U990 --> - <match key="@info.parent:usb.product_id" int_outof="0x6000"> + <match key="@info.parent:usb.product_id" int="0x6000"> <append key="modem.command_sets" type="strlist">GSM-07.07</append> <append key="modem.command_sets" type="strlist">GSM-07.05</append> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081024/fdi/information/10freedesktop/10-usb-music-players.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-10-24 14:49:52.000000000 +0200 @@ -110,6 +110,14 @@ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> <append key="portable_audio_player.audio_folders" type="strlist">music/</append> </match> + <!-- Nokia N82 --> + <match key="@storage.originating_device:usb.product_id" int="0x72"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Digital/</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> + </match> </match> <!-- MPIO HD300 Player --> @@ -371,6 +379,12 @@ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append> <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> </match> + <!-- ALBA MP3128D6 --> + <match key="@storage.originating_device:usb.product_id" int="0x8305"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> + <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> + </match> <!-- TrekStor vibez --> <match key="@storage.originating_device:usb.product_id" int="0x842a"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/10-usb-obex.fdi new/hal-info-20081024/fdi/information/10freedesktop/10-usb-obex.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/10-usb-obex.fdi 1970-01-01 01:00:00.000000000 +0100 +++ new/hal-info-20081024/fdi/information/10freedesktop/10-usb-obex.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deviceinfo version="0.2"> + <device> + <match key="info.subsystem" string="usb"> + <match key="usb.interface.class" int="0x02"> + <match key="usb.interface.subclass" int="0x0b"> + <merge key="info.category" type="string">obex</merge> + <append key="info.capabilities" type="strlist">obex</append> + <match key="usb.interface.description" contains_ncase="pc suite"> + <merge key="obex.type" type="string">pcsuite</merge> + </match> + <match key="usb.interface.description" contains_ncase="syncml"> + <merge key="obex.type" type="string">syncml</merge> + </match> + <match key="usb.interface.description" contains_ncase="syncml-sync"> + <merge key="obex.type" type="string">syncml-sync</merge> + </match> + <match key="usb.interface.description" contains_ncase="syncml-dm"> + <merge key="obex.type" type="string">syncml-dm</merge> + </match> + </match> + </match> + </match> + </device> +</deviceinfo> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -24,7 +24,7 @@ <match key="system.hardware.product" contains="6460"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="C200;2450;4400"> + <match key="system.hardware.product" contains_outof="C200;2450;4400;6492"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> @@ -59,7 +59,7 @@ <match key="system.hardware.product" contains="5050"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="3610;3620;3690;5630"> + <match key="system.hardware.product" contains_outof="1670;3610;3620;3690;5630"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> @@ -97,7 +97,7 @@ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="2920;3100;5500Z;5580"> + <match key="system.hardware.product" contains_outof="2920;3100;4520;5500Z;5580;5920G"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -133,6 +133,12 @@ </match> </match> + <match key="system.hardware.product" prefix="Xspire"> + <match key="system.hardware.product" contains="1650"> + <merge key="power_management.quirk.none" type="bool">true</merge> + </match> + </match> + <match key="system.hardware.product" prefix="AcerPower"> <match key="system.hardware.product" contains="2000"> <merge key="power_management.quirk.none" type="bool">true</merge> @@ -140,7 +146,7 @@ </match> <!-- Aspire One 110 --> - <match key="system.hardware.product" prefix="AOA110"> + <match key="system.hardware.product" prefix_outof="AOA110;AOA150"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -27,6 +27,16 @@ <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> + <match key="system.hardware.product" prefix="F3Ka"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> + <merge key="power_management.quirk.no_fb" type="bool">true</merge> + </match> + <match key="system.hardware.product" prefix="V1J "> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> + <merge key="power_management.quirk.no_fb" type="bool">true</merge> + </match> <!-- Z91E is identified as A3E --> <match key="system.hardware.product" prefix_outof="A6J ;A6U;A3E;F3JP"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> @@ -38,7 +48,7 @@ <merge key="power_management.quirk.dpms_on" type="bool">true</merge> </match> <!-- these need no quirks, whitelist them --> - <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;A8JS ;F3Sg;F3T;F9E ;G1S;K8V-MX"> + <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;A8JS ;F3Sg;F3T;F9E ;G1S;K8V-MX;1000H"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -72,8 +82,8 @@ </match> <!-- another ASUS Mainboard --> - <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603"> - <merge key="power_managiement.quirk.vbe_post" type="bool">true</merge> + <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603;ASUS A7V8X-X ACPI BIOS Revision"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -47,7 +47,7 @@ <merge key="power_management.quirk.vbe_post" type="bool">true</merge> </match> <!-- these need no quirks --> - <match key="system.hardware.product" contains="CPx J650GT"> + <match key="system.hardware.product" contains_outof="CPx J650GT;LS "> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -119,7 +119,7 @@ <!-- Dell Dimension --> <match key="system.hardware.product" prefix="Dimension"> - <match key="system.hardware.product" contains_outof="2400;3000"> + <match key="system.hardware.product" contains_outof="2400;3000;9100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> @@ -127,6 +127,10 @@ <!-- Dell Vostro --> <match key="system.hardware.product" prefix="Vostro"> + <match key="system.hardware.product" contains=" 1000 "> + <merge key="power_management.quirk.s3_bios" type="bool">true</merge> + <merge key="power_management.quirk.s3_mode" type="bool">true</merge> + </match> <match key="system.hardware.product" contains=" 1500"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> @@ -136,27 +140,37 @@ </match> </match> + <!-- Dell OptiPlex --> + <match key="system.hardware.product" prefix_ncase="OptiPlex"> + <match key="system.hardware.product" contains_outof="GX520;GX260"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> + </match> + <match key="system.hardware.product" contains="755"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.no_fb" type="bool">true</merge> + </match> + <match key="system.hardware.product" contains_ncase="fx160"> + <merge key="power_management.quirk.s3_bios" type="bool">true</merge> + <merge key="power_management.quirk.s3_mode" type="bool">true</merge> + </match> + <match key="system.hardware.product" contains_outof="170L;GX620"> + <merge key="power_management.quirk.none" type="bool">true</merge> + </match> + </match> + <!-- Dell Inspiron 640m, XPS M1210 --> <match key="system.hardware.product" contains_outof="MXC061;MXC062"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> </match> - <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel) - MM061 = Inspiron E1505 or/and 6400 --> - <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520;MM061;OptiPlex GX260"> + <!-- Dell XPS M1330, MM061 = Inspiron E1505 or/and 6400 --> + <match key="system.hardware.product" contains_outof="XPS M1330;MM061;"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" contains="OptiPlex 755"> - <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.no_fb" type="bool">true</merge> - </match> - <match key="system.hardware.product" contains_ncase="optiplex fx160"> - <merge key="power_management.quirk.s3_bios" type="bool">true</merge> - <merge key="power_management.quirk.s3_mode" type="bool">true</merge> - </match> - <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) --> - <match key="system.hardware.product" contains_outof="DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX620"> + <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710 (only resumes with vesafb) --> + <match key="system.hardware.product" contains_outof="DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -35,7 +35,7 @@ <merge key="power_management.quirk.s3_mode" type="bool">true</merge> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" contains="Pro V2040"> + <match key="system.hardware.product" contains_outof="Pro V2040;Pro Series V3525"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -44,12 +44,12 @@ <match key="system.hardware.product" contains_outof="P7010D;S2110"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="E8410;T4010;S2210"> + <match key="system.hardware.product" contains_outof="E8410;T4010;S2210;P8010"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> <!-- S7020 is also reported with s3_bios/s3_mode/pci_save --> - <match key="system.hardware.product" contains_outof="S7020;S7110"> + <match key="system.hardware.product" contains="S7020"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.reset_brightness" type="bool">true</merge> </match> @@ -76,7 +76,7 @@ <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110;E8110"> + <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110;E8110;T301;T3010"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -49,7 +49,7 @@ <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E);F500 (GF596UA#"> + <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E);F500 (GF596UA#;2200 (PR309UA#;C700 (GV681LA#"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -93,7 +93,7 @@ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- Note: PY507ET# is a nc6120 --> - <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6710b;6720s;2710p;8510p;PY507ET#;6715b"> + <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6720s;2710p;8510p;PY507ET#;6715b"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> @@ -102,7 +102,7 @@ <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" contains="nc4200"> + <match key="system.hardware.product" contains_outof="nc4200;HP 530 Notebook PC"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> </match> @@ -147,6 +147,15 @@ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> + <match key="system.hardware.product" contains="6710b"> + <match key="system.hardware.product" contains="KE123EA"> + <merge key="power_management.quirk.none" type="bool">true</merge> + </match> + <match key="system.hardware.product" contains="KE124EA"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> + </match> + </match> <match key="system.hardware.product" contains="6710s"> <match key="system.firmware.version" contains="68DDU"> <match key="system.hardware.product" contains="GC014ET"> @@ -217,7 +226,7 @@ <match key="system.hardware.product" contains_outof="dv4000 (EB911EA#; dv2600; dv6500"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> - <match key="system.hardware.product" contains="dv4000 (PX306UA#"> + <match key="system.hardware.product" contains_outof="dv4000 (PX306UA#; dv6700 "> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> @@ -255,20 +264,24 @@ </match> </match> - <!-- HP Pavilion ZT1000-IC --> <match key="system.hardware.product" string="HP Pavilion Notebook PC"> <match key="system.hardware.version" string="HP Pavilion Notebook"> <match key="system.firmware.vendor" string="Insyde Software"> + <!-- HP Pavilion ZT1000-IC --> <match key="system.firmware.version" string=" IC.M1.04"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> + <!-- HP Pavilion xz275 --> + <match key="system.firmware.version" string=" IC.M1.02"> + <merge key="power_management.quirk.none" type="bool">true</merge> + </match> </match> </match> </match> - <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF;ze4900"> + <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF;ze4900; dv9700 "> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> @@ -281,7 +294,7 @@ <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch;ES061AA-ABD t3320"> + <match key="system.hardware.product" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch;ES061AA-ABD t3320;PC098A-ABA M1070N"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -41,7 +41,7 @@ <match key="system.hardware.product" prefix_outof="2366;2653"> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> - <!-- X22, X40; X32 --> + <!-- X22, X40, X32 --> <match key="system.hardware.product" prefix_outof="2662;2672;2673"> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> <match key="system.hardware.version" contains_not="X31"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -13,6 +13,10 @@ <match key="system.hardware.product" prefix="63664DU"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> </match> + <match key="system.hardware.product" prefix="6457"> + <merge key="power_management.quirk.vbe_post" type="bool">true</merge> + <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> + </match> <!-- R60 --> <match key="system.hardware.version" prefix_ncase="ThinkPad R60"> @@ -44,7 +48,7 @@ </match> <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE T61p (6460), does not work with the NVidia driver--> - <match key="system.hardware.product" prefix_outof="6457;6460;6465"> + <match key="system.hardware.product" prefix_outof="6460;6465"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> @@ -73,11 +77,11 @@ </match> </match> <match key="system.hardware.version" prefix_ncase="3000 N200"> - <match key="system.hardware.product" string="0769BBG;0769AC6"> + <match key="system.hardware.product" string_outof="0769BBG;0769AC6"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" string_outof="0769B9G;0769BEG"> + <match key="system.hardware.product" string_outof="0769B9G;0769BEG;0769AH9"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -41,6 +41,13 @@ </match> </device> <device> + <match key="system.hardware.vendor" string="JVC"> + <match key="system.hardware.product" string="J2N "> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> + </match> + </match> + </device> + <device> <match key="system.hardware.vendor" prefix="LG"> <match key="system.hardware.product" string_outof="M1-3DGBG;W1-JDGBG;LM50-DGHE;LW75-SGGV1"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> @@ -192,6 +199,9 @@ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> + <match key="system.hardware.product" string="MS-1003"> + <merge key="power_management.quirk.none" type="bool">true</merge> + </match> </match> <match key="system.hardware.vendor" prefix="MSI"> <match key="system.hardware.product" string_outof="MS-7350;MS-7207PV;MS-6417;MS-6702"> @@ -224,7 +234,7 @@ <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" string_outof="MS-7012;M295M;WIM 2000 "> + <match key="system.hardware.product" string_outof="MS-7012;M295M;WIM 2000 ;WIM 2140"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -5,14 +5,10 @@ <match key="system.hardware.product" string="VGN-FS115Z"> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-C2S_H"> + <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> - <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920"> - <merge key="power_management.quirk.s3_bios" type="bool">true</merge> - <merge key="power_management.quirk.s3_mode" type="bool">true</merge> - </match> - <match key="system.hardware.product" contains="PCG-FX601"> + <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> @@ -34,7 +30,7 @@ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11S"> + <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11;VGN-TX670P"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> @@ -47,7 +43,7 @@ <!-- Note: - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia --> - <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN;VGN-A115B;VGN-FE890E;VGN-N320E"> + <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN;VGN-A115B;VGN-FE890E;VGN-N320E;VGN-C2S_H;VGN-FS215M;VGN-Z90S"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> <match key="system.hardware.product" contains_outof="VGN-TZ11;PCG-F430(UC);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K(J) "> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -4,7 +4,7 @@ <match key="system.hardware.vendor" string="TOSHIBA"> <!-- Satellite Laptops --> <match key="system.hardware.product" prefix="Satellite"> - <match key="system.hardware.product" contains_outof=" M30X; 1130"> + <match key="system.hardware.product" contains=" M30X"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> <match key="system.hardware.product" contains_outof="Pro A120;M35X;P100;P200; P205D; A100; A105; A135; A200; A205; A210; L30; M105;M70"> @@ -36,7 +36,7 @@ <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> - <match key="system.hardware.product" contains="A30"> + <match key="system.hardware.product" contains_outof="A30; 1130"> <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="Pro 6100"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-acer.fdi new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-acer.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-acer.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-acer.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -27,23 +27,23 @@ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button --> <append key="input.keymap.data" type="strlist">e075:presentation</append> <!-- Minimise all Windows --> <append key="input.keymap.data" type="strlist">e078:fn</append> <!-- Fn key --> - <append key="input.keymap.data" type="strlist">e079:sync</append> <!-- Launch NTI shadow --> + <append key="input.keymap.data" type="strlist">e079:f23</append> <!-- Launch NTI shadow --> <append key="info.capabilities" type="strlist">input.keymap</append> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720"> <remove key="input.keymap.data" type="strlist">e06e:brightnessup</remove> - <append key="input.keymap.data" type="strlist">e06e:lock</append> <!-- Windows Lock function --> + <append key="input.keymap.data" type="strlist">e06e:screenlock</append> <!-- Windows Lock function --> </match> </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate"> <!-- TravelMate C300 --> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="C300"> - <append key="input.keymap.data" type="strlist">0x67:f22</append> <!-- FIXME: rotate screen --> + <append key="input.keymap.data" type="strlist">0x67:f24</append> <!-- FIXME: rotate screen --> <append key="input.keymap.data" type="strlist">0x68:up</append> <append key="input.keymap.data" type="strlist">0x69:down</append> <append key="input.keymap.data" type="strlist">0x6b:fn</append> - <append key="input.keymap.data" type="strlist">0x6c:f23</append> <!-- FIXME: lock tablet device/buttons--> + <append key="input.keymap.data" type="strlist">0x6c:screenlock</append> <!-- FIXME: lock tablet device/buttons--> </match> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-dell.fdi new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-dell.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -9,7 +9,7 @@ <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell"> <append key="input.keymap.data" type="strlist">e001:playpause</append> <!-- Play/Pause --> - <append key="input.keymap.data" type="strlist">e002:stop</append> <!-- Stop --> + <append key="input.keymap.data" type="strlist">e002:stopcd</append> <!-- Stop --> <append key="input.keymap.data" type="strlist">e003:previoussong</append> <!-- Previous song --> <append key="input.keymap.data" type="strlist">e004:nextsong</append> <!-- Next song --> <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down --> @@ -29,7 +29,7 @@ <append key="input.keymap.data" type="strlist">e019:nextsong</append> <!-- Front panel next song --> <append key="input.keymap.data" type="strlist">e01b:switchvideomode</append> <!-- Display Toggle button --> <append key="input.keymap.data" type="strlist">e022:playpause</append> <!-- Front panel play/pause --> - <append key="input.keymap.data" type="strlist">e024:stop</append> <!-- Front panel stop --> + <append key="input.keymap.data" type="strlist">e024:stopcd</append> <!-- Front panel stop --> <append key="input.keymap.data" type="strlist">e06d:media</append> <!-- MediaDirect button --> <append key="info.capabilities" type="strlist">input.keymap</append> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-hp.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -6,38 +6,45 @@ <!-- These are raw scancodes produced by the atkbd driver --> <match key="@input.originating_device:info.linux.driver" string="atkbd"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Hewlett-Packard"> - <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc --> - <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) --> - <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) --> - <append key="input.keymap.data" type="strlist">e00b:camera</append> <!-- camera --> - <append key="input.keymap.data" type="strlist">e00c:media</append> <!-- music --> - <append key="input.keymap.data" type="strlist">e00e:dvd</append> <!-- dvd --> - <append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) --> - <append key="input.keymap.data" type="strlist">e033:f21</append> <!-- FIXME: Auto brightness --> - <append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan --> - <append key="info.capabilities" type="strlist">input.keymap</append> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion"> - <!-- Home and entertainment machines --> - <append key="input.keymap.data" type="strlist">e008:player</append> <!-- FIXME: quick play --> - <append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off --> - <append key="input.keymap.data" type="strlist">e059:f23</append> <!-- touchpad on --> - </match> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq"> - <!-- Business and enterprise machines --> - <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- Presentation --> - <append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key --> - </match> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6730s"> - <!-- HP Compaq 6730s --> - <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- FnF7 (brightness down) --> - <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- FnF8 (brightness up) --> - </match> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p"> - <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model --> - <remove key="input.keymap.data" type="strlist">e059:info</remove> - <append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off --> - <append key="input.keymap.data" type="strlist">e059:f23</append> <!-- touchpad on --> - </match> + <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop"> + <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc --> + <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) --> + <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) --> + <append key="input.keymap.data" type="strlist">e00b:camera</append> <!-- camera --> + <append key="input.keymap.data" type="strlist">e00c:media</append> <!-- music --> + <append key="input.keymap.data" type="strlist">e00e:dvd</append> <!-- dvd --> + <append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) --> + <append key="input.keymap.data" type="strlist">e033:f21</append> <!-- FIXME: Auto brightness --> + <append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan --> + <append key="info.capabilities" type="strlist">input.keymap</append> + + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion"> + <!-- Home and entertainment machines --> + <append key="input.keymap.data" type="strlist">e008:player</append> <!-- FIXME: quick play --> + <append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off --> + <append key="input.keymap.data" type="strlist">e059:f23</append> <!-- touchpad on --> + </match> + + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq"> + <!-- Business and enterprise machines --> + <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- Presentation --> + <append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key --> + </match> + + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6730s"> + <!-- HP Compaq 6730s --> + <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- FnF7 (brightness down) --> + <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- FnF8 (brightness up) --> + </match> + + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p"> + <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model --> + <remove key="input.keymap.data" type="strlist">e059:info</remove> + <append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off --> + <append key="input.keymap.data" type="strlist">e059:f23</append> <!-- touchpad on --> + </match> + + </match> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-misc.fdi --- old/hal-info-20081012/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -11,7 +11,6 @@ <append key="input.keymap.data" type="strlist">6e:wlan</append> <!-- Fn + F1 wireless network radio on and off. --> <!-- <append key="input.keymap.data" type="strlist">6d:brightnessdown</append> (Fn + F6 brightness down.) --> <!-- <append key="input.keymap.data" type="strlist">6d:brightnessup</append> (Fn + F7 brightness. up) --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -19,7 +18,6 @@ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro V3205"> <append key="input.keymap.data" type="strlist">e074:f21</append> <!-- FIXME: silent-mode decrease CPU/GPU clock --> <append key="input.keymap.data" type="strlist">e077:switchvideomode</append> <!-- Fn+F3 switch screen --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -27,7 +25,6 @@ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060"> <append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down --> <append key="input.keymap.data" type="strlist">6d:channelup</append> <!-- Thottle Up --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -45,7 +42,6 @@ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4 Brightness down --> <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5 Brightness up --> <append key="input.keymap.data" type="strlist">e079:search</append> <!-- Search --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -64,7 +60,6 @@ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down --> <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up --> <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -74,7 +69,6 @@ <append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button --> <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button --> <append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -82,7 +76,6 @@ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SYMPHONY 6.0/7.0"> <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P2" programmable button --> <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -93,11 +86,10 @@ <append key="input.keymap.data" type="strlist">a0:mute</append> <!-- Fn-F5 Sound On/Off --> <append key="input.keymap.data" type="strlist">82:www</append> <!-- www button --> <append key="input.keymap.data" type="strlist">ec:email</append> <!-- envelope button --> - <append key="input.keymap.data" type="strlist">ae:volumedown</append> <!-- Fn-Down Volume down --> - <append key="input.keymap.data" type="strlist">b0:volumeup</append> <!-- Fn-Up Volume up --> + <append key="input.keymap.data" type="strlist">ae:volumedown</append> <!-- Fn-Down Volume down --> + <append key="input.keymap.data" type="strlist">b0:volumeup</append> <!-- Fn-Up Volume up --> <append key="input.keymap.data" type="strlist">df:suspend</append> <!-- Fn+F2 hibernate --> - <append key="input.keymap.data" type="strlist">f5:help</append> <!-- Help button --> - <append key="info.capabilities" type="strlist">input.keymap</append> + <append key="input.keymap.data" type="strlist">f5:help</append> <!-- Help button --> </match> </match> @@ -116,7 +108,6 @@ <append key="input.keymap.data" type="strlist">e077:f22</append> <!-- Fn+F10 Touchpad on --> <append key="input.keymap.data" type="strlist">0078:mail</append> <!-- Mail key --> <append key="input.keymap.data" type="strlist">e079:f22</append> <!-- Fn+F10 Touchpad off --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="SX20S"> <append key="input.keymap.data" type="strlist">0074:mute</append> @@ -133,7 +124,6 @@ <append key="input.keymap.data" type="strlist">e057:f9</append> <!-- Left arrow: mute --> <append key="input.keymap.data" type="strlist">e064:f5</append> <!-- Shutter key: mute --> <append key="input.keymap.data" type="strlist">e06e:f11</append> <!-- UDF key: mute --> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> </match> @@ -141,10 +131,28 @@ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE A100"> <append key="input.keymap.data" type="strlist">e024:stop</append> <append key="input.keymap.data" type="strlist">e032:www</append> - <append key="info.capabilities" type="strlist">input.keymap</append> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Satellite A110"> + <append key="input.keymap.data" type="strlist">e012:stop</append> + <append key="input.keymap.data" type="strlist">e013:www</append> + <append key="input.keymap.data" type="strlist">e014:media</append> <!-- Multimedia Player --> + <append key="input.keymap.data" type="strlist">e01e:f21</append> <!-- FIXME: Touchpad on --> + <append key="input.keymap.data" type="strlist">e01f:f21</append> <!-- FIXME: Touchpad off --> + <append key="input.keymap.data" type="strlist">e039:nextsong</append> <!-- Next song --> + <append key="input.keymap.data" type="strlist">e059:brightnessup</append> + <append key="input.keymap.data" type="strlist">e06e:screenlock</append> + <append key="input.keymap.data" type="strlist">e074:previoussong</append> <!-- Previous song --> + <append key="input.keymap.data" type="strlist">e077:playpause</append> + </match> </match> + <!-- set the common key now --> + <match key="input.keymap.data" exists="true"> + <match key="input.keymap.data" contains_not="input.keymap"> + <append key="info.capabilities" type="strlist">input.keymap</append> + </match> + </match> + </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/Makefile.am new/hal-info-20081024/fdi/information/10freedesktop/Makefile.am --- old/hal-info-20081012/fdi/information/10freedesktop/Makefile.am 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/Makefile.am 2008-10-24 14:45:12.000000000 +0200 @@ -10,7 +10,8 @@ 10-laptop-panel-hardware.fdi \ 10-cd-dvd-burner.fdi \ 10-battery.fdi \ - 10-modem.fdi + 10-modem.fdi \ + 10-usb-obex.fdi if BUILD_KILLSWITCH_DELL_WLAN dist_fdi_DATA += 10-dell-rfkill-switch-wlan.fdi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/information/10freedesktop/Makefile.in new/hal-info-20081024/fdi/information/10freedesktop/Makefile.in --- old/hal-info-20081012/fdi/information/10freedesktop/Makefile.in 2008-10-12 20:59:47.000000000 +0200 +++ new/hal-info-20081024/fdi/information/10freedesktop/Makefile.in 2008-10-24 16:14:43.000000000 +0200 @@ -87,7 +87,8 @@ 10-usb-music-players.fdi 10-usb-zip-drives.fdi \ 10-camera-ptp.fdi 10-usb-pda.fdi 10-usbcsr-mice.fdi \ 10-laptop-panel-hardware.fdi 10-cd-dvd-burner.fdi \ - 10-battery.fdi 10-modem.fdi 10-dell-rfkill-switch-wlan.fdi \ + 10-battery.fdi 10-modem.fdi 10-usb-obex.fdi \ + 10-dell-rfkill-switch-wlan.fdi \ 10-dell-rfkill-switch-bluetooth.fdi \ 10-dell-rfkill-switch-wwan.fdi 10-sony-bluetooth-switch.fdi \ 10-thinkpad-rfkill-switch-bluetooth.fdi \ @@ -204,9 +205,10 @@ 10-usb-zip-drives.fdi 10-camera-ptp.fdi 10-usb-pda.fdi \ 10-usbcsr-mice.fdi 10-laptop-panel-hardware.fdi \ 10-cd-dvd-burner.fdi 10-battery.fdi 10-modem.fdi \ - $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__append_6) \ - $(am__append_7) $(am__append_8) $(am__append_9) + 10-usb-obex.fdi $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) $(am__append_7) $(am__append_8) \ + $(am__append_9) all: all-am .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/fdi/preprobe/10osvendor/10-ide-drives.fdi new/hal-info-20081024/fdi/preprobe/10osvendor/10-ide-drives.fdi --- old/hal-info-20081012/fdi/preprobe/10osvendor/10-ide-drives.fdi 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/fdi/preprobe/10osvendor/10-ide-drives.fdi 2008-10-24 14:45:12.000000000 +0200 @@ -24,7 +24,7 @@ <merge key="storage.drive_type" type="string">zip</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> @@ -33,7 +33,7 @@ <merge key="storage.drive_type" type="string">zip</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> @@ -42,7 +42,7 @@ <merge key="storage.drive_type" type="string">jaz</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> </match> @@ -55,7 +55,7 @@ <merge key="storage.drive_type" type="string">zip</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> @@ -64,7 +64,7 @@ <merge key="storage.drive_type" type="string">zip</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> @@ -73,7 +73,7 @@ <merge key="storage.drive_type" type="string">jaz</merge> <merge key="storage.no_partitions_hint" type="bool">true</merge> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- treat as floppy and data at partition 4; adjust device file --> + <!-- treat as floppy and data at partition 4, adjust device file --> <append key="block.device" type="string">4</append> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081012/tools/keymap-check.sh new/hal-info-20081024/tools/keymap-check.sh --- old/hal-info-20081012/tools/keymap-check.sh 2008-10-12 20:58:06.000000000 +0200 +++ new/hal-info-20081024/tools/keymap-check.sh 2008-10-24 14:45:12.000000000 +0200 @@ -20,9 +20,11 @@ cat "$1" | sed -ne '/<!--/ { :c; /-->/! { N; b c; }; /-->/s/<!--.*-->//g }; /^ *$/!p;' | grep "input.keymap.data" | while read line do data=`echo "${line}" | cut -d":" -f2 | cut -d"<" -f1` - found=`isin $data` - if [ "$found" = "0" ]; then - echo "$data " + if [ -n "${data}" ] ; then + found=`isin $data` + if [ "$found" = "0" ]; then + echo "$data " + fi fi done } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org