Hello community,
here is the log from the commit of package hal for openSUSE:Factory
checked in at Fri Dec 19 15:11:36 CET 2008.
--------
--- hal/hal.changes 2008-12-05 15:41:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-12-18 17:29:32.000000000 +0100
@@ -1,0 +2,22 @@
+Thu Dec 18 16:36:48 CET 2008 - dkukawka@suse.de
+
+- updated hal-info to 20081218
+- this update include fixes for:
+ - bnc#459342: add Nokia N810 to USB music players
+ - bnc#450489: add new config option to disable NVIDIA quirks
+ by don't install 21-video-quirk-nvidia.fdi, fixed
+ existing quirk for this machine to get only in
+ place if it's a ATI card
+ - some new keymapping and suspend quirks
+
+-------------------------------------------------------------------
+Mon Dec 15 09:33:14 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (b09774739efe4) of my tree and
+ hal-info to 20081215
+- this update include fixes for:
+ - bnc#458307: fix serial.port handling for USB serial devices
+ - bnc#458414: fix ACL handling for drm devices
+ - some more modems
+
+-------------------------------------------------------------------
hal-doc.changes: same change
calling whatdependson for head-i586
Old:
----
hal-info-20081205.tar.bz2
New:
----
hal-info-20081218.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.D21793/_old 2008-12-19 15:11:04.000000000 +0100
+++ /var/tmp/diff_new_pack.D21793/_new 2008-12-19 15:11:04.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081205
+%define hal_info_version 20081218
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 9
+Release: 10
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
@@ -121,7 +121,7 @@
%if ! %build_doc
%package -n hal-devel
-License: Other uncritical OpenSource License; AFL
+License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
%if 0%{?suse_version} > 1020
@@ -226,6 +226,7 @@
%configure \
--disable-recall \
--disable-video-default-quirks \
+ --disable-video-nvidia-quirks \
%ifarch ppc ppc64 ia64 s390 s390 s390x
--disable-killswitch-dell-bluetooth \
--disable-killswitch-dell-wlan \
@@ -365,6 +366,22 @@
%endif
%changelog
+* Thu Dec 18 2008 dkukawka@suse.de
+- updated hal-info to 20081218
+- this update include fixes for:
+ - bnc#459342: add Nokia N810 to USB music players
+ - bnc#450489: add new config option to disable NVIDIA quirks
+ by don't install 21-video-quirk-nvidia.fdi, fixed
+ existing quirk for this machine to get only in
+ place if it's a ATI card
+ - some new keymapping and suspend quirks
+* Mon Dec 15 2008 dkukawka@suse.de
+- update HAL to latest git (b09774739efe4) of my tree and
+ hal-info to 20081215
+- this update include fixes for:
+ - bnc#458307: fix serial.port handling for USB serial devices
+ - bnc#458414: fix ACL handling for drm devices
+ - some more modems
* Fri Dec 05 2008 dkukawka@suse.de
- update HAL to latest git (9b564550ad6fba) of my tree and
hal-info to 20081205
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.D21793/_old 2008-12-19 15:11:04.000000000 +0100
+++ /var/tmp/diff_new_pack.D21793/_new 2008-12-19 15:11:04.000000000 +0100
@@ -26,12 +26,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081205
+%define hal_info_version 20081218
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 9
+Release: 10
Url: http://freedesktop.org/Software/hal
-License: GPL v2 or later; AFL
+License: GPL v2 or later; AFL2.0 or GPLv2.0
Group: System/Daemons
AutoReqProv: on
Requires: pm-utils
@@ -120,7 +120,7 @@
%if ! %build_doc
%package -n hal-devel
-License: Other uncritical OpenSource License; AFL
+License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
%if 0%{?suse_version} > 1020
@@ -225,6 +225,7 @@
%configure \
--disable-recall \
--disable-video-default-quirks \
+ --disable-video-nvidia-quirks \
%ifarch ppc ppc64 ia64 s390 s390 s390x
--disable-killswitch-dell-bluetooth \
--disable-killswitch-dell-wlan \
@@ -364,6 +365,22 @@
%endif
%changelog
+* Thu Dec 18 2008 dkukawka@suse.de
+- updated hal-info to 20081218
+- this update include fixes for:
+ - bnc#459342: add Nokia N810 to USB music players
+ - bnc#450489: add new config option to disable NVIDIA quirks
+ by don't install 21-video-quirk-nvidia.fdi, fixed
+ existing quirk for this machine to get only in
+ place if it's a ATI card
+ - some new keymapping and suspend quirks
+* Mon Dec 15 2008 dkukawka@suse.de
+- update HAL to latest git (b09774739efe4) of my tree and
+ hal-info to 20081215
+- this update include fixes for:
+ - bnc#458307: fix serial.port handling for USB serial devices
+ - bnc#458414: fix ACL handling for drm devices
+ - some more modems
* Fri Dec 05 2008 dkukawka@suse.de
- update HAL to latest git (9b564550ad6fba) of my tree and
hal-info to 20081205
++++++ hal-0.5.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog
--- old/hal-0.5.12/ChangeLog 2008-12-05 15:31:00.000000000 +0100
+++ new/hal-0.5.12/ChangeLog 2008-12-15 09:35:06.000000000 +0100
@@ -1,3 +1,44 @@
+commit b09774739efe4215aa03e7812bca8a50be65e2c1
+Author: Danny Kukawka
+Date: Mon Dec 15 08:55:04 2008 +0100
+
+ fixed serial.port handling for USB serial devices
+
+ Fixed serial.port handling for USB serial devices. Since USB devices
+ can have several ports and since the order of /dev/ttyUSB* depends on
+ the device order, it make no sense to base serial.port for USB devices
+ on the number in /dev/ttyUSB*. Here is the port number of the USB
+ device itself more important to detect/match devices.
+
+ Changed the spec description and handling/detection of serial.port for
+ USB serial devices to use device/port_number info from sysfs. This
+ change
+ shouldn't affect existing matches in fdi files (as e.g. for modems) as
+ long as there wheren't more than one USB serial device in the
+ machine as
+ the entry was generated. I imply this for now with this change.
+
+ This change allow us to match e.g. modems also if you put more
+ than one
+ modem with USB serial ports to a machine. For more see:
+ https://bugzilla.novell.com/show_bug.cgi?id=458307
+
+ doc/spec/hal-spec-properties.xml | 5 +++--
+ hald/linux/device.c | 8 +++++++-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+commit a476876bd9f094f94583194d8d208bcb77cd5f49
+Author: Danny Kukawka
+Date: Thu Dec 11 20:11:56 2008 +0100
+
+ fix ACL handling for drm devices
+
+ Fixed ACL handling for drm devices. Use linux.device_file instead
+ of input.device for access_control.file.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
commit b0a2575f13ce9b18d07a2798e0d4c83cbb3059e5
Author: Danny Kukawka
Date: Fri Dec 5 15:19:57 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-11-28 13:53:57.000000000 +0100
+++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-12-15 08:54:46.000000000 +0100
@@ -2883,8 +2883,9 @@
<entry>example: 0</entry>
<entry>Yes</entry>
<entry>
- The port number of the device, based on the number in
- <literal>serial.device</literal>
+ The port number of the device. For USB serial devices it's the port number of the
+ serial device itself. For other serial devices, where is no device port info
+ available, it's based on the number in <literal>serial.device</literal>.
</entry>
</row>
<row>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-11-28 13:08:15.000000000 +0100
+++ new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-12-11 20:11:51.000000000 +0100
@@ -197,7 +197,7 @@
<!-- graphics cards, e.g. for 3d accelleration -->
<match key="info.capabilities" contains="drm">
<append key="info.capabilities" type="strlist">access_control</append>
- <merge key="access_control.file" type="copy_property">input.device</merge>
+ <merge key="access_control.file" type="copy_property">linux.device_file</merge>
<merge key="access_control.type" type="string">video</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/device.c new/hal-0.5.12/hald/linux/device.c
--- old/hal-0.5.12/hald/linux/device.c 2008-12-05 15:07:11.000000000 +0100
+++ new/hal-0.5.12/hald/linux/device.c 2008-12-15 08:51:46.000000000 +0100
@@ -3102,8 +3102,14 @@
hal_device_property_get_string (parent_dev, "info.product"));
} else if (sscanf (last_elem, "ttyUSB%d", &portnum) == 1) {
HalDevice *usbdev;
+ int port_number;
- hal_device_property_set_int (d, "serial.port", portnum);
+ /* try to get the port number of the device and not of the whole USB subsystem */
+ if (hal_util_get_int_from_file (sysfs_path, "device/port_number", &port_number, 10)) {
+ hal_device_property_set_int (d, "serial.port", port_number);
+ } else {
+ hal_device_property_set_int (d, "serial.port", portnum);
+ }
hal_device_property_set_string (d, "serial.type", "usb");
usbdev = hal_device_store_find (hald_get_gdl (),
++++++ hal-info-20081205.tar.bz2 -> hal-info-20081218.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/ChangeLog new/hal-info-20081218/ChangeLog
--- old/hal-info-20081205/ChangeLog 2008-12-05 15:41:26.000000000 +0100
+++ new/hal-info-20081218/ChangeLog 2008-12-18 17:06:16.000000000 +0100
@@ -1,3 +1,114 @@
+commit 102e7cc5b379143d219ba7fbd72752f85f08aeb3
+Author: Danny Kukawka
+Date: Thu Dec 18 17:03:55 2008 +0100
+
+ fix suspend quirk for HP Compaq 8510
+
+ Fixed suspend quirk for HP Compaq 8510. This machine is available
+ with ATI and NVIDIA graphic cards, changed quirk to get added only if
+ the machine use a ATI card.
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 43dc4bbe5ff288bf690424beedc9a8b56b11f4cd
+Author: Danny Kukawka
+Date: Thu Dec 18 16:29:36 2008 +0100
+
+ add new configure option --enable-video-nvidia-quirks
+
+ Add new configure option --enable-video-nvidia-quirks to be able
+ to prevent get 21-video-quirk-nvidia.fdi installed which may cause
+ trouble on systems which don't support this quirks.
+
+ configure.in | 9 ++++++++-
+ fdi/information/10freedesktop/Makefile.am | 7 +++++--
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 58afb713937908da6a38c397df6c9a1e44727251
+Author: Daniel Gollub
+Date: Thu Dec 18 16:11:54 2008 +0100
+
+ add Nokia N810 to USB music players
+
+ Added Nokia N810 to USB music players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6e9d1672772670e63f6c19020f3cb9a2614cc073
+Author: Danny Kukawka
+Date: Thu Dec 18 15:56:46 2008 +0100
+
+ add suspend quirk for IBM Thinkpad R52-18472GU
+
+ Added suspend quirk for IBM Thinkpad R52-18472GU as reported by
+ Bart Rose .
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d61ea8f51fd82f93b8808a955817b91dac023341
+Author: Julian Sikorski
+Date: Tue Dec 16 08:52:23 2008 +0000
+
+ correct satellite a100 keymapping
+
+ it seems that the mapping in 30-keymap-misc.fdi for toshiba satellite
+ a100 is incorrect. It maps the stop key (white rectangle) to stop,
+ which gets translated by X to Cancel, while the proper mapping
+ would be
+ stopcd, which gets properly mapped to XF86AudioStop. Trivial patch
+ attached.
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5aaaf7cdadfdad4d1aa661739c9f43deaade8124
+Author: Tomasz Dominikowski
+Date: Fri Dec 5 16:22:14 2008 -0800
+
+ add a bunch of Nokia mobile modems
+
+ Add support for the following Nokia E-series and N-series as modems:
+
+ E61i/E60/N93/N71/N77/N90/N91/N80/E62/N76/N73/N92/N72/E50/N75/N93i/E65/N78
+
+ This I believe is only missing N85 for complete N and E-series
+ support, but I couldn't find a phone or any information about the
+ product ID. Anyway, will attach the patch. Hopefully this goes
+ upstream as the other ones.
+
+ Nokia Nseries and Eseries are all S60 Symbian phones, they all provide
+ the same modem functionality. The NNNN model numbering scheme would
+ also work as modems, but adding them should follow some testing, as
+ most of them are S40, not S60 phones.
+
+ This was taken mostly from http://listing.driveragent.com/usb/0421 and
+ other websites (cross-referencing the findings to make sure this is
+ the real deal) and my own sources.
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1627a80ed511433d4ba4e0d70b3227b59d510cc0
+Author: Dan Williams
+Date: Fri Dec 5 13:14:41 2008 -0500
+
+ modem: add ZTE MF626
+
+ fdi/information/10freedesktop/10-modem.fdi | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 8912ec2b5d0a221a74156c047b18a26b2d916e13
+Author: Dan Williams
+Date: Fri Dec 5 13:09:02 2008 -0500
+
+ modem: add Sierra MC8790
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
commit 6c4e55ad8798c84ae96ca00bf3ef9a3752e0ee0f
Author: Danny Kukawka
Date: Fri Dec 5 15:38:10 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/configure new/hal-info-20081218/configure
--- old/hal-info-20081205/configure 2008-12-05 15:32:44.000000000 +0100
+++ new/hal-info-20081218/configure 2008-12-18 17:06:01.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20081205.
+# Generated by GNU Autoconf 2.61 for hal-info 20081218.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20081205'
-PACKAGE_STRING='hal-info 20081205'
+PACKAGE_VERSION='20081218'
+PACKAGE_STRING='hal-info 20081218'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -659,6 +659,8 @@
BUILD_RECALL_FALSE
BUILD_VIDEO_TRUE
BUILD_VIDEO_FALSE
+BUILD_VIDEO_NVIDIA_QUIRKS_TRUE
+BUILD_VIDEO_NVIDIA_QUIRKS_FALSE
BUILD_VIDEO_DEFAULT_QUIRKS_TRUE
BUILD_VIDEO_DEFAULT_QUIRKS_FALSE
BUILD_KEYMAPS_TRUE
@@ -1191,7 +1193,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal-info 20081205 to adapt to many kinds of systems.
+\`configure' configures hal-info 20081218 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1257,7 +1259,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20081205:";;
+ short | recursive ) echo "Configuration of hal-info 20081218:";;
esac
cat <<\_ACEOF
@@ -1268,7 +1270,8 @@
--enable-dependency-tracking do not reject slow dependency extractors
--enable-recall include recall data
--enable-video include video suspend data
- --enable-video-default-quirks include video suspend data
+ --enable-video-nvidia-quirks include NVIDIA video suspend data
+ --enable-video-default-quirks include default video suspend data
--enable-keymaps include key mapping data
--enable-killswitch-dell-wlan Include support for Dell WLAN killswitch
--enable-killswitch-dell-bluetooth Include support for Dell Bluetooth killswitch
@@ -1352,7 +1355,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20081205
+hal-info configure 20081218
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1366,7 +1369,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20081205, which was
+It was created by hal-info $as_me 20081218, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2056,7 +2059,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20081205
+ VERSION=20081218
cat >>confdefs.h <<_ACEOF
@@ -3469,6 +3472,22 @@
# Check whether --enable-video_default_quirks was given.
if test "${enable_video_default_quirks+set}" = set; then
+ enableval=$enable_video_default_quirks; enable_video_nvidia_quirks=$enableval
+else
+ enable_video_nvidia_quirks=yes
+fi
+
+ if test x$enable_video_nvidia_quirks == xyes; then
+ BUILD_VIDEO_NVIDIA_QUIRKS_TRUE=
+ BUILD_VIDEO_NVIDIA_QUIRKS_FALSE='#'
+else
+ BUILD_VIDEO_NVIDIA_QUIRKS_TRUE='#'
+ BUILD_VIDEO_NVIDIA_QUIRKS_FALSE=
+fi
+
+
+# Check whether --enable-video_default_quirks was given.
+if test "${enable_video_default_quirks+set}" = set; then
enableval=$enable_video_default_quirks; enable_video_default_quirks=$enableval
else
enable_video_default_quirks=yes
@@ -3737,6 +3756,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_VIDEO_NVIDIA_QUIRKS_TRUE}" && test -z "${BUILD_VIDEO_NVIDIA_QUIRKS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_VIDEO_NVIDIA_QUIRKS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_VIDEO_NVIDIA_QUIRKS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_VIDEO_DEFAULT_QUIRKS_TRUE}" && test -z "${BUILD_VIDEO_DEFAULT_QUIRKS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_VIDEO_DEFAULT_QUIRKS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -4100,7 +4126,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20081205, which was
+This file was extended by hal-info $as_me 20081218, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4153,7 +4179,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20081205
+hal-info config.status 20081218
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4421,6 +4447,8 @@
BUILD_RECALL_FALSE!$BUILD_RECALL_FALSE$ac_delim
BUILD_VIDEO_TRUE!$BUILD_VIDEO_TRUE$ac_delim
BUILD_VIDEO_FALSE!$BUILD_VIDEO_FALSE$ac_delim
+BUILD_VIDEO_NVIDIA_QUIRKS_TRUE!$BUILD_VIDEO_NVIDIA_QUIRKS_TRUE$ac_delim
+BUILD_VIDEO_NVIDIA_QUIRKS_FALSE!$BUILD_VIDEO_NVIDIA_QUIRKS_FALSE$ac_delim
BUILD_VIDEO_DEFAULT_QUIRKS_TRUE!$BUILD_VIDEO_DEFAULT_QUIRKS_TRUE$ac_delim
BUILD_VIDEO_DEFAULT_QUIRKS_FALSE!$BUILD_VIDEO_DEFAULT_QUIRKS_FALSE$ac_delim
BUILD_KEYMAPS_TRUE!$BUILD_KEYMAPS_TRUE$ac_delim
@@ -4435,8 +4463,6 @@
BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE$ac_delim
BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE!$BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE$ac_delim
BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE$ac_delim
-BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim
-BUILD_KILLSWITCH_IPW_WLAN_FALSE!$BUILD_KILLSWITCH_IPW_WLAN_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -4478,13 +4504,15 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim
+BUILD_KILLSWITCH_IPW_WLAN_FALSE!$BUILD_KILLSWITCH_IPW_WLAN_FALSE$ac_delim
BUILD_KILLSWITCH_IWL_WLAN_TRUE!$BUILD_KILLSWITCH_IWL_WLAN_TRUE$ac_delim
BUILD_KILLSWITCH_IWL_WLAN_FALSE!$BUILD_KILLSWITCH_IWL_WLAN_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -5102,6 +5130,7 @@
hardware recall data: ${enable_recall}
video suspend data: ${enable_video}
video suspend default quirks: ${enable_video_default_quirks}
+ video suspend default NVIDIA quirks: ${enable_video_nvidia_quirks}
killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/configure.in new/hal-info-20081218/configure.in
--- old/hal-info-20081205/configure.in 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/configure.in 2008-12-18 17:05:40.000000000 +0100
@@ -31,7 +31,13 @@
dnl ---------------------------------------------------------------------------
dnl - Should we ship the video suspend data
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(video_default_quirks, [ --enable-video-default-quirks include video suspend data],enable_video_default_quirks=$enableval,enable_video_default_quirks=yes)
+AC_ARG_ENABLE(video_default_quirks, [ --enable-video-nvidia-quirks include NVIDIA video suspend data],enable_video_nvidia_quirks=$enableval,enable_video_nvidia_quirks=yes)
+AM_CONDITIONAL(BUILD_VIDEO_NVIDIA_QUIRKS, test x$enable_video_nvidia_quirks == xyes)
+
+dnl ---------------------------------------------------------------------------
+dnl - Should we ship the video suspend data
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(video_default_quirks, [ --enable-video-default-quirks include default video suspend data],enable_video_default_quirks=$enableval,enable_video_default_quirks=yes)
AM_CONDITIONAL(BUILD_VIDEO_DEFAULT_QUIRKS, test x$enable_video_default_quirks == xyes)
dnl ---------------------------------------------------------------------------
@@ -113,6 +119,7 @@
hardware recall data: ${enable_recall}
video suspend data: ${enable_video}
video suspend default quirks: ${enable_video_default_quirks}
+ video suspend default NVIDIA quirks: ${enable_video_nvidia_quirks}
killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081218/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20081205/fdi/information/10freedesktop/10-modem.fdi 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/10-modem.fdi 2008-12-18 17:05:40.000000000 +0100
@@ -40,8 +40,8 @@
<!-- Nokia -->
<match key="@info.parent:usb.vendor_id" int="0x421">
- <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82/N82 (alternate chip)/E66 -->
- <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0">
+ <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82/N82 (alternate chip)/E66/E61i/E60/N93/N71/N77/N90/N91/N80/E62/N76/N73/N92/N72/E50/N75/N93i/E65/N78 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0;0x01;0x419;0x420;0x425;0x00e;0x432;0x42f;0x445;0x475;0x481;0x486;0x48e;0x4c4;0x4c9;0x4df;0x04e6;0x508;0x078">
<match key="@info.parent:usb.interface.class" int="0x02">
<match key="@info.parent:usb.interface.subclass" int="0x02">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
@@ -194,8 +194,8 @@
</match>
</match>
</match>
- <!-- 2x MC8755,MC8765,MC8775 & AC 875U,MC8775,AirCard 875,MC8780,MC8781,AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, Aircard 880 U, AirCard 881 -->
- <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856">
+ <!-- 2x MC8755,MC8765,MC8775 & AC 875U,MC8775,AirCard 875,MC8780,MC8781, AirCard MC8790, AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, Aircard 880 U, AirCard 881 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x683c;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856">
<match key="@info.parent:usb.interface.number" int="0">
<match key="serial.port" int="0">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
@@ -289,6 +289,13 @@
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
+ <!-- ZTE MF626 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x2000">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
<!-- ZTE MF628 HSDPA USB dongle -->
<match key="@info.parent:usb.product_id" int="0x0015">
<match key="@info.parent:usb.interface.number" int="3">
@@ -297,7 +304,7 @@
</match>
</match>
<!-- ONDA MF632 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x002">
+ <match key="@info.parent:usb.product_id" int="0x0002">
<match key="@info.parent:usb.interface.number" int="2">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081218/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20081205/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-12-18 17:05:40.000000000 +0100
@@ -75,8 +75,8 @@
<!-- Nokia -->
<match key="@storage.originating_device:usb.vendor_id" int="0x421">
- <!-- Nokia 770, N800 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x431;0x4c3">
+ <!-- Nokia 770, N800, N810 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x431;0x4c3;0x96">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-12-18 17:05:40.000000000 +0100
@@ -68,9 +68,14 @@
</match>
<match key="system.hardware.vendor" prefix="Hewlett-Packard">
- <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s; 8510w">
+ <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=" 8510w">
+ <match key="system.hardware.primary_video.vendor" int="0x1002">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
+ </match>
<match key="system.hardware.product" contains="HP OmniBook XT1000">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
--- old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-12-18 17:05:40.000000000 +0100
@@ -67,7 +67,7 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- R52 ATI Mobility Radeon X300, G41 -->
- <match key="system.hardware.product" prefix_outof="1846;2886">
+ <match key="system.hardware.product" prefix_outof="1846;1847;2886">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20081218/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20081205/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-12-05 15:31:18.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-12-18 17:05:40.000000000 +0100
@@ -136,7 +136,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE A100">
- <append key="input.keymap.data" type="strlist">e024:stop</append>
+ <append key="input.keymap.data" type="strlist">e024:stopcd</append>
<append key="input.keymap.data" type="strlist">e032:www</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Satellite A110">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/Makefile.am new/hal-info-20081218/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20081205/fdi/information/10freedesktop/Makefile.am 2008-12-05 15:30:51.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/Makefile.am 2008-12-18 17:05:40.000000000 +0100
@@ -65,8 +65,11 @@
20-video-quirk-pm-misc.fdi \
20-video-quirk-pm-samsung.fdi \
20-video-quirk-pm-sony.fdi \
- 20-video-quirk-pm-toshiba.fdi \
- 21-video-quirk-nvidia.fdi
+ 20-video-quirk-pm-toshiba.fdi
+
+if BUILD_VIDEO_NVIDIA_QUIRKS
+dist_fdi_DATA += 21-video-quirk-nvidia.fdi
+endif
if BUILD_VIDEO_DEFAULT_QUIRKS
dist_fdi_DATA += 99-video-quirk-default.fdi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/Makefile.in new/hal-info-20081218/fdi/information/10freedesktop/Makefile.in
--- old/hal-info-20081205/fdi/information/10freedesktop/Makefile.in 2008-12-05 15:32:42.000000000 +0100
+++ new/hal-info-20081218/fdi/information/10freedesktop/Makefile.in 2008-12-18 17:06:00.000000000 +0100
@@ -57,11 +57,11 @@
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-misc.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-samsung.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-sony.fdi \
-@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi \
-@BUILD_VIDEO_TRUE@ 21-video-quirk-nvidia.fdi
+@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi
-@BUILD_VIDEO_DEFAULT_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_10 = 99-video-quirk-default.fdi
-@BUILD_KEYMAPS_TRUE@am__append_11 = \
+@BUILD_VIDEO_NVIDIA_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_10 = 21-video-quirk-nvidia.fdi
+@BUILD_VIDEO_DEFAULT_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_11 = 99-video-quirk-default.fdi
+@BUILD_KEYMAPS_TRUE@am__append_12 = \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-sony-laptop.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-thinkpad-acpi.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-misc.fdi \
@@ -211,7 +211,8 @@
10-usb-obex.fdi $(am__append_1) $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_6) $(am__append_7) $(am__append_8) \
- $(am__append_9) $(am__append_10) $(am__append_11)
+ $(am__append_9) $(am__append_10) $(am__append_11) \
+ $(am__append_12)
all: all-am
.SUFFIXES:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org