Hello community,
here is the log from the commit of package hal for openSUSE:Factory
checked in at Fri Feb 6 20:30:09 CET 2009.
--------
--- hal/hal.changes 2009-01-26 10:57:12.000000000 +0100
+++ hal/hal.changes 2009-02-06 12:48:57.000000000 +0100
@@ -1,0 +2,25 @@
+Fri Feb 6 12:35:56 CET 2009 - dkukawka@suse.de
+
+- update HAL to latest git (9ff3ffe362c2d7) of my tree and
+ hal-info to 20090206
+- this update include fixes for:
+ - bnc#471978: keymappings for a couble of HP laptops
+ - bnc#471973: suspend quirk for a HP Compaq 4410s
+ - add new keys to match for a special kernel version in fdi files
+ - several new keymapping, suspend quirks, modems and USB music
+ player
+ - some fixes to use addset for some info.capabilities merges
+ - fix typ of portable_audio_player.playlist_path to string
+ - cleanups and smaller fixes for fdi-files of hal-info
+- removed upstream gone patches:
+ - hal-info-hp-brightness-input.diff
+
+-------------------------------------------------------------------
+Thu Feb 5 11:59:32 CET 2009 - thoenig@suse.de
+
+- new patch: hal-info-hp-brightness-input.diff
+ - Add a couple of HP laptops to 30-keymap-hp.fdi (hal-info).
+ Based on upstream commit
+ 0efd7acd2aed94a398b0e7661001ab8393083241 (bnc#471978)
+
+-------------------------------------------------------------------
hal-doc.changes: same change
calling whatdependson for head-i586
Old:
----
hal-info-20090121.tar.bz2
New:
----
hal-info-20090206.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.S19410/_old 2009-02-06 20:26:11.000000000 +0100
+++ /var/tmp/diff_new_pack.S19410/_new 2009-02-06 20:26:11.000000000 +0100
@@ -26,12 +26,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090121
+%define hal_info_version 20090206
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 18
+Release: 21
Url: http://freedesktop.org/Software/hal
-License: Other uncritical OpenSource License
+License: Dual GPLv2 or Academic Free License 2.1
Group: System/Daemons
AutoReqProv: on
Requires: pm-utils
@@ -365,6 +365,25 @@
%endif
%changelog
+* Fri Feb 06 2009 dkukawka@suse.de
+- update HAL to latest git (9ff3ffe362c2d7) of my tree and
+ hal-info to 20090206
+- this update include fixes for:
+ - bnc#471978: keymappings for a couble of HP laptops
+ - bnc#471973: suspend quirk for a HP Compaq 4410s
+ - add new keys to match for a special kernel version in fdi files
+ - several new keymapping, suspend quirks, modems and USB music
+ player
+ - some fixes to use addset for some info.capabilities merges
+ - fix typ of portable_audio_player.playlist_path to string
+ - cleanups and smaller fixes for fdi-files of hal-info
+- removed upstream gone patches:
+ - hal-info-hp-brightness-input.diff
+* Thu Feb 05 2009 thoenig@suse.de
+- new patch: hal-info-hp-brightness-input.diff
+ - Add a couple of HP laptops to 30-keymap-hp.fdi (hal-info).
+ Based on upstream commit
+ 0efd7acd2aed94a398b0e7661001ab8393083241 (bnc#471978)
* Sun Jan 25 2009 dkukawka@suse.de
- update HAL to latest git (336d871860710a) of my tree
- this update include fixes for:
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.S19410/_old 2009-02-06 20:26:11.000000000 +0100
+++ /var/tmp/diff_new_pack.S19410/_new 2009-02-06 20:26:11.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090121
+%define hal_info_version 20090206
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 18
+Release: 21
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL2.0 or GPLv2.0
Group: System/Daemons
@@ -364,6 +364,25 @@
%endif
%changelog
+* Fri Feb 06 2009 dkukawka@suse.de
+- update HAL to latest git (9ff3ffe362c2d7) of my tree and
+ hal-info to 20090206
+- this update include fixes for:
+ - bnc#471978: keymappings for a couble of HP laptops
+ - bnc#471973: suspend quirk for a HP Compaq 4410s
+ - add new keys to match for a special kernel version in fdi files
+ - several new keymapping, suspend quirks, modems and USB music
+ player
+ - some fixes to use addset for some info.capabilities merges
+ - fix typ of portable_audio_player.playlist_path to string
+ - cleanups and smaller fixes for fdi-files of hal-info
+- removed upstream gone patches:
+ - hal-info-hp-brightness-input.diff
+* Thu Feb 05 2009 thoenig@suse.de
+- new patch: hal-info-hp-brightness-input.diff
+ - Add a couple of HP laptops to 30-keymap-hp.fdi (hal-info).
+ Based on upstream commit
+ 0efd7acd2aed94a398b0e7661001ab8393083241 (bnc#471978)
* Sun Jan 25 2009 dkukawka@suse.de
- update HAL to latest git (336d871860710a) of my tree
- this update include fixes for:
++++++ hal-0.5.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog
--- old/hal-0.5.12/ChangeLog 2009-01-25 19:37:50.000000000 +0100
+++ new/hal-0.5.12/ChangeLog 2009-02-06 13:03:46.000000000 +0100
@@ -1,3 +1,182 @@
+commit 9ff3ffe362c2d72a393aa4cde5c94950e26aeac7
+Author: Danny Kukawka
+Date: Mon Feb 2 18:16:39 2009 +0100
+
+ provide comparable linux kernel version information
+
+ Provide comparable linux kernel version information via these
+ new properties:
+
+ system.kernel.version.major (int)
+ system.kernel.version.minor (int)
+ system.kernel.version.micro (int)
+
+ This allow us to track changes in the kernel within the fdi
+ files and rules.
+
+ doc/spec/hal-spec-properties.xml | 24 ++++++++++++++++++++++++
+ hald/linux/osspec.c | 11 +++++++++++
+ 2 files changed, 35 insertions(+), 0 deletions(-)
+
+commit e04a7138ac2de0917e0032dae7bdfc1c2dabc179
+Author: Danny Kukawka
+Date: Thu Jan 29 11:31:26 2009 +0100
+
+ fix commit 33b54318f73012e24220456216794dd3ff39fc93
+
+ Fixed commit 33b54318f73012e24220456216794dd3ff39fc93. Don't use
+ LIBHAL_FREE_DBUS_ERROR() if there was already a dbus_error_is_set()
+ check.
+
+ tools/hal_get_property.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 879f06a4e4abc87471a030a5f285dc32455082e4
+Merge: f3cec03... 101c34a...
+Author: Richard Hughes
+Date: Thu Jan 29 08:37:46 2009 +0000
+
+ Merge branch 'master' of
+ git+ssh://hughsient@git.freedesktop.org/git/hal
+
+commit f3cec03bef98c0083c2e9a58ab7323e544412700
+Author: Richard Hughes
+Date: Thu Jan 29 08:37:26 2009 +0000
+
+ allow child timeout to be set so hal starts on big servers
+
+ When a server has a _lot_ of disks, hald fails to
+ startup as it spends more than 250 seconds probing.
+ We don't want to hardocde this number any higher, as
+ this may leave haldaemon hung for a long time if there
+ is an error. Add as a command line argument that can be
+ appended in the init script if this is required.
+
+ hald/hald.c | 20 +++++++++++++++-----
+ 1 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 82fdfef5942446638c831a0a8381c018376545c7
+Author: Richard Hughes
+Date: Thu Jan 29 08:34:16 2009 +0000
+
+ set the retval of hal-device correctly on error
+
+ At the moment hal-device always returns success.
+ Only return success if a device was matched.
+
+ tools/hal-device.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 33b54318f73012e24220456216794dd3ff39fc93
+Author: Richard Hughes
+Date: Thu Jan 29 08:33:00 2009 +0000
+
+ check udi in hal-get-property
+
+ We are not checking if a UDI is valid in hal-get-property
+ which means getting a horrible DBUS error if the entry
+ is not a valid DBUS path.
+
+ tools/hal_get_property.c | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 101c34aef06dcd8074d7de9e61f296c546996b5d
+Author: Danny Kukawka
+Date: Wed Jan 28 14:14:02 2009 +0100
+
+ fixed entries to add acl related keys only if there is a device
+
+ Fixed existing entries to add acl related keys only if there is
+ also a device to which HAL can add the ACL rules.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 192
+ +++++++++++++++------------
+ 1 files changed, 110 insertions(+), 82 deletions(-)
+
+commit 59d66b8ebcef20f3a48ca6744cc5ee6f5b0c212f
+Author: Danny Kukawka
+Date: Wed Jan 28 13:45:39 2009 +0100
+
+ add current default policies for device access to spec
+
+ Added current default policies for device access, for active
+ and inactive users, to the list of existing policies in the spec.
+
+ doc/spec/hal-spec-access-control.xml | 53
+ ++++++++++++++++++++++++++++++---
+ 1 files changed, 48 insertions(+), 5 deletions(-)
+
+commit 0d6eaa5ab4bdbaa73b20db0e9c200af39c00b2ee
+Author: Danny Kukawka
+Date: Wed Jan 28 13:44:05 2009 +0100
+
+ sort existing PolicyKit policies for device access alphabetical
+
+ Sorted existing PolicyKit policies for device acces alphabetical.
+
+ policy/org.freedesktop.hal.device-access.policy | 48
+ +++++++++++-----------
+ 1 files changed, 24 insertions(+), 24 deletions(-)
+
+commit d7a06bc844b922a22db8ec4715e2f602898c3cf9
+Author: Danny Kukawka
+Date: Wed Jan 28 13:31:45 2009 +0100
+
+ filled TODOs with information for the printer namespace
+
+ Filled TODOs with information for the printer namespace.
+
+ doc/spec/hal-spec-properties.xml | 16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+commit 3026136349d7c6947c5e92c96d1338b06695835b
+Author: Danny Kukawka
+Date: Wed Jan 28 13:26:35 2009 +0100
+
+ update spec for printer access policy
+
+ Updated spec for new printer access policy.
+
+ doc/spec/hal-spec-access-control.xml | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 2715a26024cb80f2ad424f5a9e12bf79d28b0018
+Author: Danny Kukawka
+Date: Wed Jan 28 13:25:22 2009 +0100
+
+ add ACL and device-access policy for printers
+
+ Added ACL and device-access policy for printers.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 7 +++++++
+ policy/org.freedesktop.hal.device-access.policy | 9 +++++++++
+ 2 files changed, 16 insertions(+), 0 deletions(-)
+
+commit 4bde0385a38f4bcd8bebf4af8d3e1f0bf38ca075
+Author: Danny Kukawka
+Date: Wed Jan 28 13:17:23 2009 +0100
+
+ use addset instead of append for ACL rules
+
+ Changed existing entries to use addset instead of append to prevent
+ double entries if a device may have more than one matching capability.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 68
+ +++++++++++++-------------
+ 1 files changed, 34 insertions(+), 34 deletions(-)
+
+commit ace34e318102988320181ffaeeda3eb890112408
+Author: Danny Kukawka
+Date: Wed Jan 28 13:05:49 2009 +0100
+
+ put usbraw matches for ACL together into one block
+
+ Put usbraw matches for ACL together into one block, fixed
+ whitespaces.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
commit 336d871860710af1cb3a55234d5051f01e842e02
Author: Andreas Schwab
Date: Sun Jan 25 18:46:08 2009 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-access-control.xml new/hal-0.5.12/doc/spec/hal-spec-access-control.xml
--- old/hal-0.5.12/doc/spec/hal-spec-access-control.xml 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/doc/spec/hal-spec-access-control.xml 2009-02-01 11:17:26.000000000 +0100
@@ -58,7 +58,8 @@
<para>
This is a list of the device file policies/rules delivered with
the HAL package to manage ACL's as defined via <literal>
- access_control.type</literal>.
+ access_control.type</literal> and the current default Policykit
+ policies for inactive and active users.
</para>
<informaltable>
<tgroup cols="2">
@@ -66,6 +67,8 @@
<row>
<entry>Type</entry>
<entry>Description</entry>
+ <entry>allow_inactive</entry>
+ <entry>allow_active</entry>
</row>
</thead>
<tbody>
@@ -74,114 +77,160 @@
<literal>audio-player</literal>
</entry>
<entry>Directly access audio players.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>camera</literal>
</entry>
<entry>Directly access digital cameras.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>cdrom</literal>
</entry>
<entry>Directly access optical drives.</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>dvb</literal>
</entry>
<entry>Directly access DVB devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>fingerprint-reader</literal>
</entry>
<entry>Directly access to fingerprint reader devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>floppy</literal>
</entry>
<entry>Directly access Floppy devices.</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
- <literal>ieee1394-iidc</literal>
+ <literal>ieee1394-avc</literal>
</entry>
- <entry>Directly access Firewire IIDC devices.</entry>
+ <entry>Directly access Firewire AVC devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
- <literal>ieee1394-avc</literal>
+ <literal>ieee1394-iidc</literal>
</entry>
- <entry>Directly access Firewire AVC devices.</entry>
+ <entry>Directly access Firewire IIDC devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>joystick</literal>
</entry>
<entry>Directly access Joystick devices.</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>modem</literal>
</entry>
<entry>Directly access serial modem devices.</entry>
+ <entry>auth_admin_keep_always</entry>
+ <entry>auth_admin_keep_always</entry>
</row>
<row>
<entry>
<literal>mouse</literal>
</entry>
<entry>Directly access Mouse (input) devices</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>obex</literal>
</entry>
<entry>Directly access OBEX devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>pda</literal>
</entry>
<entry>Directly access PDA devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>ppdev</literal>
</entry>
<entry>Directly access parallel port devices.</entry>
+ <entry>auth_admin_keep_always</entry>
+ <entry>auth_admin_keep_always</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>printer</literal>
+ </entry>
+ <entry>Directly access printer devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>removable-block</literal>
</entry>
<entry>Directly access removable block devices.</entry>
+ <entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>
<literal>scanner</literal>
</entry>
<entry>Directly access scanners.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>sound</literal>
</entry>
<entry>Directly access sound devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>video</literal>
</entry>
<entry>Directly access Video devices.</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>
<literal>video4linux</literal>
</entry>
<entry>Directly access video capture devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
</row>
</tbody>
</tgroup>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2009-02-02 18:15:21.000000000 +0100
@@ -6092,7 +6092,7 @@
</entry>
<entry></entry>
<entry>Yes</entry>
- <entry>TODO</entry>
+ <entry>Special device file to interact with the printer device.</entry>
</row>
<row>
<entry>
@@ -6100,7 +6100,7 @@
</entry>
<entry></entry>
<entry>Yes</entry>
- <entry>TODO</entry>
+ <entry>Name of the device vendor</entry>
</row>
<row>
<entry>
@@ -6108,7 +6108,7 @@
</entry>
<entry></entry>
<entry>Yes</entry>
- <entry>TODO</entry>
+ <entry>Name of the product.</entry>
</row>
<row>
<entry>
@@ -6116,15 +6116,19 @@
</entry>
<entry></entry>
<entry>Yes</entry>
- <entry>TODO</entry>
+ <entry>
+ A string uniquely identifying the instance of the device;
+ ie. it will be different for two devices of the same type.
+ Note that the serial number is broken on some USB devices.
+ </entry>
</row>
<row>
<entry>
<literal>printer.description</literal> (string)
</entry>
<entry></entry>
- <entry>Yes</entry>
- <entry>TODO</entry>
+ <entry>No</entry>
+ <entry>Description for the device.</entry>
</row>
<row>
<entry>
@@ -7023,6 +7027,30 @@
</row>
<row>
<entry>
+ <literal>system.kernel.version.major</literal> (int)
+ </entry>
+ <entry>example: 2</entry>
+ <entry>No</entry>
+ <entry>The major version number of the running kernel.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>system.kernel.version.minor</literal> (int)
+ </entry>
+ <entry>example: 6</entry>
+ <entry>No</entry>
+ <entry>The minor version number of the running kernel.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>system.kernel.version.micro</literal> (int)
+ </entry>
+ <entry>example: 28</entry>
+ <entry>No</entry>
+ <entry>The micro version number of the running kernel.</entry>
+ </row>
+ <row>
+ <entry>
<literal>system.kernel.machine</literal> (string)
</entry>
<entry>example: i686</entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2009-02-01 11:17:26.000000000 +0100
@@ -9,100 +9,112 @@
<!-- sound card (ALSA) -->
<match key="info.capabilities" contains="alsa">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">alsa.device_file</merge>
- <merge key="access_control.type" type="string">sound</merge>
+ <match key="alsa.device_file" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">alsa.device_file</merge>
+ <merge key="access_control.type" type="string">sound</merge>
+ </match>
</match>
<!-- sound card (OSS) -->
<match key="info.capabilities" contains="oss">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">oss.device_file</merge>
- <merge key="access_control.type" type="string">sound</merge>
+ <match key="oss.device_file" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">oss.device_file</merge>
+ <merge key="access_control.type" type="string">sound</merge>
+ </match>
</match>
<!-- video4linux devices -->
<match key="info.capabilities" contains="video4linux">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">video4linux.device</merge>
- <merge key="access_control.type" type="string">video4linux</merge>
+ <match key="video4linux.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">video4linux.device</merge>
+ <merge key="access_control.type" type="string">video4linux</merge>
+ </match>
</match>
<!-- Removable block devices -->
<match key="info.capabilities" contains="block">
- <match key="@block.storage_device:storage.removable" bool="true">
- <!-- do not set acls on unpartitioned volumes, parent gets them -->
- <match key="block.is_volume" bool="true">
- <match key="volume.is_partition" bool="true">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <match key="block.device" exists="true">
+ <match key="@block.storage_device:storage.removable" bool="true">
+ <!-- do not set acls on unpartitioned volumes, parent gets them -->
+ <match key="block.is_volume" bool="true">
+ <match key="volume.is_partition" bool="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">block.device</merge>
+ <merge key="access_control.type" type="string">removable-block</merge>
+ </match>
+ </match>
+ <match key="block.is_volume" bool="false">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.file" type="copy_property">block.device</merge>
<merge key="access_control.type" type="string">removable-block</merge>
</match>
</match>
- <match key="block.is_volume" bool="false">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">block.device</merge>
- <merge key="access_control.type" type="string">removable-block</merge>
- </match>
</match>
</match>
<!-- optical drives -->
<match key="info.capabilities" contains="storage.cdrom">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">block.device</merge>
- <merge key="access_control.type" type="string">cdrom</merge>
+ <match key="block.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">block.device</merge>
+ <merge key="access_control.type" type="string">cdrom</merge>
+ </match>
</match>
<!-- scsi generic device for optical drives -->
<match key="info.capabilities" contains="scsi_generic">
- <match key="@info.parent:scsi.type" string="cdrom">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">scsi_generic.device</merge>
- <merge key="access_control.type" type="string">cdrom</merge>
- </match>
- <match key="info.capabilities" contains="scanner">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">scsi_generic.device</merge>
- <merge key="access_control.type" type="string">scanner</merge>
- </match>
- <!-- usb floppy bnc#336327 -->
- <match key="@info.parent:@info.parent:@info.parent:usb.interface.class" int="8">
- <match key="@info.parent:@info.parent:@info.parent:usb.interface.subclass" int="4">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <match key="scsi_generic.device" exists="true">
+ <match key="@info.parent:scsi.type" string="cdrom">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.file" type="copy_property">scsi_generic.device</merge>
- <merge key="access_control.type" type="string">floppy</merge>
- </match>
+ <merge key="access_control.type" type="string">cdrom</merge>
+ </match>
+ <match key="info.capabilities" contains="scanner">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">scsi_generic.device</merge>
+ <merge key="access_control.type" type="string">scanner</merge>
+ </match>
+ <!-- usb floppy bnc#336327 -->
+ <match key="@info.parent:@info.parent:@info.parent:usb.interface.class" int="8">
+ <match key="@info.parent:@info.parent:@info.parent:usb.interface.subclass" int="4">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">scsi_generic.device</merge>
+ <merge key="access_control.type" type="string">floppy</merge>
+ </match>
+ </match>
</match>
</match>
<!-- DVB cards -->
<match key="info.capabilities" contains="dvb">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">dvb.device</merge>
- <merge key="access_control.type" type="string">dvb</merge>
+ <match key="dvb.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">dvb.device</merge>
+ <merge key="access_control.type" type="string">dvb</merge>
+ </match>
</match>
<!-- support for Linux USB stack where device node is on a child of the main USB device -->
<match key="info.capabilities" contains="usbraw">
- <match key="info.capabilities" sibling_contains="camera">
- <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">camera</merge>
- </match>
- </match>
- <match key="info.capabilities" contains="usbraw">
- <match key="info.capabilities" sibling_contains="scanner">
- <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">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 key="usbraw.device" exists="true">
+ <match key="info.capabilities" sibling_contains="camera">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+ <merge key="access_control.type" type="string">camera</merge>
+ </match>
+ <match key="info.capabilities" sibling_contains="scanner">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+ <merge key="access_control.type" type="string">scanner</merge>
+ </match>
+ <match key="info.capabilities" sibling_contains="biometic.fingerprint_reader">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+ <merge key="access_control.type" type="string">fingerprint-reader</merge>
+ </match>
</match>
</match>
@@ -110,27 +122,27 @@
<match key="info.subsystem" string="usb">
<match key="@info.parent:linux.device_file" exists="true">
<match key="info.capabilities" contains="camera">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.type" type="string">camera</merge>
<merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
</match>
<match key="info.capabilities" contains="scanner">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.type" type="string">scanner</merge>
<merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
</match>
<match key="info.capabilities" contains="portable_audio_player">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.type" type="string">audio-player</merge>
<merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
</match>
<match key="info.capabilities" contains="obex">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<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>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<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>
@@ -140,20 +152,24 @@
<!-- Firewire devices are mostly driven by userspace libraries -->
<match key="info.capabilities" contains="ieee1394_unit.iidc">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
- <merge key="access_control.type" type="string">ieee1394-iidc</merge>
+ <match key="@ieee1394_unit.originating_device:ieee1394.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
+ <merge key="access_control.type" type="string">ieee1394-iidc</merge>
+ </match>
</match>
<match key="info.capabilities" contains="ieee1394_unit.avc">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
- <merge key="access_control.type" type="string">ieee1394-avc</merge>
+ <match key="@ieee1394_unit.originating_device:ieee1394.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
+ <merge key="access_control.type" type="string">ieee1394-avc</merge>
+ </match>
</match>
<!-- serial devices are assumed to be modems by default (no access) -->
<match key="info.category" string="serial">
<match key="serial.device" exists="true">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.file" type="copy_property">serial.device</merge>
<merge key="access_control.type" type="string">modem</merge>
</match>
@@ -161,8 +177,8 @@
<!-- serial devices are assumed to be modems by default (no access) -->
<match key="info.category" string="ppdev">
- <match key="serial.device" exists="true">
- <append key="info.capabilities" type="strlist">access_control</append>
+ <match key="linux.device_file" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.file" type="copy_property">linux.device_file</merge>
<merge key="access_control.type" type="string">ppdev</merge>
</match>
@@ -171,7 +187,7 @@
<!-- after serial to be able to override restrictive default -->
<match key="info.capabilities" contains="pda">
<!-- PalmOS PDAs -->
- <append key="info.capabilities" type="strlist">access_control</append>
+ <addset key="info.capabilities" type="strlist">access_control</addset>
<merge key="access_control.type" type="string">pda</merge>
<match key="pda.platform" string="palm">
<merge key="access_control.file" type="copy_property">pda.palm.hotsync_interface</merge>
@@ -184,60 +200,75 @@
<!-- plain old floppy -->
<match key="storage.drive_type" string="floppy">
- <match key="storage.no_partitions_hint" bool="true">
- <match key="access_control.type" exists="false">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">block.device</merge>
- <merge key="access_control.type" type="string">floppy</merge>
+ <match key="block.device" exists="true">
+ <match key="storage.no_partitions_hint" bool="true">
+ <match key="access_control.type" exists="false">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">block.device</merge>
+ <merge key="access_control.type" type="string">floppy</merge>
+ </match>
</match>
</match>
</match>
<!-- linux input devices (needed e.g. for games) -->
<match key="linux.subsystem" string="input">
- <!-- joysticks -->
- <match key="info.capabilities" contains="input.joystick">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">input.device</merge>
- <merge key="access_control.type" type="string">joystick</merge>
- </match>
- <!-- mice -->
- <match key="info.capabilities" contains="input.mouse">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">input.device</merge>
- <merge key="access_control.type" type="string">mouse</merge>
+ <match key="input.device" exists="true">
+ <!-- joysticks -->
+ <match key="info.capabilities" contains="input.joystick">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">input.device</merge>
+ <merge key="access_control.type" type="string">joystick</merge>
+ </match>
+ <!-- mice -->
+ <match key="info.capabilities" contains="input.mouse">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">input.device</merge>
+ <merge key="access_control.type" type="string">mouse</merge>
+ </match>
</match>
</match>
<!-- graphics cards, e.g. for 3d accelleration -->
<match key="info.capabilities" contains="drm">
- <append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">linux.device_file</merge>
- <merge key="access_control.type" type="string">video</merge>
+ <match key="linux.device_file" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+ <merge key="access_control.type" type="string">video</merge>
+ </match>
+ </match>
+
+ <!-- printer devices -->
+ <match key="info.capabilities" contains="printer">
+ <match key="printer.device" exists="true">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">printer.device</merge>
+ <merge key="access_control.type" type="string">printer</merge>
+ </match>
</match>
<!-- enforcement of policy goes here -->
<!-- add / remove ACL's when devices are added and removed -->
<match key="info.capabilities" contains="access_control">
- <append key="info.callouts.add" type="strlist">hal-acl-tool --add-device</append>
- <append key="info.callouts.remove" type="strlist">hal-acl-tool --remove-device</append>
+ <addset key="info.callouts.add" type="strlist">hal-acl-tool --add-device</addset>
+ <addset key="info.callouts.remove" type="strlist">hal-acl-tool --remove-device</addset>
</match>
<match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
<!-- remove all previously added ACL's on start-up -->
- <append key="info.callouts.add" type="strlist">hal-acl-tool --remove-all</append>
+ <addset key="info.callouts.add" type="strlist">hal-acl-tool --remove-all</addset>
<!-- reconfigure all ACL's sessions are added and removed -->
- <append key="info.callouts.session_add" type="strlist">hal-acl-tool --reconfigure</append>
- <append key="info.callouts.session_remove" type="strlist">hal-acl-tool --reconfigure</append>
+ <addset key="info.callouts.session_add" type="strlist">hal-acl-tool --reconfigure</addset>
+ <addset key="info.callouts.session_remove" type="strlist">hal-acl-tool --reconfigure</addset>
<!-- reconfigure all ACL's when a session becomes active -->
- <append key="info.callouts.session_active" type="strlist">hal-acl-tool --reconfigure</append>
+ <addset key="info.callouts.session_active" type="strlist">hal-acl-tool --reconfigure</addset>
<!-- reconfigure all ACL's when a session becomes inactive -->
- <append key="info.callouts.session_inactive" type="strlist">hal-acl-tool --reconfigure</append>
+ <addset key="info.callouts.session_inactive" type="strlist">hal-acl-tool --reconfigure</addset>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/hald.c new/hal-0.5.12/hald/hald.c
--- old/hal-0.5.12/hald/hald.c 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/hald/hald.c 2009-01-29 11:29:40.000000000 +0100
@@ -299,6 +299,9 @@
" --daemon=yes|no Become a daemon\n"
" --verbose=yes|no Print out debug (overrides HALD_VERBOSE)\n"
" --retain-privileges Retain privileges (for debugging)\n"
+ " --child-timeout=time Set this timout for the child prober. A larger\n"
+ " number than the default 250s is required for systems\n"
+ " with many resources to be probed at boot time\n"
" --use-syslog Print out debug messages to syslog instead of\n"
" stderr. Use this option to get debug messages\n"
" if hald runs as a daemon.\n"
@@ -392,7 +395,7 @@
}
static int
-parent_wait_for_child (int child_fd, pid_t child_pid)
+parent_wait_for_child (guint timeout, int child_fd, pid_t child_pid)
{
fd_set rfds;
fd_set efds;
@@ -419,8 +422,8 @@
FD_SET(child_fd, &rfds);
FD_ZERO(&efds);
FD_SET(child_fd, &efds);
- /* Wait up to 250 seconds for device probing */
- tv.tv_sec = 250;
+ /* Wait up to a set time for device probing */
+ tv.tv_sec = timeout;
tv.tv_usec = 0;
retval = select (child_fd + 1, &rfds, NULL, &efds, &tv);
@@ -537,6 +540,7 @@
guint sigterm_iochn_listener_source_id;
char *path;
char newpath[512];
+ guint opt_child_timeout;
#ifdef HAVE_POLKIT
PolKitError *p_error;
#endif
@@ -584,7 +588,9 @@
g_strlcat (newpath, PACKAGE_SCRIPT_DIR, sizeof (newpath));
setenv ("PATH", newpath, TRUE);
-
+
+ /* set the default child timeout to 250 seconds */
+ opt_child_timeout = 250;
while (1) {
int c;
@@ -595,6 +601,7 @@
{"daemon", 1, NULL, 0},
{"verbose", 1, NULL, 0},
{"retain-privileges", 0, NULL, 0},
+ {"child-timeout", 1, NULL, 0},
{"use-syslog", 0, NULL, 0},
{"help", 0, NULL, 0},
{"version", 0, NULL, 0},
@@ -618,6 +625,8 @@
return 0;
} else if (strcmp (opt, "exit-after-probing") == 0) {
hald_debug_exit_after_probing = TRUE;
+ } else if (strcmp (opt, "child-timeout") == 0) {
+ opt_child_timeout = atoi (optarg);
} else if (strcmp (opt, "daemon") == 0) {
if (strcmp ("yes", optarg) == 0) {
opt_become_daemon = TRUE;
@@ -669,6 +678,7 @@
loop = g_main_loop_new (NULL, FALSE);
HAL_INFO ((PACKAGE_STRING));
+ HAL_INFO (("using child timeout %is", opt_child_timeout));
if (opt_become_daemon) {
int child_pid;
@@ -715,7 +725,7 @@
default:
/* parent, block until child writes */
- exit (parent_wait_for_child (startup_daemonize_pipe[0], child_pid));
+ exit (parent_wait_for_child (opt_child_timeout, startup_daemonize_pipe[0], child_pid));
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/osspec.c new/hal-0.5.12/hald/linux/osspec.c
--- old/hal-0.5.12/hald/linux/osspec.c 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/hald/linux/osspec.c 2009-02-02 18:16:27.000000000 +0100
@@ -840,6 +840,17 @@
if (uname (&un) >= 0) {
hal_device_property_set_string (root, "system.kernel.name", un.sysname);
hal_device_property_set_string (root, "system.kernel.version", un.release);
+ if (un.release != NULL && un.release[0] != '\0') {
+ int major, minor, micro ;
+
+ /* check if we can parse the major.minor.micro info and ignore the rest */
+ if ( sscanf( un.release, "%d.%d.%d", &major, &minor, µ ) >= 3 ) {
+ hal_device_property_set_int (root, "system.kernel.version.major", major);
+ hal_device_property_set_int (root, "system.kernel.version.minor", minor);
+ hal_device_property_set_int (root, "system.kernel.version.micro", micro);
+ }
+ }
+
hal_device_property_set_string (root, "system.kernel.machine", un.machine);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy new/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy
--- old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy 2009-02-01 11:17:26.000000000 +0100
@@ -19,15 +19,6 @@
<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>
- no
- yes
- </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>
@@ -55,18 +46,18 @@
</defaults>
</action>
- <action id="org.freedesktop.hal.device-access.removable-block">
- <description>Directly access removable block devices</description>
- <message>System policy prevents access to removable block devices</message>
+ <action id="org.freedesktop.hal.device-access.dvb">
+ <description>Directly access DVB devices</description>
+ <message>System policy prevents access to DVB devices</message>
<defaults>
no
- no
+ yes
</defaults>
</action>
- <action id="org.freedesktop.hal.device-access.dvb">
- <description>Directly access DVB devices</description>
- <message>System policy prevents access to DVB devices</message>
+ <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>
no
yes
@@ -154,6 +145,24 @@
</defaults>
</action>
+ <action id="org.freedesktop.hal.device-access.printer">
+ <description>Directly access printers</description>
+ <message>System policy prevents access to printers</message>
+ <defaults>
+ no
+ yes
+ </defaults>
+ </action>
+
+ <action id="org.freedesktop.hal.device-access.removable-block">
+ <description>Directly access removable block devices</description>
+ <message>System policy prevents access to removable block devices</message>
+ <defaults>
+ no
+ no
+ </defaults>
+ </action>
+
<action id="org.freedesktop.hal.device-access.scanner">
<description>Directly access scanners</description>
<message>System policy prevents access to scanners</message>
@@ -172,20 +181,20 @@
</defaults>
</action>
- <action id="org.freedesktop.hal.device-access.video4linux">
- <description>Directly access video capture devices</description>
- <message>System policy prevents access to video capture devices</message>
+ <action id="org.freedesktop.hal.device-access.video">
+ <description>Directly access Video devices</description>
+ <message>System policy prevents access to Video devices</message>
<defaults>
- no
+ yes
yes
</defaults>
</action>
- <action id="org.freedesktop.hal.device-access.video">
- <description>Directly access Video devices</description>
- <message>System policy prevents access to Video devices</message>
+ <action id="org.freedesktop.hal.device-access.video4linux">
+ <description>Directly access video capture devices</description>
+ <message>System policy prevents access to video capture devices</message>
<defaults>
- yes
+ no
yes
</defaults>
</action>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/tools/hal-device.c new/hal-0.5.12/tools/hal-device.c
--- old/hal-0.5.12/tools/hal-device.c 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/tools/hal-device.c 2009-01-29 11:29:40.000000000 +0100
@@ -189,6 +189,7 @@
{
int i;
int num_devices;
+ int retval;
char **device_names;
DBusError error;
char *udi = NULL;
@@ -222,6 +223,9 @@
num_devices = 1;
}
+ /* if _any_ device matches, we return success */
+ retval = 1;
+
for(i = 0; i < num_devices; i++) {
LibHalPropertySet *props;
LibHalPropertySetIterator it;
@@ -233,6 +237,9 @@
continue;
}
+ /* we got some properties */
+ retval = 0;
+
if (!udi)
printf("%d: ", i);
printf("udi = '%s'\n", device_names[i]);
@@ -298,7 +305,7 @@
libhal_free_string_array(device_names);
dbus_error_free(&error);
- return 0;
+ return retval;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/tools/hal_get_property.c new/hal-0.5.12/tools/hal_get_property.c
--- old/hal-0.5.12/tools/hal_get_property.c 2009-01-25 19:06:37.000000000 +0100
+++ new/hal-0.5.12/tools/hal_get_property.c 2009-01-29 11:31:21.000000000 +0100
@@ -84,6 +84,7 @@
dbus_bool_t is_hex = FALSE;
dbus_bool_t is_verbose = FALSE;
dbus_bool_t is_version = FALSE;
+ dbus_bool_t udi_exists;
char *str;
DBusError error;
@@ -168,6 +169,19 @@
return 1;
}
+ /* check UDI exists */
+ udi_exists = libhal_device_exists (hal_ctx, udi, &error);
+ if (!udi_exists) {
+ fprintf (stderr, "error: UDI %s does not exist\n", udi);
+ return 1;
+ }
+ if (dbus_error_is_set(&error)) {
+ fprintf (stderr, "error: libhal_device_exists: %s: %s\n", error.name, error.message);
+ dbus_error_free (&error);
+ return 1;
+ }
+
+ /* get type */
type = libhal_device_get_property_type (hal_ctx, udi, key, &error);
if (type == LIBHAL_PROPERTY_TYPE_INVALID) {
fprintf (stderr, "error: libhal_device_get_property_type: %s: %s\n", error.name, error.message);
++++++ hal-info-20090121.tar.bz2 -> hal-info-20090206.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/ChangeLog new/hal-info-20090206/ChangeLog
--- old/hal-info-20090121/ChangeLog 2009-01-21 19:53:12.000000000 +0100
+++ new/hal-info-20090206/ChangeLog 2009-02-06 13:04:23.000000000 +0100
@@ -1,3 +1,555 @@
+commit d3669a5d1c42e993f041914f36cad2cea921ebf5
+Author: Danny Kukawka
+Date: Fri Feb 6 12:57:31 2009 +0100
+
+ remove 30-keymap-module-asus-laptop.fdi also from Makefile
+
+ Removed 30-keymap-module-asus-laptop.fdi also from Makefile.
+
+ fdi/information/10freedesktop/Makefile.am | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit c53cc25e723431c5ec5244ed9edf037dac189608
+Author: Danny Kukawka
+Date: Fri Feb 6 12:49:07 2009 +0100
+
+ add suspend quirk for a HP Compaq 4410s
+
+ Added suspend quirk for a HP Compaq 4410s.
+
+ system.board.product = '3074' (string)
+ system.board.serial = '' (string)
+ system.board.vendor = 'Hewlett-Packard' (string)
+ system.board.version = 'KBC Version 24.01' (string)
+ system.chassis.manufacturer = 'Hewlett-Packard' (string)
+ system.chassis.type = 'Notebook' (string)
+ system.firmware.release_date = '12/24/2008' (string)
+ system.firmware.vendor = 'Hewlett-Packard' (string)
+ system.firmware.version = '68PZI Ver. B.xx' (string)
+ system.formfactor = 'laptop' (string)
+ system.hardware.primary_video.product = 38226 (0x9552) (int)
+ system.hardware.primary_video.vendor = 4098 (0x1002) (int)
+ system.hardware.product = 'HP Compaq 4410s' (string)
+ system.hardware.vendor = 'Hewlett-Packard' (string)
+ system.hardware.version = 'B.xx' (string)
+ system.kernel.machine = 'x86_64' (string)
+ system.kernel.name = 'Linux' (string)
+ system.kernel.version = '2.6.27.13-1-default' (string)
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 348fe19a6ab2e4683a5e8e50f7605cbb54477162
+Author: Danny Kukawka
+Date: Fri Feb 6 12:08:46 2009 +0100
+
+ removed 30-keymap-module-asus-laptop.fdi
+
+ Removed 30-keymap-module-asus-laptop.fdi as proposed by
+ Frederic Crozat , since it needs a
+ special kernel patch which never got upsteam merged.
+
+ For more info check:
+ http://lists.freedesktop.org/archives/hal/2009-February/012934.html
+
+ .../10freedesktop/30-keymap-module-asus-laptop.fdi | 29
+ --------------------
+ 1 files changed, 0 insertions(+), 29 deletions(-)
+
+commit 89304032a4d0ef79580d6b13f59b15e8238a1db7
+Author: Danny Kukawka
+Date: Fri Feb 6 12:03:44 2009 +0100
+
+ add iriver T7 to USB music players
+
+ Applied a fixed/slightly adopted version of a patch from
+ Korey Lu (fd.o#19944) to add a
+ iriver T7 as a USB music player.
+
+ .../10freedesktop/10-usb-music-players.fdi | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit b3b41c6ba866ea2fcebaba601adb09016f766a59
+Author: Jonathan Matthew
+Date: Fri Feb 6 11:57:23 2009 +0100
+
+ fix type of portable_audio_player.playlist_path to string
+
+ Fixed type of portable_audio_player.playlist_path to string as
+ defined in the spec (fd.o#19961).
+
+ .../10freedesktop/10-usb-music-players.fdi | 26
+ ++++++++++----------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit d66756ca958ba672c25bcfd41103d890e8580df0
+Author: Timo Hoenig
+Date: Fri Feb 6 11:56:05 2009 +0100
+
+ add keymapping for a HP Compaq 4411s
+
+ Added keymapping for a HP Compaq 4411s.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8e81a2d43db20adba9e4dda977a59ca45fa6bc5e
+Author: Danny Kukawka
+Date: Tue Feb 3 17:14:39 2009 +0100
+
+ fix usage of sting match for Asus EEE PC 900
+
+ Fixed usage of sting match for Asus EEE PC 900, use string_outof
+ instead.
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cdb177db4b88797644f8444f1aec5f0d7154b0c0
+Author: Frederic Crozat
+Date: Tue Feb 3 17:13:02 2009 +0100
+
+ add suspend quirk for a Asus EEE PC 900
+
+ Added suspend quirk for a Asus EEE PC 900.
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0efd7acd2aed94a398b0e7661001ab8393083241
+Author: Danny Kukawka
+Date: Tue Feb 3 17:04:29 2009 +0100
+
+ add missing keymappings for HP Compaq 4410s and 4415s
+
+ Added missing keymappings for HP Compaq 4410s and 4415s
+ (bnc#471978).
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ca3981c5f67d35317a364ff9e3d5e87dbf50ab43
+Author: Dan Weber
+Date: Mon Feb 2 16:27:00 2009 +0100
+
+ fix suspend quirks on IBM T23
+
+ Fix suspend quirks on IBM T23, as reported on the upstream ML.
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 66faee460f12302200586703e5e3697a30f118fe
+Author: Nikolay Borisov
+Date: Mon Feb 2 16:22:49 2009 +0100
+
+ add Acer Arcade launch key mapping for Aspire 5920G
+
+ Add key mapping for the "Arcade launch" button on the Acer Aspire
+ 5920, as reported on the mailing list.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit b03f187c25ad2d836dadf9a500d09c963387c195
+Author: Richard Hughes
+Date: Mon Feb 2 14:38:22 2009 +0000
+
+ Released hal-info 20090202
+
+ VERSION | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4b88933dae349e29eeb30c833938afdef4474a96
+Author: Danny Kukawka
+Date: Mon Feb 2 14:06:35 2009 +0100
+
+ add ADU-610WK (Anydata HSDPA USB modem)
+
+ Added ADU-610WK (Anydata HSDPA USB modem). Patch send by
+ cezanne@naver.com via HAL ML:
+ http://lists.freedesktop.org/archives/hal/2009-January/012832.html
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0cf764216bea58b171eab02ece878806e49cd050
+Author: Chris Adams
+Date: Mon Feb 2 14:01:49 2009 +0100
+
+ add suspend quirk for a Acer Aspire 2010 (2012 wlmi)
+
+ After exhaustively testing every combination of quirks with my Aspire
+ 2012 wlmi (it reports itself as an Acer Aspire 2010) I finally
+ discovered it needs to have quirks disabled to suspend and resume
+ correctly.
+
+ This has been tested for a few weeks using the stock kernels in Ubuntu
+ Intrepid and Jaunty with the open source xf86-video-ati
+
+ .../10freedesktop/20-video-quirk-pm-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a4d51c050a29f9fecdd5a91aab48808ff0162ee0
+Author: Steve Meadows
+Date: Mon Feb 2 13:57:44 2009 +0100
+
+ add suspend quirk for a Dell Inspiron 2200
+
+ Added suspend quirk for a Dell Inspiron 2200.
+
+ .../10freedesktop/20-video-quirk-pm-dell.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d0957b466c277236295bc431c315a00501e118d6
+Author: Danny Kukawka
+Date: Mon Feb 2 13:40:25 2009 +0100
+
+ add '/' to audio_folders of Creative zen stone plus
+
+ Added '/' to audio_folders of Creative zen stone plus, as proposed
+ in https://bugs.freedesktop.org/show_bug.cgi?id=19444 .
+
+ .../10freedesktop/10-usb-music-players.fdi | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f30923968c5282db51ecfded5d11a56fea7e10e2
+Author: Danny Kukawka
+Date: Mon Feb 2 13:04:43 2009 +0100
+
+ fixed usage of int_outof
+
+ fixed single usage of 'int_outof', replaced with 'int'
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bc6c15868c5543a9f1756681e0d70f4a7b35a20d
+Author: Danny Kukawka
+Date: Mon Feb 2 12:59:36 2009 +0100
+
+ cleaned up Cowon iAUDIO music players
+
+ Cleaned up Cowon iAUDIO music players.
+
+ - Removed not needed audio/mpeg from output_formats, the entry get
+ added anyway for all mp3 players.
+ - put common players together, handle different path (music, playlist)
+ information in submatches.
+
+ .../10freedesktop/10-usb-music-players.fdi | 119
+ +++++---------------
+ 1 files changed, 28 insertions(+), 91 deletions(-)
+
+commit da022f3321f0859dd6410cc097ec8eb8960dcd9b
+Author: Milan Bouchet-Valat
+Date: Mon Feb 2 12:56:49 2009 +0100
+
+ fix Cowon iAUDIO music players
+
+ Fixed Cowon iAUDIO music players.
+
+ From https://bugs.freedesktop.org/show_bug.cgi?id=19069:
+
+ > I've reviewed in 10-usb-music-players.fdi all information about
+ Cowon iAUDIO
+ > players, and I've found several mistakes. I'm myself the owner of
+ a M3, and I
+ > had noticed its folders were not set right
+
+ > I've split the common entry for M3, X5, M5, 5, G2 into several
+ sections,
+ > because they don't use the same file structure nor support the
+ same formats.
+ > I've been parsing the manuals from Cowon to find out how they work,
+ and I think
+ > I've managed to get all the informations needed.
+
+ > Though, I can only be completely sure of the informations about
+ the M3, I could
+ > not check for other (even if it should be good). In particular:
+ > - I'm not sure the product_id for iAUDIO 5 are 0x602 and
+ 0x604. Those numbers
+ > are strange to me as they don't seem to follow any logical
+ rule. Anyway, I'm
+ > sure of these IDs for the other players, so these must be the
+ right ones. If
+ > somebody could check, it could be nice.
+
+ > - I'm not sure that the iAUDIO G* series uses or doesn't use a
+ MUSIC/ folder
+ > separate from the root. Older iAUDIOs do, others simply use the
+ root folder for
+ > that. I've guessed from the manual, but I could not correct every
+ error -
+ > anyway it should be better than before.
+
+ .../10freedesktop/10-usb-music-players.fdi | 60
+ ++++++++++++++++---
+ 1 files changed, 50 insertions(+), 10 deletions(-)
+
+commit 2f18421d348b7a8edf03dd8c4a76c099acc52c3a
+Author: Alexei Korobkin
+Date: Mon Feb 2 11:56:17 2009 +0100
+
+ add a Samsung YP-U4 to USB music players
+
+ Added a Samsung YP-U4 to USB music players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c0decfdac6394adf1b567fb82ea2d149608c53d5
+Author: Danny Kukawka
+Date: Sun Feb 1 22:49:44 2009 +0100
+
+ removed not needed audio/mpeg from output_formats
+
+ Removed not needed audio/mpeg from output_formats, the entry get
+ added anyway for all mp3 players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit d19b5591cb49342e0fda1e7790231c2d0c48fa5c
+Author: Alex Kanavin
+Date: Sun Feb 1 22:14:18 2009 +0100
+
+ consolidate Nokia S60 phones music players
+
+ consolidate all Nokia S60 based music players into a single hal rule.
+
+ .../10freedesktop/10-usb-music-players.fdi | 23
+ +++++++++++--------
+ 1 files changed, 13 insertions(+), 10 deletions(-)
+
+commit d3509c6af4c939d0b52dc4314b364bd4c4c33228
+Author: Martin Pitt
+Date: Sun Feb 1 21:57:13 2009 +0100
+
+ Dell Latitude D810 does not need video quirks
+
+ According to https://launchpad.net/bugs/315271, the Dell Latitude D810
+ with an ATI card disables the internal monitor when resuming with an
+ external monitor, if vbe_post and vbemode_restore are used. Disable
+ quirk again, as in previous hal-info releases (which didn't provide
+ default quirks yet).
+
+ .../10freedesktop/20-video-quirk-pm-dell.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6cb7ce8445831e73857657445c82251dc4e6630c
+Author: Danny Kukawka
+Date: Sun Feb 1 11:48:21 2009 +0100
+
+ use addset instead of append to add modem to info.capabilities
+
+ Use addset instead of append to add modem to info.capabilities.
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c51cbee67629fbe0dd2ad2bc5c0e64a4b53afe76
+Author: Danny Kukawka
+Date: Sun Feb 1 11:43:44 2009 +0100
+
+ merge match for Nokia E51 with other Nokia matches
+
+ Merged match for Nokia E51 with other Nokia matches.
+
+ fdi/information/10freedesktop/10-modem.fdi | 15 ++-------------
+ 1 files changed, 2 insertions(+), 13 deletions(-)
+
+commit 42f9acbed2a934402b14ce4cf4b2ebb55f670559
+Author: Danny Kukawka
+Date: Sun Feb 1 11:39:06 2009 +0100
+
+ removed not needed audio/mpeg from output_formats
+
+ Removed not needed audio/mpeg from output_formats, the entry get
+ added anyway for all mp3 players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit cf98c5f6effd12f1d51f4cade33ff86538cd40bc
+Author: Charles Neubauer
+Date: Fri Jan 30 18:38:44 2009 +0100
+
+ add Motorola Z6 mobile modem
+
+ Add Motorola Z6 mobile modem, as reported by Charles Neubauer in
+ https://launchpad.net/bugs/321485
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 51ee7e45645e040ae883e763545492c7b6fb0536
+Author: Danny Kukawka
+Date: Thu Jan 29 15:09:15 2009 +0100
+
+ put some of the existing USB cardreader entries together
+
+ Put three of the existing USB cardreader entries together to
+ one match.
+
+ .../10freedesktop/10-usb-card-readers.fdi | 58
+ ++++++--------------
+ 1 files changed, 16 insertions(+), 42 deletions(-)
+
+commit 1257dd3d4b297799935072f584214a2fc2ec3825
+Author: Alexey Fisher
+Date: Thu Jan 29 14:59:32 2009 +0100
+
+ add another Hama USB cardreader
+
+ Added another Hama USB cardreader:
+ storage.model = 'USB SM Reader' (string)
+ storage.model = 'USB MS Reader' (string)
+ storage.model = 'USB SD Reader' (string)
+ storage.model = 'USB CF Reader' (string)
+
+ Put the device together with another already existing match.
+
+ .../10freedesktop/10-usb-card-readers.fdi | 16
+ +---------------
+ 1 files changed, 1 insertions(+), 15 deletions(-)
+
+commit a43bf160188a9038784523a72ec9a44cd62007bb
+Author: Danny Kukawka
+Date: Wed Jan 28 14:33:15 2009 +0100
+
+ cleanup 10-usb-pda.fdi to set info.capabilities only at one place
+
+ Cleaned up 10-usb-pda.fdi to set info.capabilities only at one
+ place for all devices with the pda.platform key.
+
+ fdi/information/10freedesktop/10-usb-pda.fdi | 22
+ ++++++----------------
+ 1 files changed, 6 insertions(+), 16 deletions(-)
+
+commit e144c0831ba11233e0b64bca645e8f7a2513465c
+Author: Danny Kukawka
+Date: Wed Jan 28 14:29:16 2009 +0100
+
+ replace append with addset for some info.capabilities entries
+
+ Replaced append with addset FDI-directive for some
+ info.capabilities entries to prevent getting a capability
+ added twice or more times.
+
+ fdi/information/10freedesktop/10-camera-ptp.fdi | 2 +-
+ .../10-dell-rfkill-switch-bluetooth.fdi | 2 +-
+ .../10freedesktop/10-dell-rfkill-switch-wlan.fdi | 2 +-
+ .../10freedesktop/10-dell-rfkill-switch-wwan.fdi | 2 +-
+ .../10freedesktop/10-ipw-rfkill-switch.fdi | 2 +-
+ .../10freedesktop/10-iwl-rfkill-switch.fdi | 2 +-
+ fdi/information/10freedesktop/10-scanner.fdi | 2 +-
+ .../10freedesktop/10-sony-bluetooth-switch.fdi | 2 +-
+ .../10-thinkpad-rfkill-switch-bluetooth.fdi | 2 +-
+ .../10freedesktop/10-usb-music-players.fdi | 4 +-
+ fdi/information/10freedesktop/10-usb-pda.fdi | 32
+ ++++++++++----------
+ 11 files changed, 27 insertions(+), 27 deletions(-)
+
+commit c472751100f8a69bfc02d2599b73ce607e0ea140
+Author: Miguel Rodríguez
+Date: Wed Jan 28 11:01:10 2009 +0100
+
+ add Motorola E770V modem
+
+ Add Motorola E770V modem, as reported by Miguel Rodríguez in
+ https://launchpad.net/bugs/321485 .
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9f39fc54abb664ea85541484fba142c6157fe73a
+Author: Mario Limonciello
+Date: Wed Jan 28 10:45:57 2009 +0100
+
+ add keymap for Fujitsu AMILO Pa 2548
+
+ Add keymap for Fujitsu AMILO Pa 2548, as reported by Mario
+ Limonciello. (This was taken from Debian's hotkey-setup package.)
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 026974548992e666c2fe20761172af09ddf94b52
+Author: Mario Limonciello
+Date: Wed Jan 28 10:44:44 2009 +0100
+
+ add keymaps for HP Tablet laptops
+
+ Add keymap for HP Tablet laptops, as reported by Mario Limonciello.
+ (This was taken from Debian's hotkey-setup package.)
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 6900fa403af47552bc6038ba31d43a48e404e8ef
+Author: Mario Limonciello
+Date: Wed Jan 28 10:41:40 2009 +0100
+
+ add keymap for ASUS notebooks
+
+ Add keymap for ASUS notebooks, as reported by Mario Limonciello. (This
+ was taken from Debian's hotkey-setup package.)
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 1e2ed3955ee7c7732314c4a8a6d37d3149f46aa5
+Author: Mario Limonciello
+Date: Wed Jan 28 10:39:45 2009 +0100
+
+ add keymap for Samsung X05
+
+ Add keymap for Samsung X05, as reported by Mario Limonciello. (This
+ was taken from Debian's hotkey-setup package, which will be obsoleted
+ in favor of using hal-info only.)
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 11781ba09f5553642765058e8ca531e9771292ae
+Author: Kenneth Mokkelbost
+Date: Wed Jan 28 10:34:11 2009 +0100
+
+ add Option Globetrotter HSUPA modem modem alternate ID
+
+ Add alternate ID for Option Globetrotter HSUPA modem modem, as found
+ in the Acer Aspire One. Reported by Kenneth Mokkelbost in
+ https://launchpad.net/bugs/304818 .
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5c9877d9b7a80cf93a44bf7f80685c9cf60a5a7b
+Author: Martin Pitt
+Date: Wed Jan 28 10:24:06 2009 +0100
+
+ add Sony W890i Walkman music player
+
+ Add Sony W890i Walkman music player, as reported in
+ https://launchpad.net/bugs/314618
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 34a88d4c0838af8e1b27c4afef887d6365bfd6bd
+Author: Samer Iglawe
+Date: Mon Jan 26 08:07:00 2009 +0100
+
+ add another product ID for ZTE AC8700 modem
+
+ Add another product ID for ZTE AC8700 modem, as reported by Samer
+ Iglawe in https://launchpad.net/bugs/321213
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
commit 3da37e0ebef1bcd4fd57e6745ef4c85d26f335f7
Author: Jerone Young
Date: Wed Jan 21 18:58:11 2009 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/configure new/hal-info-20090206/configure
--- old/hal-info-20090121/configure 2009-01-21 19:51:28.000000000 +0100
+++ new/hal-info-20090206/configure 2009-02-06 13:03:20.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20090121.
+# Generated by GNU Autoconf 2.61 for hal-info 20090206.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20090121'
-PACKAGE_STRING='hal-info 20090121'
+PACKAGE_VERSION='20090206'
+PACKAGE_STRING='hal-info 20090206'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -1193,7 +1193,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 20090121 to adapt to many kinds of systems.
+\`configure' configures hal-info 20090206 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1259,7 +1259,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20090121:";;
+ short | recursive ) echo "Configuration of hal-info 20090206:";;
esac
cat <<\_ACEOF
@@ -1355,7 +1355,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20090121
+hal-info configure 20090206
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1369,7 +1369,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 20090121, which was
+It was created by hal-info $as_me 20090206, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2059,7 +2059,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20090121
+ VERSION=20090206
cat >>confdefs.h <<_ACEOF
@@ -4126,7 +4126,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 20090121, which was
+This file was extended by hal-info $as_me 20090206, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4179,7 +4179,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20090121
+hal-info config.status 20090206
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-20090121/fdi/information/10freedesktop/10-camera-ptp.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-camera-ptp.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-camera-ptp.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-camera-ptp.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -7,7 +7,7 @@
<match key="usb.interface.subclass" int="0x01">
<match key="usb.interface.protocol" int="0x01">
<merge key="info.category" type="string">camera</merge>
- <append key="info.capabilities" type="strlist">camera</append>
+ <addset key="info.capabilities" type="strlist">camera</addset>
<merge key="camera.access_method" type="string">ptp</merge>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">Dell Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Dell WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wwan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Dell WWAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wwan</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -15,7 +15,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/ipw_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -15,7 +15,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/iwl_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-modem.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-modem.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -40,8 +40,8 @@
<!-- Nokia -->
<match key="@info.parent:usb.vendor_id" int="0x421">
- <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82/N82 (alternate chip)/E66/E61i/E60/N93/N71/N77/N90/N91/N80/E62/N76/N73/N92/N72/E50/N75/N93i/E65/N78 -->
- <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0;0x01;0x419;0x420;0x425;0x00e;0x432;0x42f;0x445;0x475;0x481;0x486;0x48e;0x4c4;0x4c9;0x4df;0x04e6;0x508;0x078">
+ <!-- E51/6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82/N82 (alternate chip)/E66/E61i/E60/N93/N71/N77/N90/N91/N80/E62/N76/N73/N92/N72/E50/N75/N93i/E65/N78 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x42;0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0;0x01;0x419;0x420;0x425;0x00e;0x432;0x42f;0x445;0x475;0x481;0x486;0x48e;0x4c4;0x4c9;0x4df;0x04e6;0x508;0x078">
<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">GSM-07.07</append>
@@ -49,17 +49,6 @@
</match>
</match>
</match>
-
- <!-- E51 as a GPRS/EDGE modem (CDC ACM) -->
- <match key="@info.parent:usb.product_id" int="0x42">
- <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">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
- </match>
-
</match>
<!-- Samsung SGH-A707 (AT&T Sync) -->
@@ -75,7 +64,7 @@
<!-- BSNL -->
<match key="@info.parent:usb.vendor_id" int="0x5c6">
<!-- ZTE CDMA/EVDO AC8700 usb modem -->
- <match key="@info.parent:usb.product_id" int="0x3197">
+ <match key="@info.parent:usb.product_id" int_outof="0x3197;0x6000">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
@@ -105,7 +94,7 @@
</match>
</match>
- <match key="@info.parent:usb.product_id" int_outof="0x7011">
+ <match key="@info.parent:usb.product_id" int_outof="0x7011;0x7211">
<match key="@serial.originating_device:info.linux.driver" string="hso">
<match key="@info.parent:usb.interface.number" int="0">
<match key="serial.port" int="0">
@@ -274,8 +263,8 @@
<!-- Anydata -->
<match key="@info.parent:usb.vendor_id" int="0x16d5">
- <!-- Adu E100a,500a -->
- <match key="@info.parent:usb.product_id" int_outof="0x6501;0x6502">
+ <!-- ADU-610WK, Adu E100a,500a -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6202;0x6501;0x6502">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
@@ -356,8 +345,8 @@
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
</match>
- <!-- Motorola V3xx/C650 -->
- <match key="@info.parent:usb.product_id" int_outof="0x6402;0x4902">
+ <!-- Motorola V3xx/C650/E770V/Z6 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6402;0x4902;0x3002;0x6422">
<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">GSM-07.07</append>
@@ -476,7 +465,7 @@
<!-- set common properties for all above matched modem devices -->
<match key="modem.command_sets" exists="true">
- <append key="info.capabilities" type="strlist">modem</append>
+ <addset key="info.capabilities" type="strlist">modem</addset>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-scanner.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-scanner.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-scanner.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-scanner.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -6,7 +6,7 @@
<device>
<match key="info.category" string="scsi_generic">
<match key="@info.parent:scsi.type" string="scanner">
- <append key="info.capabilities" type="strlist">scanner</append>
+ <addset key="info.capabilities" type="strlist">scanner</addset>
</match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -17,7 +17,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">Sony Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -12,7 +12,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">ThinkPad Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-usb-card-readers.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-usb-card-readers.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-usb-card-readers.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-usb-card-readers.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -19,48 +19,22 @@
<!-- Generic catch all -->
<match key="storage.bus" string="usb">
- <match key="storage.model" contains="HS-CF">
- <merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
- <match key="storage.model" contains="HS-MS">
- <merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
- <match key="storage.model" contains="HS-SM">
- <merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
- <match key="storage.model" contains="HS-xD">
- <merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
- <match key="storage.model" contains="HS-SD">
- <merge key="storage.drive_type" type="string">sd_mmc</merge>
- </match>
-
- <!-- Another common theme -->
- <match key="storage.model" contains="USB CF Reader">
- <merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
- <match key="storage.model" contains="USB MS Reader">
- <merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
- <match key="storage.model" contains="USB SM Reader">
- <merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
- <match key="storage.model" contains="USB SD Reader">
- <merge key="storage.drive_type" type="string">sd_mmc</merge>
- </match>
-
- <!-- Yet another common theme -->
- <match key="storage.model" contains="Reader-CF">
- <merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
- <match key="storage.model" contains="Reader-MS">
- <merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
- <match key="storage.model" contains="Reader-SM">
- <merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
- <match key="storage.model" contains="Reader-SD">
- <merge key="storage.drive_type" type="string">sd_mmc</merge>
+ <match key="storage.model" prefix_outof="HS-;Reader-;IC1210 ">
+ <match key="storage.model" suffix="CF">
+ <merge key="storage.drive_type" type="string">compact_flash</merge>
+ </match>
+ <match key="storage.model" suffix="MS">
+ <merge key="storage.drive_type" type="string">memory_stick</merge>
+ </match>
+ <match key="storage.model" suffix="SM">
+ <merge key="storage.drive_type" type="string">smart_media</merge>
+ </match>
+ <match key="storage.model" suffix="xD">
+ <merge key="storage.drive_type" type="string">smart_media</merge>
+ </match>
+ <match key="storage.model" suffix="SD">
+ <merge key="storage.drive_type" type="string">sd_mmc</merge>
+ </match>
</match>
<!-- Yet another common theme -->
@@ -80,22 +54,8 @@
<merge key="storage.drive_type" type="string">sd_mmc</merge>
</match>
- <!-- Some noname USB2.0 Card Reader -->
- <match key="storage.model" string="IC1210 CF">
- <merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
- <match key="storage.model" string="IC1210 MS">
- <merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
- <match key="storage.model" string="IC1210 SM">
- <merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
- <match key="storage.model" string="IC1210 MMC/SD">
- <merge key="storage.drive_type" type="string">sd_mmc</merge>
- </match>
-
<!-- Hama card reader -->
- <match key="storage.model" contains="Card">
+ <match key="storage.model" contains_outof="Card;USB">
<match key="storage.model" contains="Reader">
<match key="storage.model" contains=" CF">
<merge key="storage.drive_type" type="string">compact_flash</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20090206/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/10-usb-music-players.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/10-usb-music-players.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -69,6 +69,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">/</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
</match>
</match>
@@ -82,9 +83,19 @@
<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>
- <!-- Nokia E60, E70 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x0433;0x0434">
+ <!-- Nokia Series 60 phones -->
+ <match key="storage.model" string="S60">
<merge key="storage.requires_eject" type="bool">true</merge>
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <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>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music Downloads/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Digital/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Simple/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
</match>
<!-- Nokia 5300 -->
<match key="@storage.originating_device:usb.product_id" int="0x4b9">
@@ -96,7 +107,6 @@
<match key="@storage.originating_device:usb.product_id" int="0x6a">
<merge key="storage.model" type="string">5310</merge>
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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>
@@ -110,14 +120,6 @@
<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 -->
@@ -228,8 +230,8 @@
<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>
- <!-- Samsung YP-MT6V, YP-F1,YP-U1, YP-U2Z -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x5026;0x502b;0x503b;0x5050">
+ <!-- Samsung YP-MT6V, YP-F1,YP-U1, YP-U2Z, YP-U4 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x5026;0x502b;0x503b;0x5050;0x5092">
<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.output_formats" type="strlist">application/ogg</append>
@@ -260,7 +262,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlists/</append>
</match>
<!-- Samsung YP-T9 -->
<match key="@storage.originating_device:usb.product_id" int="0x5055">
@@ -455,7 +457,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- Sansa Clip version II -->
@@ -476,7 +478,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">AUDIBLE/</append>
<append key="portable_audio_player.audio_folders" type="strlist">AUDIOBOOKS/</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">%File</append>
+ <append key="portable_audio_player.playlist_path" type="string">%File</append>
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- Sansa c250 -->
@@ -486,7 +488,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- Sansa Fuze -->
@@ -497,7 +499,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
@@ -535,8 +537,8 @@
<!-- Cowon -->
<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
- <!-- iAudio M3, X5, M5, 5, G2 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x602;0x604;0x760">
+ <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -544,65 +546,42 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <match key="@storage.originating_device:usb.product_id" int="0x760">
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ <!-- iAUDIO X5, M5, F2, 7 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
<append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+ </match>
+ <!-- iAUDIO U3 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x700">
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
</match>
</match>
- <!-- iAudio U2 -->
- <match key="@storage.originating_device:usb.product_id" int="0x600">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
- </match>
- <!-- iAudio G3 -->
- <match key="@storage.originating_device:usb.product_id" int="0x601">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
- </match>
- <!-- iAudio U3 -->
- <match key="@storage.originating_device:usb.product_id" int="0x700">
+ <!-- iAUDIO U2, G3, 5, G2 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x600;0x601;0x602;0x604;0x760">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</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/flac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+ <!-- iAUDIO G2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x760">
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+ </match>
+ <!-- iAUDIO U2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x600">
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+ </match>
</match>
- <!-- iAudio F2, iAudio 7 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x710;0x730;0x750">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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/flac</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
- <append key="portable_audio_player.audio_folders" type="strlist">VOICE</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
- </match>
</match>
<!-- Archos -->
@@ -615,7 +594,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlist/</append>
</match>
<!-- Archos XS 100 -->
<match key="@storage.originating_device:usb.product_id" int="0x1205">
@@ -714,16 +693,16 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
+ <append key="portable_audio_player.playlist_path" type="string">Music/playlists</append>
</match>
- <!-- W880i Walkman Phone -->
- <match key="@storage.originating_device:usb.product_id" int="0xe068">
+ <!-- W880i/890i Walkman Phone -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xe068;0xe0b3">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
+ <append key="portable_audio_player.playlist_path" type="string">Music/playlists</append>
</match>
<!-- Sony Ericsson K320i -->
@@ -922,7 +901,7 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
</match>
<match key="usb_device.product_id" int_outof="0x000a;0x0038;0x0066;0x0095;0x009a;0x00da;0x00e9;0x0144;0x0169">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -104,7 +96,6 @@
<match key="usb_device.vendor_id" int="0x082d">
<!-- Visor/Treo 300, Treo, Treo 600 -->
<match key="usb_device.product_id" int_outof="0x0100;0x0200;0x0300">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -116,7 +107,6 @@
(Tungsten series, Zire 71), 3x(Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive),
2x Zire, m100, 2y unknown -->
<match key="usb_device.product_id" int_outof="0x0001;0x0002;0x0003;0x0010;0x0011;0x0020;0x0030;0x0031;0x0040;0x0050;0x0051;0x0052;0x0053;0x0060;0x0061;0x0062;0x0063;0x0070;0x0071;0x0080;0x0099;0x0100">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -126,7 +116,6 @@
<match key="usb_device.vendor_id" int="0x04e8">
<!-- i330 -->
<match key="usb_device.product_id" int="0x8001">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -136,7 +125,6 @@
<match key="usb_device.vendor_id" int="0x091e">
<!-- IQUE 3600 -->
<match key="usb_device.product_id" int="0x0004">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -146,7 +134,6 @@
<match key="usb_device.vendor_id" int="0x0c88">
<!-- 7135 Smartphone, 6035 Smartphone -->
<match key="usb_device.product_id" int_outof="0x0021;0xa226">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -156,7 +143,6 @@
<match key="usb_device.vendor_id" int="0x12ef">
<!-- Zodiac, Zodiac2 -->
<match key="usb_device.product_id" int="0x0100">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -166,7 +152,6 @@
<match key="usb_device.vendor_id" int="0x4766">
<!-- MEZ1000 -->
<match key="usb_device.product_id" int="0x0001">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -176,12 +161,17 @@
<match key="usb_device.vendor_id" int="0x081e">
<!-- Alphasmart Dana -->
<match key="usb_device.product_id" int="0xdf00">
- <append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
</match>
+ <!-- Add generic keys here for all pda devices -->
+
+ <match key="pda.platform" exists="true">
+ <addset key="info.capabilities" type="strlist">pda</addset>
+ </match>
+
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -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;4520;5500Z;5580;5920G">
+ <match key="system.hardware.product" contains_outof="2010;2920;3100;4520;5500Z;5580;5920G">
<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-20090121/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -43,7 +43,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- Asus Eee PC (Note: there is a report from s2ram to use vbe_post, vbemode_restore)-->
- <match key="system.hardware.product" string="701">
+ <match key="system.hardware.product" string_outof="701;900">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -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_outof="CPx J650GT;LS ">
+ <match key="system.hardware.product" contains_outof="CPx J650GT;LS ;D810">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -75,7 +75,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_outof="500m;600m;1100;1420;1525;5160">
+ <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;2200;5160">
<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-20090121/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -106,6 +106,13 @@
<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="4410s">
+ <!-- ATI 0x1002:0x9552-->
+ <match key="system.hardware.primary_video.vendor" int="0x1002">
+ <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="M2000 (EQ547PA">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -61,8 +61,12 @@
<merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
</match>
</match>
- <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m, T32 (2647) -->
- <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2526;2529;2530;2647">
+ <!-- T23(2647) -->
+ <match key="system.hardware.product" prefix_outof="2647">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
+ <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m-->
+ <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2526;2529;2530">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-acer.fdi new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-acer.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-acer.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-acer.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -46,6 +46,10 @@
<append key="input.keymap.data" type="strlist">0x6c:screenlock</append> <!-- FIXME: lock tablet device/buttons-->
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Aspire 5920G">
+ <remove key="input.keymap.data" type="strlist">e073:prog2</remove>
+ <append key="input.keymap.data" type="strlist">e012:prog2</append>
+ </match>
</match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-hp.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-hp.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-hp.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -18,6 +18,15 @@
<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="Tablet">
+ <append key="input.keymap.data" type="strlist">e002:prog2</append> <!-- Funny Key -->
+ <append key="input.keymap.data" type="strlist">e003:prog1</append> <!-- Q -->
+ <append key="input.keymap.data" type="strlist">e004:tab</append> <!-- Tab -->
+ <append key="input.keymap.data" type="strlist">e005:esc</append> <!-- Esc -->
+ <append key="input.keymap.data" type="strlist">e006:pageup</append> <!-- PgUp -->
+ <append key="input.keymap.data" type="strlist">e007:pagedown</append> <!-- PgDown -->
+ </match>
+
<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 -->
@@ -31,8 +40,8 @@
<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 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4410s;4411s;4415s;6730s">
+ <!-- HP Compaq 4410s, 4415s, 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>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-misc.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-misc.fdi 2009-02-06 13:02:35.000000000 +0100
@@ -19,6 +19,11 @@
<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 -->
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pa 2548">
+ <append key="input.keymap.data" type="strlist">e060:volumedown</append>
+ <append key="input.keymap.data" type="strlist">e061:volumeup</append>
+ <append key="input.keymap.data" type="strlist">e065:prog1</append>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro Edition V3505">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn-F1 help -->
<append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn-F3 Display toggle -->
@@ -100,7 +105,7 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;R59P/R60P/R61P;Q310">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;R59P/R60P/R61P;Q310;X05">
<append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
<append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
@@ -153,6 +158,13 @@
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="ASUS">
+ <append key="input.keymap.data" type="strlist">e06f:mute</append>
+ <append key="input.keymap.data" type="strlist">e06d:volumeup</append>
+ <append key="input.keymap.data" type="strlist">e06e:volumedown</append>
+ </match>
+
+
<!-- set the common key now -->
<match key="input.keymap.data" exists="true">
<match key="input.keymap.data" contains_not="input.keymap">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
--- old/hal-info-20090121/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
- <device>
- <match key="info.product" string="Asus Extra Buttons">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="ASUS">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="W3J">
- <append key="input.keymap.data" type="strlist">0x041:nextsong</append>
- <append key="input.keymap.data" type="strlist">0x045:playpause</append>
- <append key="input.keymap.data" type="strlist">0x043:stopcd</append>
- <append key="input.keymap.data" type="strlist">0x040:previoussong</append>
- <append key="input.keymap.data" type="strlist">0x04c:ejectclosecd</append>
- <append key="input.keymap.data" type="strlist">0x032:mute</append>
- <append key="input.keymap.data" type="strlist">0x031:volumedown</append>
- <append key="input.keymap.data" type="strlist">0x030:volumeup</append>
- <!-- Disable touchpad -->
- <!-- <append ket="input.keymap.data" type="strlist">0x06b:unknown</append> -->
- <append key="input.keymap.data" type="strlist">0x05d:wlan</append>
- <append key="input.keymap.data" type="strlist">0x07e:bluetooth</append>
- <!-- Performance -->
- <!-- <append key="input.keymap.data" type="strlist">0x05c:unknown</append> -->
- <append key="input.keymap.data" type="strlist">0x08a:tv</append>
- <!-- TODO: sleep/power buttons -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/Makefile.am new/hal-info-20090206/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20090121/fdi/information/10freedesktop/Makefile.am 2009-01-21 19:50:33.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/Makefile.am 2009-02-06 13:02:35.000000000 +0100
@@ -86,8 +86,7 @@
30-keymap-compaq.fdi \
30-keymap-lenovo.fdi \
30-keymap-dell.fdi \
- 30-keymap-acer.fdi \
- 30-keymap-module-asus-laptop.fdi
+ 30-keymap-acer.fdi
endif
check:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20090121/fdi/information/10freedesktop/Makefile.in new/hal-info-20090206/fdi/information/10freedesktop/Makefile.in
--- old/hal-info-20090121/fdi/information/10freedesktop/Makefile.in 2009-01-21 19:51:27.000000000 +0100
+++ new/hal-info-20090206/fdi/information/10freedesktop/Makefile.in 2009-02-06 13:03:19.000000000 +0100
@@ -69,8 +69,7 @@
@BUILD_KEYMAPS_TRUE@ 30-keymap-compaq.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-lenovo.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-dell.fdi \
-@BUILD_KEYMAPS_TRUE@ 30-keymap-acer.fdi \
-@BUILD_KEYMAPS_TRUE@ 30-keymap-module-asus-laptop.fdi
+@BUILD_KEYMAPS_TRUE@ 30-keymap-acer.fdi
subdir = fdi/information/10freedesktop
DIST_COMMON = $(am__dist_fdi_DATA_DIST) $(srcdir)/Makefile.am \
@@ -108,8 +107,7 @@
30-keymap-module-sony-laptop.fdi \
30-keymap-module-thinkpad-acpi.fdi 30-keymap-misc.fdi \
30-keymap-hp.fdi 30-keymap-compaq.fdi 30-keymap-lenovo.fdi \
- 30-keymap-dell.fdi 30-keymap-acer.fdi \
- 30-keymap-module-asus-laptop.fdi
+ 30-keymap-dell.fdi 30-keymap-acer.fdi
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org