Hello community,
here is the log from the commit of package hal
checked in at Mon Oct 6 17:42:29 CEST 2008.
--------
--- hal/hal.changes 2008-09-22 16:55:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-09-30 18:30:24.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Sep 30 16:56:57 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to latest git from today to integrate patch from
+ Gabriel Burt to export seconds_to_sleep to
+ pm-utils
+
+-------------------------------------------------------------------
+Tue Sep 30 16:40:11 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to latest git from today to fix 64bit big endian
+ problems from bnc#428969.
+
+-------------------------------------------------------------------
+Tue Sep 30 16:04:56 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to 0.5.11_git20080930 and hal-info to 20080930
+- removed upstream gone patches:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+ - 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
+
+-------------------------------------------------------------------
@@ -10,2 +31,25 @@
-- remove $remote_fs from init script as a temporary workaround for an init
- script loop between haldaemon and network
+- remove $remote_fs from init script as a temporary workaround for
+ an init script loop between haldaemon and network
+
+-------------------------------------------------------------------
+Tue Sep 9 15:33:08 CEST 2008 - dkukawka@suse.de
+
+- removed patch:
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+- updated patch:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+
+-------------------------------------------------------------------
+Tue Sep 9 15:14:44 CEST 2008 - dkukawka@suse.de
+
+- updated patch (for testing):
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+
+-------------------------------------------------------------------
+Tue Sep 2 16:29:44 CEST 2008 - dkukawka@suse.de
+
+- added new patches:
+ - hal-20080903-fix-slash_at_end_of_udi.diff: don't allow UDIs
+ with a '/' at the end, remove the last char in this case
+ - hal-20080903-dont_use_hal_util_compute_udi_inside_HAL.diff:
+ don use hal_util_compute_udi() inside of HAL.
@@ -2276 +2320 @@
-Wed Mar 9 23:49:57 CET 2005 - danny@suse.de
+Wed Mar 9 23:49:57 CET 2005 - dkukawka@suse.de
--- hal/hal-doc.changes 2008-08-28 13:42:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal-doc.changes 2008-09-30 18:31:19.000000000 +0200
@@ -1,0 +2,56 @@
+Tue Sep 30 16:56:57 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to latest git from today to integrate patch from
+ Gabriel Burt to export seconds_to_sleep to
+ pm-utils
+
+-------------------------------------------------------------------
+Tue Sep 30 16:40:11 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to latest git from today to fix 64bit big endian
+ problems from bnc#428969.
+
+-------------------------------------------------------------------
+Tue Sep 30 16:04:56 CEST 2008 - dkukawka@suse.de
+
+- updated HAL to 0.5.11_git20080930 and hal-info to 20080930
+- removed upstream gone patches:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+ - 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
+
+-------------------------------------------------------------------
+Mon Sep 22 16:55:08 CEST 2008 - lnussel@suse.de
+
+- hal-acl-tool: don't free strings that are not supposed to be freed
+ (bnc#428005)
+
+-------------------------------------------------------------------
+Thu Sep 11 17:11:54 CEST 2008 - cthiel@suse.de
+
+- remove $remote_fs from init script as a temporary workaround for
+ an init script loop between haldaemon and network
+
+-------------------------------------------------------------------
+Tue Sep 9 15:33:08 CEST 2008 - dkukawka@suse.de
+
+- removed patch:
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+- updated patch:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+
+-------------------------------------------------------------------
+Tue Sep 9 15:14:44 CEST 2008 - dkukawka@suse.de
+
+- updated patch (for testing):
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+
+-------------------------------------------------------------------
+Tue Sep 2 16:29:44 CEST 2008 - dkukawka@suse.de
+
+- added new patches:
+ - hal-20080903-fix-slash_at_end_of_udi.diff: don't allow UDIs
+ with a '/' at the end, remove the last char in this case
+ - hal-20080903-dont_use_hal_util_compute_udi_inside_HAL.diff:
+ don use hal_util_compute_udi() inside of HAL.
+
+-------------------------------------------------------------------
@@ -2264 +2320 @@
-Wed Mar 9 23:49:57 CET 2005 - danny@suse.de
+Wed Mar 9 23:49:57 CET 2005 - dkukawka@suse.de
calling whatdependson for head-i586
Old:
----
0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
hal-0.5.11_git20080828.tar.bz2
hal-info-20080828.tar.bz2
New:
----
hal-0.5.11_git20080930.tar.bz2
hal-info-20080930.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.A14395/_old 2008-10-06 17:39:29.000000000 +0200
+++ /var/tmp/diff_new_pack.A14395/_new 2008-10-06 17:39:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.11_git20080828)
+# spec file for package hal-doc (Version 0.5.11_git20080930)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20080828
+%define hal_info_version 20080930
%define libsmbios_version 2.0.2
-Version: 0.5.11_git20080828
-Release: 12
+Version: 0.5.11_git20080930
+Release: 1
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
@@ -82,7 +82,6 @@
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-20080701-fix-get_storage.model_from_SCSI.diff
-Patch101: 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -171,7 +170,6 @@
%patch2 -p1
%patch10 -p0
%patch100 -p1
-%patch101 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -366,6 +364,38 @@
%endif
%changelog
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to latest git from today to integrate patch from
+ Gabriel Burt to export seconds_to_sleep to
+ pm-utils
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to latest git from today to fix 64bit big endian
+ problems from bnc#428969.
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to 0.5.11_git20080930 and hal-info to 20080930
+- removed upstream gone patches:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+ - 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
+* Mon Sep 22 2008 lnussel@suse.de
+- hal-acl-tool: don't free strings that are not supposed to be freed
+ (bnc#428005)
+* Thu Sep 11 2008 cthiel@suse.de
+- remove $remote_fs from init script as a temporary workaround for
+ an init script loop between haldaemon and network
+* Tue Sep 09 2008 dkukawka@suse.de
+- removed patch:
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+- updated patch:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+* Tue Sep 09 2008 dkukawka@suse.de
+- updated patch (for testing):
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+* Tue Sep 02 2008 dkukawka@suse.de
+- added new patches:
+ - hal-20080903-fix-slash_at_end_of_udi.diff: don't allow UDIs
+ with a '/' at the end, remove the last char in this case
+ - hal-20080903-dont_use_hal_util_compute_udi_inside_HAL.diff:
+ don use hal_util_compute_udi() inside of HAL.
* Thu Aug 28 2008 dkukawka@suse.de
- updated HAL to 0.5.11_git20080828 and hal-info to 20080828
- removed upstream gone patches:
@@ -1930,7 +1960,7 @@
hfsplus now.
* Thu Mar 10 2005 dkukawka@suse.de
- added ipod fdi file see bug #71986
-* Thu Mar 10 2005 danny@suse.de
+* Thu Mar 10 2005 dkukawka@suse.de
- fixed bug #71880, added specs to doc section of hal.rpm
* Wed Mar 09 2005 dkukawka@suse.de
- moved docfiles from /usr/share/doc/packages/hal-%%{VERSION}/ to
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.A14395/_old 2008-10-06 17:39:29.000000000 +0200
+++ /var/tmp/diff_new_pack.A14395/_new 2008-10-06 17:39:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.11_git20080828)
+# spec file for package hal (Version 0.5.11_git20080930)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20080828
+%define hal_info_version 20080930
%define libsmbios_version 2.0.2
-Version: 0.5.11_git20080828
-Release: 11
+Version: 0.5.11_git20080930
+Release: 1
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
@@ -82,7 +82,6 @@
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-20080701-fix-get_storage.model_from_SCSI.diff
-Patch101: 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -170,7 +169,6 @@
%patch2 -p1
%patch10 -p0
%patch100 -p1
-%patch101 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -365,12 +363,38 @@
%endif
%changelog
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to latest git from today to integrate patch from
+ Gabriel Burt to export seconds_to_sleep to
+ pm-utils
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to latest git from today to fix 64bit big endian
+ problems from bnc#428969.
+* Tue Sep 30 2008 dkukawka@suse.de
+- updated HAL to 0.5.11_git20080930 and hal-info to 20080930
+- removed upstream gone patches:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+ - 0001-hal-acl-tool-don-t-free-strings-that-are-not-suppose.diff
* Mon Sep 22 2008 lnussel@suse.de
- hal-acl-tool: don't free strings that are not supposed to be freed
(bnc#428005)
* Thu Sep 11 2008 cthiel@suse.de
-- remove $remote_fs from init script as a temporary workaround for an init
- script loop between haldaemon and network
+- remove $remote_fs from init script as a temporary workaround for
+ an init script loop between haldaemon and network
+* Tue Sep 09 2008 dkukawka@suse.de
+- removed patch:
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+- updated patch:
+ - hal-20080909-dont_use_hal_util_compute_udi_inside_HAL.diff
+* Tue Sep 09 2008 dkukawka@suse.de
+- updated patch (for testing):
+ - hal-20080909-fix-slash_at_end_of_udi.diff
+* Tue Sep 02 2008 dkukawka@suse.de
+- added new patches:
+ - hal-20080903-fix-slash_at_end_of_udi.diff: don't allow UDIs
+ with a '/' at the end, remove the last char in this case
+ - hal-20080903-dont_use_hal_util_compute_udi_inside_HAL.diff:
+ don use hal_util_compute_udi() inside of HAL.
* Thu Aug 28 2008 dkukawka@suse.de
- updated HAL to 0.5.11_git20080828 and hal-info to 20080828
- removed upstream gone patches:
@@ -1935,7 +1959,7 @@
hfsplus now.
* Thu Mar 10 2005 dkukawka@suse.de
- added ipod fdi file see bug #71986
-* Thu Mar 10 2005 danny@suse.de
+* Thu Mar 10 2005 dkukawka@suse.de
- fixed bug #71880, added specs to doc section of hal.rpm
* Wed Mar 09 2005 dkukawka@suse.de
- moved docfiles from /usr/share/doc/packages/hal-%%{VERSION}/ to
++++++ hal-0.5.11_git20080828.tar.bz2 -> hal-0.5.11_git20080930.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/ChangeLog new/hal-0.5.11_git20080930/ChangeLog
--- old/hal-0.5.11_git20080828/ChangeLog 2008-08-28 12:07:28.000000000 +0200
+++ new/hal-0.5.11_git20080930/ChangeLog 2008-09-30 16:58:46.000000000 +0200
@@ -1,3 +1,106 @@
+commit f36161b859cf6c606f256c7e399b992b6ae360f2
+Author: Gabriel Burt
+Date: Tue Sep 30 16:54:48 2008 +0200
+
+ export seconds_to_sleep to pm-utils
+
+ Put the seconds_to_sleep variable into an environment variable so
+ pm-utils can act on it.
+
+ tools/linux/hal-system-power-suspend-hybrid-linux | 4 +---
+ tools/linux/hal-system-power-suspend-linux | 6 +-----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+commit c441223df2fe11fa7e94294e66311f765fe2d136
+Author: Markus Rothe
+Date: Tue Sep 30 16:38:07 2008 +0200
+
+ fix issue on 64bit big endian architectures.
+
+ On 64bit big endian architectures, PowerPC64 in my case, off_t is
+ 64bit. Now
+ rule.jump_position is only 32bit. the pad32_write function call in
+ set_jump_position only saves 32bit. On little endian architectures
+ this are
+ the "correct" bits, but not on 64bit architectures which are big
+ endian. The
+ solution is to type cast off_t to a 32bit value and save this one
+ instead of
+ the original variable.
+
+ hald/create_cache.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 86fa47a5949f6d6d00cc2fd7f49a6ebccfd5c3e0
+Author: Kouhei Sutou
+Date: Tue Sep 23 22:33:21 2008 -0700
+
+ add support for detecting DVD-R DL media
+
+ Added support for detecting DVD-R DL media.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=17579
+
+ hald/linux/probing/linux_dvd_rw_utils.c | 2 ++
+ hald/linux/probing/probe-volume.c | 4 ++++
+ libhal-storage/libhal-storage.c | 11 ++++++++++-
+ libhal-storage/libhal-storage.h | 3 ++-
+ 4 files changed, 18 insertions(+), 2 deletions(-)
+
+commit 2d83a3c272c7ece4f3b6ffbc19d1754ab5c3b392
+Author: Danny Kukawka
+Date: Tue Sep 23 19:08:01 2008 -0700
+
+ added linux rfkill subsystem to HAL
+
+ Added the (new) rfkill subsystem to HAL. Added new, not mandatory,
+ property killswitch.name to the killswitch namespace.
+
+ NOTE: There is currently no addon to get/set the state of the
+ killswitch. Need to add a singleton addon to handle all
+ killswitchs at once.
+
+ doc/spec/hal-spec-properties.xml | 8 ++++
+ fdi/policy/10osvendor/10-rfkill-switch.fdi | 23 +++++-----
+ hald/linux/device.c | 62
+ ++++++++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 11 deletions(-)
+
+commit 98fa5d8645e4d0890ffa95c284c1a9160e1de0bc
+Author: Ludwig Nussel
+Date: Mon Sep 22 20:11:36 2008 -0700
+
+ hal-acl-tool: don't free strings that are not supposed to be freed
+
+ Fon't free strings that are not supposed to be freed (in
+ hal-acl-tool).
+
+ tools/hal-acl-tool.c | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+commit ce51b0856a6b4b23735f2ca0c7597dfb5bf92d53
+Author: Jürg Billeter
+Date: Tue Sep 9 16:39:45 2008 +0200
+
+ inserts the sysfs path at the right position for call udevadm
+
+ The inserts the sysfs path at the right position when calling
+ udevadm info.
+
+ hald/linux/blockdev.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d0e9f16b9111a5aa8c1e5d4da1b14f9139e7030b
+Author: Danny Kukawka
+Date: Tue Sep 9 16:31:49 2008 +0200
+
+ don't use hal_util_compute_udi directly inside of hald
+
+ Fixed code to don't use hal_util_compute_udi directly inside of hald.
+
+ hald/linux/device.c | 14 +++++---------
+ 1 files changed, 5 insertions(+), 9 deletions(-)
+
commit 9e257137b2e699443358b0575cf881c84b75e617
Author: Danny Kukawka
Date: Thu Aug 28 11:04:07 2008 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/configure new/hal-0.5.11_git20080930/configure
--- old/hal-0.5.11_git20080828/configure 2008-08-28 11:59:48.000000000 +0200
+++ new/hal-0.5.11_git20080930/configure 2008-09-30 16:56:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal 0.5.11_git20080828.
+# Generated by GNU Autoconf 2.61 for hal 0.5.11_git20080930.
#
# Report bugs to .
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='hal'
PACKAGE_TARNAME='hal'
-PACKAGE_VERSION='0.5.11_git20080828'
-PACKAGE_STRING='hal 0.5.11_git20080828'
+PACKAGE_VERSION='0.5.11_git20080930'
+PACKAGE_STRING='hal 0.5.11_git20080930'
PACKAGE_BUGREPORT='dkukawka@suse.de'
# Factoring default headers for most tests.
@@ -1520,7 +1520,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 0.5.11_git20080828 to adapt to many kinds of systems.
+\`configure' configures hal 0.5.11_git20080930 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1590,7 +1590,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal 0.5.11_git20080828:";;
+ short | recursive ) echo "Configuration of hal 0.5.11_git20080930:";;
esac
cat <<\_ACEOF
@@ -1760,7 +1760,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal configure 0.5.11_git20080828
+hal configure 0.5.11_git20080930
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1774,7 +1774,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 $as_me 0.5.11_git20080828, which was
+It was created by hal $as_me 0.5.11_git20080930, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2464,7 @@
# Define the identity of the package.
PACKAGE='hal'
- VERSION='0.5.11_git20080828'
+ VERSION='0.5.11_git20080930'
cat >>confdefs.h <<_ACEOF
@@ -26193,7 +26193,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal $as_me 0.5.11_git20080828, which was
+This file was extended by hal $as_me 0.5.11_git20080930, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26246,7 +26246,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal config.status 0.5.11_git20080828
+hal config.status 0.5.11_git20080930
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-0.5.11_git20080828/configure.in new/hal-0.5.11_git20080930/configure.in
--- old/hal-0.5.11_git20080828/configure.in 2008-08-28 11:59:30.000000000 +0200
+++ new/hal-0.5.11_git20080930/configure.in 2008-09-30 16:55:54.000000000 +0200
@@ -7,7 +7,7 @@
#
AC_PREREQ(2.59c)
-AC_INIT(hal, 0.5.11_git20080828, dkukawka@suse.de)
+AC_INIT(hal, 0.5.11_git20080930, dkukawka@suse.de)
AM_INIT_AUTOMAKE([gnu 1.9])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal/html/index.html new/hal-0.5.11_git20080930/doc/api/libhal/html/index.html
--- old/hal-0.5.11_git20080828/doc/api/libhal/html/index.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal/html/index.html 2008-09-30 16:58:49.000000000 +0200
@@ -25,11 +25,11 @@
<code class="email"><<a class="email" href="mailto:david@fubar.dk">david@fubar.dk</a>></code><br>
</p></div></div>
</div></div></div>
-<div><p class="releaseinfo">Version 0.5.11_git20080828
+<div><p class="releaseinfo">Version 0.5.11_git20080930
</p></div>
<div><p class="copyright">Copyright © 2007 The HAL Authors</p></div>
<div><div class="legalnotice">
-<a name="id277631"></a><p>
+<a name="id277619"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal/html/ix01.html new/hal-0.5.11_git20080930/doc/api/libhal/html/ix01.html
--- old/hal-0.5.11_git20080828/doc/api/libhal/html/ix01.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal/html/ix01.html 2008-09-30 16:58:49.000000000 +0200
@@ -24,7 +24,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id276972"></a>Index</h2></div></div></div>
+<a name="id276959"></a>Index</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>D</h3>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal/html/libhal-libhal.html new/hal-0.5.11_git20080930/doc/api/libhal/html/libhal-libhal.html
--- old/hal-0.5.11_git20080828/doc/api/libhal/html/libhal-libhal.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal/html/libhal-libhal.html 2008-09-30 16:58:49.000000000 +0200
@@ -2995,7 +2995,11 @@
Get all devices in the hal database as well as all properties for each device.
</p>
<p>
-Return: <code class="literal">TRUE</code> if success; <code class="literal">FALSE</code> and <em class="parameter"><code>error</code></em> will be set.</p>
+Return: <code class="literal">TRUE</code></a> if success; <code class="literal">FALSE</code></a> and <em class="parameter"><code>error</code></em> will be set.</p>
<p>
</p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal/html/rn01.html new/hal-0.5.11_git20080930/doc/api/libhal/html/rn01.html
--- old/hal-0.5.11_git20080828/doc/api/libhal/html/rn01.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal/html/rn01.html 2008-09-30 16:58:49.000000000 +0200
@@ -25,7 +25,7 @@
<div class="reference" lang="en">
<div class="titlepage">
<div><div><h1 class="title">
-<a name="id276953"></a>API Reference</h1></div></div>
+<a name="id276940"></a>API Reference</h1></div></div>
<hr>
</div>
<div class="partintro" lang="en">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal/version.xml new/hal-0.5.11_git20080930/doc/api/libhal/version.xml
--- old/hal-0.5.11_git20080828/doc/api/libhal/version.xml 2008-08-28 12:00:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal/version.xml 2008-09-30 16:56:44.000000000 +0200
@@ -1 +1 @@
-0.5.11_git20080828
+0.5.11_git20080930
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/index.html new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/index.html
--- old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/index.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/index.html 2008-09-30 16:58:49.000000000 +0200
@@ -25,11 +25,11 @@
<code class="email"><<a class="email" href="mailto:david@fubar.dk">david@fubar.dk</a>></code><br>
</p></div></div>
</div></div></div>
-<div><p class="releaseinfo">Version 0.5.11_git20080828
+<div><p class="releaseinfo">Version 0.5.11_git20080930
</p></div>
<div><p class="copyright">Copyright © 2007 The HAL Authors</p></div>
<div><div class="legalnotice">
-<a name="id277631"></a><p>
+<a name="id277619"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/ix01.html new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/ix01.html
--- old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/ix01.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/ix01.html 2008-09-30 16:58:49.000000000 +0200
@@ -24,7 +24,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id276972"></a>Index</h2></div></div></div>
+<a name="id276960"></a>Index</h2></div></div></div>
<div class="index"><div class="indexdiv">
<h3>L</h3>
<dl>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/rn01.html new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/rn01.html
--- old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/rn01.html 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/rn01.html 2008-09-30 16:58:49.000000000 +0200
@@ -25,7 +25,7 @@
<div class="reference" lang="en">
<div class="titlepage">
<div><div><h1 class="title">
-<a name="id276953"></a>API Reference</h1></div></div>
+<a name="id276941"></a>API Reference</h1></div></div>
<hr>
</div>
<div class="partintro" lang="en">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/version.xml new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/version.xml
--- old/hal-0.5.11_git20080828/doc/api/libhal-storage/html/version.xml 2008-08-28 12:07:31.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal-storage/html/version.xml 2008-09-30 16:58:49.000000000 +0200
@@ -1 +1 @@
-0.5.11_git20080828
+0.5.11_git20080930
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/api/libhal-storage/version.xml new/hal-0.5.11_git20080930/doc/api/libhal-storage/version.xml
--- old/hal-0.5.11_git20080828/doc/api/libhal-storage/version.xml 2008-08-28 12:00:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/api/libhal-storage/version.xml 2008-09-30 16:56:44.000000000 +0200
@@ -1 +1 @@
-0.5.11_git20080828
+0.5.11_git20080930
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/spec/hal-spec-properties.xml new/hal-0.5.11_git20080930/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.11_git20080828/doc/spec/hal-spec-properties.xml 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/spec/hal-spec-properties.xml 2008-09-30 16:37:47.000000000 +0200
@@ -7524,6 +7524,14 @@
</row>
<row>
<entry>
+ <literal>killswitch.name</literal> (string)
+ </entry>
+ <entry></entry>
+ <entry>No</entry>
+ <entry>Name of the kill switch (as reported by the kernel).</entry>
+ </row>
+ <row>
+ <entry>
<literal>killswitch.access_method</literal> (string)
</entry>
<entry></entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/doc/spec/hal-spec.xml.in new/hal-0.5.11_git20080930/doc/spec/hal-spec.xml.in
--- old/hal-0.5.11_git20080828/doc/spec/hal-spec.xml.in 2008-08-28 12:00:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/doc/spec/hal-spec.xml.in 2008-09-30 16:56:44.000000000 +0200
@@ -3,8 +3,8 @@
<book id="index">
<bookinfo>
- <title>HAL 0.5.11_git20080828 Specification</title>
- <releaseinfo>Version 0.5.11_git20080828</releaseinfo>
+ <title>HAL 0.5.11_git20080930 Specification</title>
+ <releaseinfo>Version 0.5.11_git20080930</releaseinfo>
<date>March 24th, 2007</date> <!-- Update this manually -->
<authorgroup>
<author>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/fdi/policy/10osvendor/10-rfkill-switch.fdi new/hal-0.5.11_git20080930/fdi/policy/10osvendor/10-rfkill-switch.fdi
--- old/hal-0.5.11_git20080828/fdi/policy/10osvendor/10-rfkill-switch.fdi 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/fdi/policy/10osvendor/10-rfkill-switch.fdi 2008-09-30 16:37:47.000000000 +0200
@@ -10,18 +10,19 @@
</match>
<!-- For all other KillSwitch devices -->
- <match key="killswitch.access_method" contains_not="ipw">
- <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.KillSwitch</append>
+ <match key="killswitch.access_method" contains_not="ipw">
+ <match key="info.subsystem" contains_not="rfkill">
+ <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.KillSwitch</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_names" type="strlist">SetPower</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_signatures" type="strlist">b</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_argnames" type="strlist">power</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_execpaths" type="strlist">hal-system-killswitch-set-power</append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_names" type="strlist">SetPower</append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_signatures" type="strlist">b</append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_argnames" type="strlist">power</append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_execpaths" type="strlist">hal-system-killswitch-set-power</append>
-
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_names" type="strlist">GetPower</append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_signatures" type="strlist"></append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_argnames" type="strlist"></append>
- <append key="org.freedesktop.Hal.Device.KillSwitch.method_execpaths" type="strlist">hal-system-killswitch-get-power</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_names" type="strlist">GetPower</append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_signatures" type="strlist"></append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_argnames" type="strlist"></append>
+ <append key="org.freedesktop.Hal.Device.KillSwitch.method_execpaths" type="strlist">hal-system-killswitch-get-power</append>
+ </match>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/hald/create_cache.c new/hal-0.5.11_git20080930/hald/create_cache.c
--- old/hal-0.5.11_git20080828/hald/create_cache.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/hald/create_cache.c 2008-09-30 16:37:57.000000000 +0200
@@ -305,15 +305,17 @@
static void set_jump_position(struct fdi_context *fdi_ctx)
{
off_t offset;
+ u_int32_t offset32;
if (fdi_ctx->depth <= 0)
DIE(("Rule depth underrun"));
fdi_ctx->depth--;
offset = RULES_ROUND(lseek(fdi_ctx->cache_fd, 0, SEEK_END));
+ offset32 = (u_int32_t)offset;
pad32_write(fdi_ctx->cache_fd,
fdi_ctx->match_at_depth[fdi_ctx->depth] + offsetof(struct rule, jump_position),
- &offset, sizeof(fdi_ctx->rule.jump_position));
+ &offset32, sizeof(fdi_ctx->rule.jump_position));
if (haldc_verbose)
HAL_INFO(("modify rule=0x%08x, set jump to 0x%08x",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/hald/linux/blockdev.c new/hal-0.5.11_git20080930/hald/linux/blockdev.c
--- old/hal-0.5.11_git20080828/hald/linux/blockdev.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/hald/linux/blockdev.c 2008-09-30 16:37:47.000000000 +0200
@@ -1774,7 +1774,7 @@
GError *g_error;
ret = NULL;
- argv[5] = sysfs_path;
+ argv[6] = sysfs_path;
g_error = NULL;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/hald/linux/device.c new/hal-0.5.11_git20080930/hald/linux/device.c
--- old/hal-0.5.11_git20080828/hald/linux/device.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/hald/linux/device.c 2008-09-30 16:37:47.000000000 +0200
@@ -3502,6 +3502,58 @@
/*--------------------------------------------------------------------------------------------------------------*/
static HalDevice *
+rfkill_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+{
+ HalDevice *d;
+ gchar buf[64];
+ const gchar *type;
+
+ d = hal_device_new ();
+ hal_device_add_capability (d, "killswitch");
+ hal_device_property_set_string (d, "info.category", "killswitch");
+ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
+
+ if (parent_dev != NULL) {
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+ hal_device_copy_property( parent_dev, "info.vendor", d, "info.vendor");
+ } else {
+ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
+ }
+
+ type = hal_util_get_string_from_file (sysfs_path, "type");
+
+ if (strcasecmp (type, "wimax") == 0) {
+ hal_device_property_set_string (d, "killswitch.type", "wwan");
+ } else {
+ hal_device_property_set_string (d, "killswitch.type", type);
+ }
+
+ hal_util_set_string_from_file (d, "killswitch.name", sysfs_path, "name");
+
+ g_snprintf(buf, sizeof(buf), "%s %s Killswitch", hal_device_property_get_string (d, "killswitch.name"),
+ hal_device_property_get_string (d, "killswitch.type"));
+ hal_device_property_set_string (d, "info.product", buf);
+
+ return d;
+}
+
+static gboolean
+rfkill_compute_udi (HalDevice *d)
+{
+ gchar udi[256];
+
+ hald_compute_udi (udi, sizeof (udi),
+ "%s_rfkill_%s_%s",
+ hal_device_property_get_string (d, "info.parent"),
+ hal_device_property_get_string (d, "killswitch.name"),
+ hal_device_property_get_string (d, "killswitch.type"));
+ hal_device_set_udi (d, udi);
+ return TRUE;
+}
+
+/*--------------------------------------------------------------------------------------------------------------*/
+
+static HalDevice *
drm_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
{
HalDevice *d = NULL;
@@ -3760,12 +3812,10 @@
{
gchar udi[256];
- hal_util_compute_udi (hald_get_gdl(), udi, sizeof (udi),
- "/org/freedesktop/Hal/devices/_%s",
- hal_device_property_get_string (d, "vmbus.bus_id"));
-
+ hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/_%s",
+ hal_device_property_get_string (d, "vmbus.bus_id"));
hal_device_set_udi (d, udi);
-
+
return TRUE;
}
@@ -3805,11 +3855,9 @@
{
gchar udi[256];
- hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
- "/org/freedesktop/Hal/devices/of_platform_%s",
- hal_device_property_get_string (d, "of_platform.id"));
+ hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/of_platform_%s",
+ hal_device_property_get_string (d, "of_platform.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -4158,6 +4206,15 @@
.remove = dev_remove
};
+static DevHandler dev_handler_rfkill =
+{
+ .subsystem = "rfkill",
+ .add = rfkill_add,
+ .compute_udi = rfkill_compute_udi,
+ .remove = dev_remove
+};
+
+
static DevHandler dev_handler_drm =
{
.subsystem = "drm",
@@ -4251,6 +4308,7 @@
&dev_handler_backlight,
&dev_handler_firewire,
&dev_handler_power_supply,
+ &dev_handler_rfkill,
&dev_handler_drm,
&dev_handler_ps3_system_bus,
&dev_handler_virtio,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/hald/linux/probing/linux_dvd_rw_utils.c new/hal-0.5.11_git20080930/hald/linux/probing/linux_dvd_rw_utils.c
--- old/hal-0.5.11_git20080828/hald/linux/probing/linux_dvd_rw_utils.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/hald/linux/probing/linux_dvd_rw_utils.c 2008-09-30 16:37:47.000000000 +0200
@@ -696,6 +696,8 @@
break;
case 0x11: /* DVD-R */
+ case 0x15: /* DVD-R Dual Layer Sequential */
+ case 0x16: /* DVD-R Dual Layer Jump */
case 0x1B: /* DVD+R */
case 0x2B: /* DVD+R Double Layer */
case 0x41: /* BD-R SRM */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/hald/linux/probing/probe-volume.c new/hal-0.5.11_git20080930/hald/linux/probing/probe-volume.c
--- old/hal-0.5.11_git20080828/hald/linux/probing/probe-volume.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/hald/linux/probing/probe-volume.c 2008-09-30 16:37:47.000000000 +0200
@@ -500,6 +500,10 @@
libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_rw");
libhal_changeset_set_property_bool (cs, "volume.disc.is_rewritable", TRUE);
break;
+ case 0x15: /* DVD-R Dual Layer Sequential */
+ case 0x16: /* DVD-R Dual Layer Jump */
+ libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_r_dl");
+ break;
case 0x1A: /* DVD+RW */
libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_plus_rw");
libhal_changeset_set_property_bool (cs, "volume.disc.is_rewritable", TRUE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/libhal-storage/libhal-storage.c new/hal-0.5.11_git20080930/libhal-storage/libhal-storage.c
--- old/hal-0.5.11_git20080828/libhal-storage/libhal-storage.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/libhal-storage/libhal-storage.c 2008-09-30 16:37:47.000000000 +0200
@@ -412,7 +412,14 @@
else
name = strdup (_("DVD-R"));
break;
-
+
+ case LIBHAL_VOLUME_DISC_TYPE_DVDR_DL:
+ if (libhal_volume_disc_is_blank (volume))
+ name = strdup (_("Blank DVD-R Dual-Layer"));
+ else
+ name = strdup (_("DVD-R Dual-Layer"));
+ break;
+
case LIBHAL_VOLUME_DISC_TYPE_DVDRW:
if (libhal_volume_disc_is_blank (volume))
name = strdup (_("Blank DVD-RW"));
@@ -1212,6 +1219,8 @@
vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDR;
} else if (strcmp (disc_type_textual, "dvd_rw") == 0) {
vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDRW;
+ } else if (strcmp (disc_type_textual, "dvd_r_dl") == 0) {
+ vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDR_DL;
} else if (strcmp (disc_type_textual, "dvd_plus_r") == 0) {
vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR;
} else if (strcmp (disc_type_textual, "dvd_plus_rw") == 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/libhal-storage/libhal-storage.h new/hal-0.5.11_git20080930/libhal-storage/libhal-storage.h
--- old/hal-0.5.11_git20080828/libhal-storage/libhal-storage.h 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/libhal-storage/libhal-storage.h 2008-09-30 16:37:47.000000000 +0200
@@ -281,7 +281,8 @@
LIBHAL_VOLUME_DISC_TYPE_HDDVDROM = 0x0d,
LIBHAL_VOLUME_DISC_TYPE_HDDVDR = 0x0e,
LIBHAL_VOLUME_DISC_TYPE_HDDVDRW = 0x0f,
- LIBHAL_VOLUME_DISC_TYPE_MO = 0x10
+ LIBHAL_VOLUME_DISC_TYPE_MO = 0x10,
+ LIBHAL_VOLUME_DISC_TYPE_DVDR_DL = 0x11
} LibHalVolumeDiscType;
LibHalVolume *libhal_volume_from_udi (LibHalContext *hal_ctx,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/tools/hal-acl-tool.c new/hal-0.5.11_git20080930/tools/hal-acl-tool.c
--- old/hal-0.5.11_git20080828/tools/hal-acl-tool.c 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/tools/hal-acl-tool.c 2008-09-30 16:37:47.000000000 +0200
@@ -1085,18 +1085,12 @@
if (device == NULL) {
printf ("%d: access_control.file not set for '%s'\n", getpid (), udis[i]);
- if (type != NULL)
- libhal_free_string (type);
acl_for_device_free (afd);
goto skip;
}
if (type == NULL) {
printf ("%d: access_control.type not set for '%s'\n", getpid (), udis[i]);
- if (device != NULL)
- libhal_free_string (device);
- if (type != NULL)
- libhal_free_string (type);
acl_for_device_free (afd);
goto skip;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/tools/linux/hal-system-power-suspend-hybrid-linux new/hal-0.5.11_git20080930/tools/linux/hal-system-power-suspend-hybrid-linux
--- old/hal-0.5.11_git20080828/tools/linux/hal-system-power-suspend-hybrid-linux 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/tools/linux/hal-system-power-suspend-hybrid-linux 2008-09-30 16:48:00.000000000 +0200
@@ -32,9 +32,7 @@
# We only support pm-utils
if [ -x "/usr/sbin/pm-suspend-hybrid" ] ; then
- if [ $seconds_to_sleep != "0" ] ; then
- alarm_not_supported
- fi
+ export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
/usr/sbin/pm-suspend-hybrid $QUIRKS
RET=$?
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.11_git20080828/tools/linux/hal-system-power-suspend-linux new/hal-0.5.11_git20080930/tools/linux/hal-system-power-suspend-linux
--- old/hal-0.5.11_git20080828/tools/linux/hal-system-power-suspend-linux 2008-08-28 11:50:11.000000000 +0200
+++ new/hal-0.5.11_git20080930/tools/linux/hal-system-power-suspend-linux 2008-09-30 16:48:00.000000000 +0200
@@ -31,13 +31,9 @@
[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_SAVE_PCI" = "true" ] && QUIRKS="$QUIRKS --quirk-save-pci"
[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
-# Urh. Do any BIOSen handle this correctly?
-if [ $seconds_to_sleep != "0" ] ; then
- alarm_not_supported
-fi
-
# We only support pm-utils
if [ -x "/usr/sbin/pm-suspend" ] ; then
+ export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
/usr/sbin/pm-suspend $QUIRKS
RET=$?
else
++++++ hal-info-20080828.tar.bz2 -> hal-info-20080930.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/ChangeLog new/hal-info-20080930/ChangeLog
--- old/hal-info-20080828/ChangeLog 2008-08-28 13:09:00.000000000 +0200
+++ new/hal-info-20080930/ChangeLog 2008-09-30 16:08:09.000000000 +0200
@@ -1,3 +1,341 @@
+commit 830346628e778fdc2e2f84a29612fbc82e202149
+Author: Hans de Goede
+Date: Tue Sep 30 15:55:16 2008 +0200
+
+ add suspend quirk and keymap for a HP Compaq Evo N600C
+
+ Added suspend quirk and keymap for a HP Compaq Evo N600C.
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 3 +++
+ fdi/information/10freedesktop/30-keymap-compaq.fdi | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 73dc3fbff1e12c2304336b9aed39db33aaffb47b
+Merge: 55f2633... d0451a2...
+Author: Danny Kukawka
+Date: Tue Sep 30 15:40:59 2008 +0200
+
+ Merge branch 'local'
+
+commit d0451a234f4071c5a1c6a1dbe5c93639b47fb66f
+Author: Danny Kukawka
+Date: Tue Sep 30 15:30:22 2008 +0200
+
+ HP Compaq nc2400 handles brightness in hardware
+
+ Added HP Compaq nc2400 to handle brightness in hardware.
+
+ .../10freedesktop/10-laptop-panel-hardware.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d2b4d3b1a3e8863e61dadfc66d099744ab84f989
+Author: Danny Kukawka
+Date: Tue Sep 30 15:29:04 2008 +0200
+
+ HP Compaq 2710p handles brightness in hardware
+
+ Added HP Compaq 2710p to handle brightness in hardware.
+
+ .../10freedesktop/10-laptop-panel-hardware.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 55f2633bc5c56d3c5f448c7acb57dc930c6eb9f7
+Author: Dan Williams
+Date: Wed Sep 24 11:01:12 2008 -0400
+
+ Fix usb interface number on Ericsson 3G card
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9bbb69d3ca39bff58435d8e9c6d405292d5b56d7
+Author: Dan Williams
+Date: Wed Sep 24 10:50:34 2008 -0400
+
+ Additional mobile broadband devices
+
+ Three more Dell cards, an Ericsson card, and one from AXESSTEL.
+
+ fdi/information/10freedesktop/10-modem.fdi | 48
+ +++++++++++++++++++++------
+ 1 files changed, 37 insertions(+), 11 deletions(-)
+
+commit 297e76ec35b11b1aac718a235af4ca293c081f8f
+Author: Danny Kukawka
+Date: Wed Sep 24 01:58:35 2008 -0700
+
+ don't add input.keymap capability twice
+
+ Don't add input.keymap capability twice.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 126a28f0096fc66ef38bd3a4e099252ffcbe58aa
+Author: Ben Caldwell
+Date: Wed Sep 24 01:57:40 2008 -0700
+
+ added missing keys for a HP Compaq 6730s
+
+ Added missing keys (brightness) for a HP Compaq 6730s.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 051baf27a1957d1bf8afe6cadedad1429a291be0
+Author: Danny Kukawka
+Date: Wed Sep 24 01:52:02 2008 -0700
+
+ add another keymap for a MSI machine
+
+ Add another keymap for a MSI machine as reported via ML by
+ Suren Karapetyan .
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 922127fe009c72629f2949e0e16b136cd1d7e3c5
+Author: Danny Kukawka
+Date: Wed Sep 24 01:51:21 2008 -0700
+
+ small fix of 10-usb-music-players.fdi
+
+ Small fix of 10-usb-music-players.fdi.
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 042d5d1f56ea6ab6d0ecf1121c01cb2307dccd12
+Author: Danny Kukawka
+Date: Tue Sep 23 23:38:35 2008 -0700
+
+ cleanup: remove some empty entries
+
+ Cleaned up the file. Removed some empty <append/> entries.
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 8fac27849097ccf6df5b06d8888d8b13c110e917
+Author: Danny Kukawka
+Date: Tue Sep 23 23:34:01 2008 -0700
+
+ fix new entry from b6d3ed743f58eff42c0dbdcbf8e7598a589e1584
+
+ Fixed new Sony Walkman entry from
+ b6d3ed743f58eff42c0dbdcbf8e7598a589e1584:
+ - use only append for portable_audio_player.output_formats
+ - don't add empty portable_audio_player.input_formats entries
+ - don't set info.category in an entry, this gets add at the end of
+ the file
+ - don't set audio/mpeg for output_formats, this get added already
+ for all
+ USB mp3 player by default
+ - don't set info.product and info.vendor
+
+ .../10freedesktop/10-usb-music-players.fdi | 7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+commit b6d3ed743f58eff42c0dbdcbf8e7598a589e1584
+Author: Ivan N. Zlatev
+Date: Tue Sep 23 23:26:15 2008 -0700
+
+ add entry for two Sony Walkman Video MP3 NWZ-xxxx models
+
+ Added entry for two Sony Walkman Video MP3 NWZ-xxxx models.
+
+ .../10freedesktop/10-usb-music-players.fdi | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit b7c5656e2ba67cb24b9768ee123062594b3a6b1c
+Author: Danny Kukawka
+Date: Tue Sep 23 22:53:00 2008 -0700
+
+ add keymapping for Sony VGN-S360
+
+ Added keymapping for Sony VGN-S360 as contributed via HAL ML by
+ Jason Siefken .
+
+ .../10freedesktop/30-keymap-module-sony-laptop.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a267be6a608ebaf20a0109580bbb49dfb31afc1d
+Author: Soeren Sandmann Pedersen
+Date: Tue Sep 23 22:49:42 2008 -0700
+
+ add keymap entry for video hotkey on Lenovo 3000
+
+ Added keymap entry for video hotkey on Lenovo 3000.
+
+ fdi/information/10freedesktop/30-keymap-lenovo.fdi | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 51408159775f650bc18187ecd3db09f5444d9fc6
+Author: John Hull
+Date: Tue Sep 23 22:45:25 2008 -0700
+
+ add another ID for the Sansa Clip music player in MSC
+
+ Added another ID for the Sansa Clip music player in MSC mode.
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 670e0061733f73ca855eddf504e1fd6ef1efc07e
+Author: Alexei Korobkin
+Date: Tue Sep 23 22:39:23 2008 -0700
+
+ add Philips Sa3125 as USB music player
+
+ Added Philips Sa3125 as USB music player.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=17529
+
+ .../10freedesktop/10-usb-music-players.fdi | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 6370dfe625879149f18a32b7d20e38ba753af8ca
+Author: Danny Kukawka
+Date: Tue Sep 23 19:51:52 2008 -0700
+
+ added SonyEricsson W910i as USB music player
+
+ Added SonyEricsson W910i as USB music player as reported by
+ Peter Henriksson . Fixed some whitespaces.
+
+ .../10freedesktop/10-usb-music-players.fdi | 30
+ ++++++++++----------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+commit ffa5a201c0cab7ce376f344aaa6ef59222eb32da
+Author: Danny Kukawka
+Date: Tue Sep 23 19:42:30 2008 -0700
+
+ add missing Latitude XT Tablet(PC) keys
+
+ Added slightly adopted patch from Mario Limonciello
+
+ to add missing Latitude XT Tablet(PC) keys. Added some FIXME comments
+ to the
+ new keys.
+
+ Added the new keys not to the general key section, since they are
+ TabletPC
+ specific.
+
+ fdi/information/10freedesktop/30-keymap-dell.fdi | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 9d867db5f98667f5949350146da791c095f2acdd
+Author: Matthew Garrett
+Date: Wed Sep 17 20:24:10 2008 -0700
+
+ remove incorrect Macbook Pro quirk
+
+ The MBP 4,1 quirk can only work with the binary nvidia driver,
+ which is
+ caught by a later check anyway. Remove it.
+
+ .../10freedesktop/20-video-quirk-pm-apple.fdi | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+commit ee829a040a61df4ece4fcf0ae18b1f43f242b635
+Author: Danny Kukawka
+Date: Thu Sep 11 17:37:51 2008 +0200
+
+ add Blackberry devices as USB music players
+
+ Added an adopted patch from Aaron Bockover
+ to add some Blackberry devices as USB music players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 0e4614a033ba588adeb1c7d7818ee2598b1ff431
+Author: Danny Kukawka
+Date: Thu Sep 11 14:58:50 2008 +0200
+
+ updated HP suspend quirks with s2ram whitelist entries from -r1.132
+
+ Updated HP suspend quirks with s2ram whitelist entries from -r1.132.
+ New:
+ - Compaq: 6510b, 6710s, some 6715b, 6820s, some 6910p
+ - Presario: F500, V3700,
+ - Pavilion: ze4900, RP829AV-ABA d4790y
+ - HP Compaq dc5800 Small Form Factor
+ - HP d330 uT
+ Updated:
+ - Compaq: 6715b, 6820s, 6910p
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 100
+ +++++++++++++++-----
+ 1 files changed, 75 insertions(+), 25 deletions(-)
+
+commit 1fe59f77592f930e8e195b2a8e0abc5d84db3313
+Author: Danny Kukawka
+Date: Wed Sep 10 16:45:48 2008 +0200
+
+ updated Dell suspend quirks with s2ram whitelist entries from -r1.132
+
+ Updated Dell suspend quirks with s2ram whitelist entries from -r1.132.
+ New:
+ - Inspiron: 1525
+ - OptiPlex: 755, GX620
+ - Precision M6300
+ Updated:
+ - Latitude D400
+
+ .../10freedesktop/20-video-quirk-pm-dell.fdi | 17
+ +++++++++++------
+ 1 files changed, 11 insertions(+), 6 deletions(-)
+
+commit 39c1f01fca31564f9ddfe8de685f1dfbf9dedc32
+Author: Danny Kukawka
+Date: Wed Sep 10 15:54:28 2008 +0200
+
+ updated Asus suspend quirks with s2ram whitelist entries from -r1.132
+
+ Updated Asus suspend quirks with s2ram whitelist entries from -r1.132.
+
+ Added new:
+ - A6JC, F3Sg, F9E, G1S, X51RL, ASUS M2A-VM ACPI BIOS Revision *
+ Updated:
+ - A6J, F3Sc, ASUS M2A-VM ACPI BIOS Revision 1101
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 37
+ ++++++++++++-------
+ 1 files changed, 23 insertions(+), 14 deletions(-)
+
+commit 65be764860c09cb406dbf6130abd6a1160a5bea7
+Author: Danny Kukawka
+Date: Wed Sep 10 15:23:21 2008 +0200
+
+ updated Acer suspend quirks with s2ram whitelist entries from -r1.132
+
+ Updated Acer suspend quirks with s2ram whitelist entries from -r1.132.
+ new:
+ - AcerPower 2000
+ - Aspire: 1500, 2920
+ - Extensa: 3000
+ - TraveMate: 2310, 5320
+ updated:
+ - Aspire 5100, 5630
+
+ .../10freedesktop/20-video-quirk-pm-acer.fdi | 45
+ ++++++++++++-------
+ 1 files changed, 28 insertions(+), 17 deletions(-)
+
+commit f2c5acb0146ff7b8ac020655149c990c994cc14a
+Author: Danny Kukawka
+Date: Wed Sep 10 15:10:19 2008 +0200
+
+ added suspend quirk comment for Apple with s2ram entries from -r1.132
+
+ Added suspend quirk comment for Apple with s2ram entries from -r1.132
+
+ .../10freedesktop/20-video-quirk-pm-apple.fdi | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
commit 37243b5a7cfb77b22498376ab2c81fec277a6d7c
Author: Danny Kukawka
Date: Mon Aug 25 20:26:57 2008 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/configure new/hal-info-20080930/configure
--- old/hal-info-20080828/configure 2008-08-28 13:04:16.000000000 +0200
+++ new/hal-info-20080930/configure 2008-09-30 16:07:45.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20080828.
+# Generated by GNU Autoconf 2.61 for hal-info 20080930.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20080828'
-PACKAGE_STRING='hal-info 20080828'
+PACKAGE_VERSION='20080930'
+PACKAGE_STRING='hal-info 20080930'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -1187,7 +1187,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal-info 20080828 to adapt to many kinds of systems.
+\`configure' configures hal-info 20080930 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,7 +1253,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20080828:";;
+ short | recursive ) echo "Configuration of hal-info 20080930:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20080828
+hal-info configure 20080930
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20080828, which was
+It was created by hal-info $as_me 20080930, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2050,7 +2050,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20080828
+ VERSION=20080930
cat >>confdefs.h <<_ACEOF
@@ -4048,7 +4048,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20080828, which was
+This file was extended by hal-info $as_me 20080930, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4101,7 +4101,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20080828
+hal-info config.status 20080930
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-20080828/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi new/hal-info-20080930/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -20,9 +20,16 @@
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2710p;nc2400">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+ </match>
+ </match>
+
<match key="linux.sysfs_path" string="/sys/class/backlight/thinkpad_screen">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
+
</match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20080930/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/10-modem.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/10-modem.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -215,22 +215,24 @@
<!-- Dell Wireless -->
<match key="@info.parent:usb.vendor_id" int="0x413c">
<!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
- 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
- 5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
- -->
- <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8133">
+ 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
+ 2x 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
+ 5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
+ -->
+ <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8129;0x8133">
<match key="@info.parent:usb.interface.number" int="0">
<append key="info.capabilities" type="strlist">modem</append>
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
- <!-- 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
- 505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
- 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
- HSDPA 5520,
- -->
- <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137">
+ <!-- 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+ 505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+ 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
+ HSDPA 5520,
+ 2x 5520 Voda I Mobile Broadband (3G HSDPA) Minicard,
+ 5530 Mobile Broadband (3G HSPA) Mini-Card
+ -->
+ <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137;0x8138;0x8147">
<match key="@info.parent:usb.interface.number" int="0">
<append key="info.capabilities" type="strlist">modem</append>
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
@@ -319,6 +321,30 @@
</match>
</match>
+ <!-- Ericsson -->
+ <match key="@info.parent:usb.vendor_id" int="0x0bdb">
+ <!-- Ericsson F3507g Mobile Broadband Minicard -->
+ <match key="@info.parent:usb.product_id" int="0x1900">
+ <match key="@info.parent:usb.interface.number" int="4">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- AXESSTEL modem -->
+ <match key="@info.parent:usb.vendor_id" int="0x1726">
+ <match key="@info.parent:usb.product_id" int="0x1000">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <match key="serial.port" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
<!-- Communication Device Class Abstract Control Model (CDC ACM) modems,
typically provided by GSM/CDMA phones -->
<match key="@info.parent:usb.interface.class" int="0x02">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20080930/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -155,6 +155,17 @@
<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>
</match>
+ <!-- Philips GoGear SA3125 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x84a">
+ <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">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/x-smv</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.audio_folders" type="strlist">Video/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Voice/</append>
+ </match>
</match>
<!-- Meizu -->
@@ -281,8 +292,14 @@
<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">Record/Voice/</append>
- <append key="portable_audio_player.playlist_format" type="strlist"></append>
- <append key="portable_audio_player.playlist_path" type="string"></append>
+ </match>
+ <!-- Sony Walkman Video MP3 NWZ-xxxx -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x035b;0x035c">
+ <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">audio/aac</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>
</match>
</match>
@@ -401,7 +418,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
</match>
<!-- Sansa Clip -->
- <match key="@storage.originating_device:usb.product_id" int="0x7432">
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x7432;0x7433">
<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">audio/audible</append>
@@ -551,6 +568,18 @@
</match>
</match>
+ <!-- RIM -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0fca">
+ <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ </match>
+ </match>
+
<!-- Sony Ericsson -->
<match key="@storage.originating_device:usb.vendor_id" int="0xfce">
<!-- K750i mobile phone -->
@@ -635,21 +664,21 @@
<append key="portable_audio_player.audio_folders" type="strlist">AUDIO/</append>
</match>
- <!-- Sony Ericsson K850i -->
- <match key="@storage.originating_device:usb.product_id" int="0xe075">
- <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-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/amr</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/amr-wb</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.m-realaudio</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-m4b</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/midi</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/amr</append>
- <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <!-- Sony Ericsson K850i, W910i -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xe075;0xe076">
+ <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-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/amr</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/amr-wb</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.m-realaudio</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-m4b</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/midi</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/amr</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -6,7 +6,7 @@
<match key="system.hardware.product" contains="C300">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="2350;2410;2420;2490;3220;4000;4650">
+ <match key="system.hardware.product" contains_outof="2350;2410;2420;2490;3220;4000;4650;5320">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -14,7 +14,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="2300;3010;3020;3260">
+ <match key="system.hardware.product" contains_outof="2300;2310;3010;3020;3260">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -56,20 +56,10 @@
</match>
<match key="system.hardware.product" prefix="Aspire">
- <match key="system.hardware.product" contains_outof="1690;1694">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" suffix="1350">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains_outof="5050;5630">
+ <match key="system.hardware.product" contains="5050">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="3610;3620;3690;5100">
+ <match key="system.hardware.product" contains_outof="3610;3620;3690;5630">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -89,11 +79,25 @@
<match key="system.hardware.product" contains="1640">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="1520;1650;3000;5110;5570;5920">
+ <match key="system.hardware.product" contains="1500">
+ <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="1520;1650;3000;5100;5110;5570;5920">
+ <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_outof="1690;1694">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" suffix="1350">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="3100;5500Z;5580">
+ <match key="system.hardware.product" contains_outof="2920;3100;5500Z;5580">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -102,7 +106,7 @@
<match key="system.hardware.product" contains="6220">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="2900;4150;5620">
+ <match key="system.hardware.product" contains_outof="2900;3000;4150;5620">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -128,6 +132,13 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
+
+ <match key="system.hardware.product" prefix="AcerPower">
+ <match key="system.hardware.product" contains="2000">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+
</match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -15,6 +15,7 @@
</match>
<match key="system.hardware.product" string_outof="MacBook1,1;MacBook3,1">
+ <!-- s2ram uses vbe_post + vbemode_restore for MacBook1,1 -->
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -26,11 +27,6 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <!-- works only from X -->
- <match key="system.hardware.product" string="MacBookPro4,1">
- <merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
-
</match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -13,18 +13,22 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="A6M;Z84F">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <match key="system.hardware.product" string="F3Sc">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="L3000D;M3N ;U3S ">
+ <match key="system.hardware.product" prefix_outof="A6M;Z84F">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="W7J">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" prefix_outof="L3000D;M3N ;U3S ;X51RL ">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
<!-- Z91E is identified as A3E -->
- <match key="system.hardware.product" prefix_outof="A6J;A6U;A3E;F3JP">
+ <match key="system.hardware.product" prefix_outof="A6J ;A6U;A3E;F3JP">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -34,7 +38,7 @@
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
</match>
<!-- these need no quirks, whitelist them -->
- <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6K ;A6T;A6G;A6VA;F3T;K8V-MX">
+ <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;F3Sg;F3T;F9E ;G1S;K8V-MX">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -61,20 +65,25 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- another ASUS Mainboard -->
- <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603">
+ <merge key="power_managiement.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.firmware.version" prefix="ASUS M2A-VM ACPI BIOS Revision">
+ <match key="system.firmware.version" contains=" 1101">
+ <merge key="power_management.quirk.s2_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ <match key="system.firmware.version" contains_not=" 1101">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
+
<!-- another ASUS Mainboard, this need no quirk -->
<match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision;ASUS A7V ACPI BIOS Revision">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
- <match key="system.hardware.product" string="F3Sc">
- <match key="system.hardware.version" string="1.0">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- </match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -20,10 +20,7 @@
need may dpms_on -->
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="D400">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D430;D520;D530;C610;D620;D830">
+ <match key="system.hardware.product" contains_outof="CPx J800GT;D400;D410;D420;D430;D520;D530;C610;D620;D830">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -71,7 +68,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;5160">
+ <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;5160">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -96,6 +93,10 @@
<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="M6300 ">
+ <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=" M60">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -135,9 +136,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="OptiPlex 755">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+ </match>
<!-- these need no quirks : DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
- <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX260">
+ <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX260;OptiPlex GX620">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-09-30 15:54:50.000000000 +0200
@@ -18,6 +18,9 @@
</match>
<match key="system.hardware.product" prefix="Evo">
+ <match key="system.hardware.product" contains="N600c">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains="N800w ">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<!-- VBE_MODE does not work, text size changes -->
@@ -42,11 +45,11 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="V3000 (EZ674UA#">
+ <match key="system.hardware.product" contains_outof="V3000 (EZ674UA#;V3700 Notebook PC">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E)">
+ <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E);F500 (GF596UA#">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -65,7 +68,7 @@
</match>
<match key="system.hardware.vendor" prefix="Hewlett-Packard">
- <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s">
+ <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="HP OmniBook XT1000">
@@ -79,26 +82,22 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="6710s">
- <match key="system.firmware.version" contains="68DDU">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
- </match>
- </match>
- <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;6510b;2510p">
+ <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;2510p">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
+
<!-- yes, system.hardware.version is correct for this machine -->
<match key="system.hardware.version" string="HP OmniBook 6100 EB">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- Note: PY507ET# is a nc6120 -->
- <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6710b;6720s;2710p;6910p;8510p;PY507ET#;6715b">
+ <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6710b;6720s;2710p;8510p;PY507ET#;6715b">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+
<match key="system.hardware.product" contains="M2000 (EQ547PA">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
@@ -115,6 +114,68 @@
</match>
</match>
</match>
+ <match key="system.hardware.product" contains="nx 7010">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <match key="system.hardware.product" contains="DU394T#">
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
+ <match key="system.hardware.product" contains="nx7400">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <match key="system.firmware.version" contains_not="68YGU">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
+ <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+
+
+ <!-- Handle machines which have the same product string, but differ -->
+ <match key="system.hardware.product" contains="6510b">
+ <match key="system.hardware.product" contains="KE134EA">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" contains_not="KE134EA">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+ </match>
+ <match key="system.hardware.product" contains="6710s">
+ <match key="system.firmware.version" contains="68DDU">
+ <match key="system.hardware.product" contains="GC014ET">
+ <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_not="GC014ET">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ <match key="system.hardware.product" contains="6715b">
+ <match key="system.hardware.product" contains_outof="GB835EA;RK156AV">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" contains="GB834EA">
+ <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="RM174UT">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
+ <match key="system.hardware.product" contains="6910p">
+ <match key="system.firmware.version" contains="68MCD">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ <match key="system.firmware.version" contains_not="68MCD">
+ <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="nc4400">
<match key="system.firmware.version" prefix="68YHV">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -134,20 +195,9 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains="nx 7010">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <match key="system.hardware.product" contains="DU394T#">
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- </match>
- <match key="system.hardware.product" contains="nx7400">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <match key="system.firmware.version" contains_not="68YGU">
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
- </match>
- <match key="system.hardware.product" contains="Pavilion ">
+
+ <match key="system.hardware.product" contains_ncase="Pavilion ">
<match key="system.hardware.product" contains="dv4000 (ES973EA#">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -190,7 +240,7 @@
</match>
</match>
- <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF">
+ <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF;ze4900">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -212,6 +262,9 @@
<match key="system.hardware.product" contains="RZ418AA-ABH s3020">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="RP829AV-ABA d4790y">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-compaq.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-compaq.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-compaq.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-compaq.fdi 2008-09-30 15:53:56.000000000 +0200
@@ -7,7 +7,7 @@
<match key="@input.originating_device:info.linux.driver" string="atkbd">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="E500;Evo N610c">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="E500;Evo N610c;Evo N600c">
<append key="input.keymap.data" type="strlist">e023:www</append> <!-- I key -->
<append key="input.keymap.data" type="strlist">e01a:search</append> <!-- Search key -->
<append key="input.keymap.data" type="strlist">e01e:email</append> <!-- Email -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-dell.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-dell.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -30,6 +30,14 @@
<append key="input.keymap.data" type="strlist">e024:stop</append> <!-- Front panel stop -->
<append key="input.keymap.data" type="strlist">e06d:media</append> <!-- MediaDirect button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="Latitude XT">
+ <append key="input.keymap.data" type="strlist">e058:screenlock</append> <!-- FIXME: Tablet lock button -->
+ <append key="input.keymap.data" type="strlist">e017:email</append> <!-- Tablet email button -->
+ <append key="input.keymap.data" type="strlist">e018:f21</append> <!-- FIXME: Tablet screen rotatation -->
+ <append key="input.keymap.data" type="strlist">e01a:setup</append> <!-- Tablet tools button -->
+ </match>
+
</match>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-hp.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -27,6 +27,11 @@
<append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- Presentation -->
<append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key -->
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6730s">
+ <!-- HP Compaq 6730s -->
+ <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- FnF7 (brightness down) -->
+ <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- FnF8 (brightness up) -->
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p">
<!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
<remove key="input.keymap.data" type="strlist">e059:info</remove>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-lenovo.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-lenovo.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-lenovo.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-lenovo.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -8,6 +8,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="3000">
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F7 video -->
<append key="input.keymap.data" type="strlist">e016:wlan</append> <!-- Fn+F5 wireless -->
<append key="input.keymap.data" type="strlist">e017:sleep</append> <!-- Fn+F4 suspend -->
<append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -50,7 +50,7 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string_outof="0031;0131">
<append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
<append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
<append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8 Volume up -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
--- old/hal-info-20080828/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi 2008-08-28 13:03:56.000000000 +0200
+++ new/hal-info-20080930/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi 2008-09-30 15:42:18.000000000 +0200
@@ -8,7 +8,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
<!-- Older Vaios have a different keymap -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="PCG-C1;PCG-K25;PCG-F1;PCG-F2;PCG-F3;PCG-F4;PCG-F5;PCG-F6;PCG-FX;PCG-FRV;PCG-GR;PCG-TR;PCG-NV;PCG-Z">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="PCG-C1;PCG-K25;PCG-F1;PCG-F2;PCG-F3;PCG-F4;PCG-F5;PCG-F6;PCG-FX;PCG-FRV;PCG-GR;PCG-TR;PCG-NV;PCG-Z;VGN-S360">
<append key="input.keymap.data" type="strlist">0x06:battery</append>
<append key="input.keymap.data" type="strlist">0x07:mute</append>
</match>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org