Hello community,
here is the log from the commit of package hal for openSUSE:Factory
checked in at Fri Jul 17 17:16:44 CEST 2009.
--------
--- hal/hal-doc.changes 2009-07-10 16:24:31.000000000 +0200
+++ hal/hal-doc.changes 2009-07-17 17:15:38.040697000 +0200
@@ -1,0 +2,17 @@
+Thu Jul 16 12:42:31 CEST 2009 - kay.sievers@novell.com
+
+- update to 20090716 hal-info database
+ - various suspend quirks for specific hardware
+ - new audio player entries
+ - 3g modem entries
+
+-------------------------------------------------------------------
+Wed Jul 15 14:57:01 CEST 2009 - kay.sievers@novell.com
+
+- update from git HEAD to released version 0.5.13
+ - work aroud crash caused by LED device handling
+ - add support for devices on the SSB bus
+ - add suport for /sys/bus/ibmebus
+- enable verbose build (AM_SILENT_RULES)
+
+-------------------------------------------------------------------
hal.changes: same change
calling whatdependson for head-i586
Old:
----
HEAD.patch
hal-0.5.12.tar.bz2
hal-info-20090414.tar.bz2
New:
----
hal-0.5.13.tar.bz2
hal-info-20090716.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.hoU551/_old 2009-07-17 17:15:47.000000000 +0200
+++ /var/tmp/diff_new_pack.hoU551/_new 2009-07-17 17:15:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.12)
+# spec file for package hal-doc (Version 0.5.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,9 +26,9 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090414
-Version: 0.5.12
-Release: 27
+%define hal_info_version 20090716
+Version: 0.5.13
+Release: 1
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later ; AFL2.0 or GPLv2.0
Group: System/Daemons
@@ -59,7 +59,6 @@
Source3: pre_checkin.sh
Source50: hal-doc-rpmlintrc
Source60: hal-rpmlintrc
-Patch1: HEAD.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -104,11 +103,11 @@
%prep
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
-%patch1 -p1
pushd hal-info-%{hal_info_version}
popd
%build
+export V=1
autoreconf -fi
%configure \
--libexecdir=%{_prefix}/lib/hal \
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.hoU551/_old 2009-07-17 17:15:47.000000000 +0200
+++ /var/tmp/diff_new_pack.hoU551/_new 2009-07-17 17:15:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.12)
+# spec file for package hal (Version 0.5.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,9 +26,9 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20090414
-Version: 0.5.12
-Release: 27
+%define hal_info_version 20090716
+Version: 0.5.13
+Release: 1
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later ; AFL2.0 or GPLv2.0
Group: System/Daemons
@@ -59,7 +59,6 @@
Source3: pre_checkin.sh
Source50: hal-doc-rpmlintrc
Source60: hal-rpmlintrc
-Patch1: HEAD.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -104,11 +103,11 @@
%prep
%setup -n hal-%{version} -a1
chmod 644 tools/hal-functions
-%patch1 -p1
pushd hal-info-%{hal_info_version}
popd
%build
+export V=1
autoreconf -fi
%configure \
--libexecdir=%{_prefix}/lib/hal \
++++++ hal-0.5.12.tar.bz2 -> hal-0.5.13.tar.bz2 ++++++
++++ 1795 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/NEWS new/hal-0.5.13/NEWS
--- old/hal-0.5.12/NEWS 2009-05-12 12:52:00.000000000 +0200
+++ new/hal-0.5.13/NEWS 2009-07-15 09:08:18.000000000 +0200
@@ -1,4 +1,92 @@
==========
+HAL 0.5.13
+==========
+
+Released July 15, 2009.
+
+Requirements for HAL 0.5.13:
+
+ - Linux kernel >= 2.6.22 (CONFIG_SYSFS_DEPRECATED=n)
+ - udev >= 125 (Linux only)
+ - util-linux-ng >= 2.15
+ - bash >= 2.0
+ - dbus >= 0.61 (with glib bindings)
+ - glib >= 2.10.0
+ - expat >= 1.95.8
+ - hal-info >= 20080310 (older versions can work too)
+ - libusb >= 0.1.10a (optional)
+ - pciutils >= 2.2.3 (optional)
+ - dmidecode >= 2.7 (optional)
+ - parted >= 1.7.1 (optional)
+ - cryptsetup-luks >= 1.0.1 (optional, needs LUKS patches)
+ - libsmbios >= 0.13.4 (optional, for DELL machines, Linux only,
+ prefered version >= 2.0.3)
+ - dellWirelessCtl >= 0.13.4 (optional, for Dell machines, must live in
+ /usr/bin/, Linux only, prefered version >= 2.0.3)
+ - gperf >= 3.0.3-2 (optional, for Re-map multimedia keys,
+ Linux only)
+ - PolicyKit >= 0.5 (optional)
+ - ConsoleKit >= 0.2.0 (optional, needed if use PolicyKit)
+ - pm-utils >= 0.99.2 or newer (optional)
+
+Contributors to HAL 0.5.13:
+
+Andrey Borzenkov (1):
+ work aroud crash caused by LED device handling
+
+Aurelien Jarno (4):
+ use the "freebsd" backend on GNU/kFreeBSD
+ fix compilation of hald/freebsd/hf-storage.c
+ disable power-pmu and sonypic if __FreeBSD_kernel__ is defined
+ hald/freebsd/libprobe/hfp-cdrom.h: use C99 types
+
+Chris Coulson (1):
+ fix crash when assembling certain MD devices
+
+Danny Kukawka (14):
+ remove special serial tablet handling for HP tc4200
+ set default udev_prefix to ${exec_prefix}/lib in configure.in
+ define new (sub-)namespace(s) for smart card reader
+ define ACL and device-access policy for smart_card_reader
+ ignore ADD events if there is already a device with same sysfs_path
+ fix sound_compute_udi(): sound.card is int and not a string
+ Revert "add ACL policy for smartcard readers"
+ added new properties: org.freedesktop.Hal.version(.*)
+ fixed compiler warning
+ cleaned up hal-storage-mount code
+
+Kay Sievers (4):
+ remove broken ASCII 240 chars from C files
+ probe-volume: remove needless check for empty fstype
+ use $libexecdir not $libdir/hal to define private hal directory
+ use AM_SILENT_RULES if available
+
+Martin Pitt (7):
+ post-release bump for 0.5.13
+ add ACL policy for smartcard readers
+ add hal-set-property --direct
+ addon-acpi.c: Support acpid
+ [BSD] use instead of
+ 10-x11-input.fdi: Add tablets
+ add input.keys capability to input buttons
+
+Matthew Garrett (1):
+ add support for devices on the SSB bus
+
+Michael Meeks (1):
+ optimize resolve_udiprop_path()
+
+Pavan Naregundi (1):
+ add suport for /sys/bus/ibmebus
+
+Simon Munton (1):
+ fixed segfault in hal-storage-mount
+
+Thadeu Lima de Souza Cascardo (1):
+ addon-input: add KEY_ZOOM
+
+
+==========
HAL 0.5.12
==========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/configure.in new/hal-0.5.13/configure.in
--- old/hal-0.5.12/configure.in 2009-05-10 21:43:52.000000000 +0200
+++ new/hal-0.5.13/configure.in 2009-07-15 08:52:51.000000000 +0200
@@ -7,9 +7,10 @@
#
AC_PREREQ(2.59c)
-AC_INIT(hal, 0.5.12, david@fubar.dk)
+AC_INIT(hal, 0.5.13, david@fubar.dk)
AM_INIT_AUTOMAKE([gnu 1.9])
AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
dbus_module="dbus-1 >= 0.61"
@@ -76,7 +77,7 @@
AC_ARG_WITH(udev-prefix,
AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
- [], [with_udev_prefix='${exec_prefix}'])
+ [], [with_udev_prefix='${exec_prefix}/lib'])
udev_prefix=$with_udev_prefix
AC_SUBST(udev_prefix)
@@ -488,7 +489,7 @@
*-*-solaris*)
HALD_BACKEND="solaris"
;;
- *-*-freebsd*)
+ *-*-freebsd* | *-*-kfreebsd*-gnu)
HALD_BACKEND="freebsd"
;;
*-linux*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/html/index.html new/hal-0.5.13/doc/api/libhal/html/index.html
--- old/hal-0.5.12/doc/api/libhal/html/index.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/html/index.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>HAL Client Library Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Client Library Reference Manual">
<link rel="next" href="rn01.html" title="API Reference">
<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
@@ -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.12
+<div><p class="releaseinfo">Version 0.5.13
</p></div>
<div><p class="copyright">Copyright © 2007 The HAL Authors</p></div>
<div><div class="legalnotice" title="Legal Notice">
-<a name="id489342"></a><p>
+<a name="id336801"></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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/html/ix01.html new/hal-0.5.13/doc/api/libhal/html/ix01.html
--- old/hal-0.5.12/doc/api/libhal/html/ix01.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/html/ix01.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Client Library Reference Manual">
<link rel="up" href="index.html" title="HAL Client Library Reference Manual">
<link rel="prev" href="libhal-libhal.html" title="libhal">
@@ -24,7 +24,7 @@
</tr></table>
<div class="index" title="Index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id458916"></a>Index</h2></div></div></div>
+<a name="id306349"></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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/html/libhal-libhal.html new/hal-0.5.13/doc/api/libhal/html/libhal-libhal.html
--- old/hal-0.5.12/doc/api/libhal/html/libhal-libhal.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/html/libhal-libhal.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>libhal</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Client Library Reference Manual">
<link rel="up" href="rn01.html" title="API Reference">
<link rel="prev" href="rn01.html" title="API Reference">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/html/license.html new/hal-0.5.13/doc/api/libhal/html/license.html
--- old/hal-0.5.12/doc/api/libhal/html/license.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/html/license.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Appendix A. License</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Client Library Reference Manual">
<link rel="up" href="index.html" title="HAL Client Library Reference Manual">
<link rel="prev" href="ix01.html" title="Index">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/html/rn01.html new/hal-0.5.13/doc/api/libhal/html/rn01.html
--- old/hal-0.5.12/doc/api/libhal/html/rn01.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/html/rn01.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Client Library Reference Manual">
<link rel="up" href="index.html" title="HAL Client Library Reference Manual">
<link rel="prev" href="index.html" title="HAL Client Library Reference Manual">
@@ -25,7 +25,7 @@
<div class="reference" title="API Reference">
<div class="titlepage">
<div><div><h1 class="title">
-<a name="id458897"></a>API Reference</h1></div></div>
+<a name="id306330"></a>API Reference</h1></div></div>
<hr>
</div>
<div class="partintro" title="API Reference">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal/version.xml new/hal-0.5.13/doc/api/libhal/version.xml
--- old/hal-0.5.12/doc/api/libhal/version.xml 2009-05-12 12:55:29.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal/version.xml 2009-07-15 09:03:40.000000000 +0200
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/index.html new/hal-0.5.13/doc/api/libhal-storage/html/index.html
--- old/hal-0.5.12/doc/api/libhal-storage/html/index.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/index.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>HAL Storage Library Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="next" href="rn01.html" title="API Reference">
<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
@@ -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.12
+<div><p class="releaseinfo">Version 0.5.13
</p></div>
<div><p class="copyright">Copyright © 2007 The HAL Authors</p></div>
<div><div class="legalnotice" title="Legal Notice">
-<a name="id451488"></a><p>
+<a name="id415250"></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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/ix01.html new/hal-0.5.13/doc/api/libhal-storage/html/ix01.html
--- old/hal-0.5.12/doc/api/libhal-storage/html/ix01.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/ix01.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="up" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="prev" href="libhal-storage-libhal-storage.html" title="libhal-storage">
@@ -24,7 +24,7 @@
</tr></table>
<div class="index" title="Index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id421062"></a>Index</h2></div></div></div>
+<a name="id384799"></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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html new/hal-0.5.13/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html
--- old/hal-0.5.12/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>libhal-storage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="up" href="rn01.html" title="API Reference">
<link rel="prev" href="rn01.html" title="API Reference">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/license.html new/hal-0.5.13/doc/api/libhal-storage/html/license.html
--- old/hal-0.5.12/doc/api/libhal-storage/html/license.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/license.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Appendix A. License</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="up" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="prev" href="ix01.html" title="Index">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/rn01.html new/hal-0.5.13/doc/api/libhal-storage/html/rn01.html
--- old/hal-0.5.12/doc/api/libhal-storage/html/rn01.html 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/rn01.html 2009-07-15 09:09:29.000000000 +0200
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="up" href="index.html" title="HAL Storage Library Reference Manual">
<link rel="prev" href="index.html" title="HAL Storage Library Reference Manual">
@@ -25,7 +25,7 @@
<div class="reference" title="API Reference">
<div class="titlepage">
<div><div><h1 class="title">
-<a name="id421043"></a>API Reference</h1></div></div>
+<a name="id384780"></a>API Reference</h1></div></div>
<hr>
</div>
<div class="partintro" title="API Reference">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/html/version.xml new/hal-0.5.13/doc/api/libhal-storage/html/version.xml
--- old/hal-0.5.12/doc/api/libhal-storage/html/version.xml 2009-05-12 12:58:47.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/html/version.xml 2009-07-15 09:09:29.000000000 +0200
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/api/libhal-storage/version.xml new/hal-0.5.13/doc/api/libhal-storage/version.xml
--- old/hal-0.5.12/doc/api/libhal-storage/version.xml 2009-05-12 12:55:29.000000000 +0200
+++ new/hal-0.5.13/doc/api/libhal-storage/version.xml 2009-07-15 09:03:40.000000000 +0200
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/spec/hal-spec-access-control.xml new/hal-0.5.13/doc/spec/hal-spec-access-control.xml
--- old/hal-0.5.12/doc/spec/hal-spec-access-control.xml 2009-02-04 23:07:23.000000000 +0100
+++ new/hal-0.5.13/doc/spec/hal-spec-access-control.xml 2009-05-15 18:28:34.000000000 +0200
@@ -138,6 +138,14 @@
</row>
<row>
<entry>
+ <literal>smart-card-reader</literal>
+ </entry>
+ <entry>Directly access Smart Card Reader security devices.</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
+ </row>
+ <row>
+ <entry>
<literal>joystick</literal>
</entry>
<entry>Directly access Joystick devices.</entry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.13/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/doc/spec/hal-spec-properties.xml 2009-05-27 22:26:03.000000000 +0200
@@ -12,6 +12,64 @@
can catch.
</para>
+ <sect1 id="device-properties-hal">
+ <title>
+ org.freedesktop.Hal namespace
+ </title>
+ <para>
+ The <literal>org.freedesktop.Hal</literal> namespace contain properties that
+ can be considered metadata about HAL itself and not about device objects. They
+ are only available at the root object (<literal>/org/freedesktop/Hal/devices/computer</literal>)
+ and allow to query information about HAL from fdi files.
+ </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Key (type)</entry>
+ <entry>Values</entry>
+ <entry>Mandatory</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <literal>org.freedesktop.Hal.version</literal> (string)
+ </entry>
+ <entry>example: 0.5.13</entry>
+ <entry>Yes</entry>
+ <entry>The version number of the running HAL daemon.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>org.freedesktop.Hal.version.major</literal> (int)
+ </entry>
+ <entry>example: 0</entry>
+ <entry>Yes</entry>
+ <entry>The major version number of the running HAL daemon.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>org.freedesktop.Hal.version.minor</literal> (int)
+ </entry>
+ <entry>example: 5</entry>
+ <entry>Yes</entry>
+ <entry>The minor version number of the running HAL daemon.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>org.freedesktop.Hal.version.micro</literal> (int)
+ </entry>
+ <entry>example: 13</entry>
+ <entry>Yes</entry>
+ <entry>The micro version number of the running HAL daemon.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
<sect1 id="properties-general">
<title>General Properties</title>
<para>
@@ -19,6 +77,7 @@
physical or functional characteristics of what the device
object represents.
</para>
+
<sect2 id="device-properties-info">
<title>
info namespace
@@ -6248,6 +6307,41 @@
</informaltable>
</sect2>
+ <sect2 id="device-properties-smart_card_reader">
+ <title>
+ smart_card_reader namespace
+ </title>
+ <para>
+ Device objects with the capability <literal>smart_card_reader</literal> represent
+ a smart card device/systems (e.g. smart card reader) . No namespace specific
+ properties.
+ </para>
+ </sect2>
+
+ <sect2 id="device-properties-smart_card_reader-card_reader">
+ <title>
+ smart_card_reader.card_reader namespace
+ </title>
+ <para>
+ Device objects with the capabilities <literal>smart_card_reader</literal>
+ and <literal>smart_card_reader.card_reader</literal> represent a
+ smart card reader. No namespace specific properties.
+ </para>
+ </sect2>
+
+ <sect2 id="device-properties-smart_card_reader-crypto_token">
+ <title>
+ smart_card_reader.crypto_token namespace
+ </title>
+ <para>
+ Device objects with the capabilities <literal>smart_card_reader</literal> and
+ <literal>smart_card_reader.crypto_token</literal> represent a smart token, a
+ device where the smart card and the smart card reader are in one device. No
+ namespace specific properties.
+ </para>
+ </sect2>
+
+
<sect2 id="device-properties-storage">
<title>
storage namespace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/spec/hal-spec.xml.in new/hal-0.5.13/doc/spec/hal-spec.xml.in
--- old/hal-0.5.12/doc/spec/hal-spec.xml.in 2009-05-12 12:55:29.000000000 +0200
+++ new/hal-0.5.13/doc/spec/hal-spec.xml.in 2009-07-15 09:03:40.000000000 +0200
@@ -3,8 +3,8 @@
<book id="index">
<bookinfo>
- <title>HAL 0.5.12 Specification</title>
- <releaseinfo>Version 0.5.12</releaseinfo>
+ <title>HAL 0.5.13 Specification</title>
+ <releaseinfo>Version 0.5.13</releaseinfo>
<date>March 24th, 2007</date> <!-- Update this manually -->
<authorgroup>
<author>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/fdi/policy/10osvendor/10-tabletPCs.fdi new/hal-0.5.13/fdi/policy/10osvendor/10-tabletPCs.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/10-tabletPCs.fdi 2008-11-10 11:14:12.000000000 +0100
+++ new/hal-0.5.13/fdi/policy/10osvendor/10-tabletPCs.fdi 2009-05-15 18:28:34.000000000 +0200
@@ -3,17 +3,10 @@
<deviceinfo version="0.2">
<device>
- <match key="info.capabilities" contains="input.tablet.tabletPC">
- <!-- There is a report that we should use ttyS2 instead of ttyS0 -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="HP Compaq tc4200">
- <merge key="input.device.set" type="string">/dev/ttyS2</merge>
- </match>
-
- <!-- to get the device up we need to set the baud_rate correct -->
- <match key="pnp.id" contains="FPI2004">
- <merge key="input.device.set" type="string">/dev/ttyS0</merge>
- <merge key="pnp.serial.baud_base" type="int">38400</merge>
- </match>
+ <!-- to get the device up we need to set the baud_rate correct -->
+ <match key="pnp.id" contains="FPI2004">
+ <merge key="input.device.set" type="string">/dev/ttyS0</merge>
+ <merge key="pnp.serial.baud_base" type="int">38400</merge>
</match>
<!-- add addon if need special ttySx settings -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/fdi/policy/10osvendor/10-x11-input.fdi new/hal-0.5.13/fdi/policy/10osvendor/10-x11-input.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/10-x11-input.fdi 2009-03-23 08:18:33.000000000 +0100
+++ new/hal-0.5.13/fdi/policy/10osvendor/10-x11-input.fdi 2009-06-26 09:28:39.000000000 +0200
@@ -16,6 +16,13 @@
</match>
</match>
+ <match key="info.capabilities" contains="input.tablet">
+
+ <merge key="input.x11_driver" type="string">evdev</merge>
+ </match>
+ </match>
+
<match key="info.capabilities" contains="input.keys">
<!-- If we're using Linux, we use evdev by default (falling back to
keyboard otherwise). -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi new/hal-0.5.13/fdi/policy/10osvendor/20-acl-management.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/fdi/policy/10osvendor/20-acl-management.fdi 2009-05-15 18:28:34.000000000 +0200
@@ -73,6 +73,11 @@
<merge key="access_control.file" type="copy_property">usbraw.device</merge>
<merge key="access_control.type" type="string">fingerprint-reader</merge>
</match>
+ <match key="info.capabilities" sibling_contains="smart_card_reader">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+ <merge key="access_control.type" type="string">smart-card-reader</merge>
+ </match>
</match>
</match>
@@ -104,6 +109,11 @@
<merge key="access_control.type" type="string">fingerprint-reader</merge>
<merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
</match>
+ <match key="info.capabilities" contains="smart_card_reader">
+ <addset key="info.capabilities" type="strlist">access_control</addset>
+ <merge key="access_control.type" type="string">smart-card-reader</merge>
+ <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+ </match>
</match>
</match>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/Makefile.am new/hal-0.5.13/hald/Makefile.am
--- old/hal-0.5.12/hald/Makefile.am 2008-11-10 11:14:12.000000000 +0100
+++ new/hal-0.5.13/hald/Makefile.am 2009-07-15 08:52:51.000000000 +0200
@@ -9,7 +9,7 @@
-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
- -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+ -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
-DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \
-DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/device_info.c new/hal-0.5.13/hald/device_info.c
--- old/hal-0.5.12/hald/device_info.c 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/hald/device_info.c 2009-07-15 08:52:51.000000000 +0200
@@ -122,27 +122,10 @@
}
#endif
-/** Resolve a udi-property path as used in .fdi files.
- *
- * Examples of udi-property paths:
- *
- * info.udi
- * /org/freedesktop/Hal/devices/computer:kernel.name
- * @block.storage_device:storage.bus
- * @block.storage_device:@storage.originating_device:ide.channel
- *
- * @param source_udi UDI of source device
- * @param path The given path
- * @param udi_result Where to store the resulting UDI
- * @param udi_result_size Size of UDI string
- * @param prop_result Where to store the resulting property name
- * @param prop_result_size Size of property string
- * @return TRUE if and only if the path resolved.
- */
-static gboolean
-resolve_udiprop_path (const char *path, const char *source_udi,
- char *udi_result, size_t udi_result_size,
- char *prop_result, size_t prop_result_size)
+static inline gboolean
+resolve_udiprop_path_old (const char *path, const char *source_udi,
+ char *udi_result, size_t udi_result_size,
+ char *prop_result, size_t prop_result_size)
{
int i;
gchar **tokens = NULL;
@@ -207,6 +190,43 @@
return rc;
}
+/** Resolve a udi-property path as used in .fdi files.
+ *
+ * Examples of udi-property paths:
+ *
+ * info.udi
+ * /org/freedesktop/Hal/devices/computer:kernel.name
+ * @block.storage_device:storage.bus
+ * @block.storage_device:@storage.originating_device:ide.channel
+ *
+ * @param source_udi UDI of source device
+ * @param path The given path
+ * @param udi_result Where to store the resulting UDI
+ * @param udi_result_size Size of UDI string
+ * @param prop_result Where to store the resulting property name
+ * @param prop_result_size Size of property string
+ * @return TRUE if and only if the path resolved.
+ */
+static gboolean
+resolve_udiprop_path (const char *path, const char *source_udi,
+ const char **udi_result, const char **prop_result,
+ const char *scratch /* HAL_PATH_MAX * 2 + 3 */)
+{
+ /* Detect trivial property access, e.g. path='foo.bar' */
+ if (path == NULL || !strchr (path, ':')) {
+ *udi_result = source_udi;
+ *prop_result = path;
+ return TRUE;
+ }
+
+ /* the sub 5% 'everything else' case */
+ *udi_result = scratch;
+ *prop_result = scratch + HAL_PATH_MAX + 2;
+ return resolve_udiprop_path_old (path, source_udi,
+ (char *) *udi_result, HAL_PATH_MAX,
+ (char *) *prop_result, HAL_PATH_MAX);
+}
+
/* Compare the value of a property on a hal device object against a string value
* and return the result. Note that this works for several types, e.g. both strings
* and integers - in the latter case the given right side string will be interpreted
@@ -269,8 +289,9 @@
static gboolean
handle_match (struct rule *rule, HalDevice *d)
{
- char udi_to_check[HAL_PATH_MAX];
- char prop_to_check[HAL_PATH_MAX];
+ char resolve_scratch[HAL_PATH_MAX*2 + 3];
+ const char *udi_to_check;
+ const char *prop_to_check;
const char *key = rule->key;
const char *value = (char *)RULES_PTR(rule->value_offset);
const char *d_udi;
@@ -280,8 +301,9 @@
/* Resolve key paths like 'someudi/foo/bar/baz:prop.name' '@prop.here.is.an.udi:with.prop.name' */
if (!resolve_udiprop_path (key,
d_udi,
- udi_to_check, sizeof (udi_to_check),
- prop_to_check, sizeof (prop_to_check))) {
+ &udi_to_check,
+ &prop_to_check,
+ resolve_scratch)) {
/*HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", key, value));*/
return FALSE;
}
@@ -829,17 +851,17 @@
{
const char *value = (char *)RULES_PTR(rule->value_offset);
const char *key;
- char key_to_merge[HAL_PATH_MAX];
+ char resolve_scratch[HAL_PATH_MAX*2 + 3];
+ const char *key_to_merge;
if (rule->rtype == RULE_MERGE || rule->rtype == RULE_APPEND ||
rule->rtype == RULE_PREPEND || rule->rtype == RULE_ADDSET ) {
- char udi_to_merge[HAL_PATH_MAX];
+ const char *udi_to_merge;
/* Resolve key paths like 'someudi/foo/bar/baz:prop.name' '@prop.here.is.an.udi:with.prop.name' */
if (!resolve_udiprop_path (rule->key, hal_device_get_udi (d),
- udi_to_merge, sizeof (udi_to_merge),
- key_to_merge, sizeof (key_to_merge))) {
- HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", rule->key, hal_device_get_udi (d)));
+ &udi_to_merge, &key_to_merge, resolve_scratch)) {
+ HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", rule->key, hal_device_get_udi (d)));
return FALSE;
} else {
key = key_to_merge;
@@ -889,17 +911,17 @@
hal_device_property_set_double (d, key, atof (value));
} else if (rule->type_merge == MERGE_COPY_PROPERTY) {
-
- char udi_to_merge_from[HAL_PATH_MAX];
- char prop_to_merge[HAL_PATH_MAX];
+ char more_resolve_scratch[HAL_PATH_MAX*2 + 3];
+ const char *udi_to_merge_from;
+ const char *prop_to_merge;
/* Resolve key paths like 'someudi/foo/bar/baz:prop.name'
* '@prop.here.is.an.udi:with.prop.name'
*/
if (!resolve_udiprop_path (value,
hal_device_get_udi (d),
- udi_to_merge_from, sizeof (udi_to_merge_from),
- prop_to_merge, sizeof (prop_to_merge))) {
+ &udi_to_merge_from, &prop_to_merge,
+ more_resolve_scratch)) {
HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", value, hal_device_get_udi (d)));
} else {
HalDevice *copyfrom;
@@ -944,16 +966,17 @@
break;
case MERGE_COPY_PROPERTY:
{
- char udi_to_merge_from[HAL_PATH_MAX];
- char prop_to_merge[HAL_PATH_MAX];
+ char more_resolve_scratch[HAL_PATH_MAX*2 + 3];
+ const char *udi_to_merge_from;
+ const char *prop_to_merge;
/* Resolve key paths like 'someudi/foo/bar/baz:prop.name'
* '@prop.here.is.an.udi:with.prop.name'
*/
if (!resolve_udiprop_path (value,
hal_device_get_udi (d),
- udi_to_merge_from, sizeof (udi_to_merge_from),
- prop_to_merge, sizeof (prop_to_merge))) {
+ &udi_to_merge_from, &prop_to_merge,
+ more_resolve_scratch)) {
HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", value, hal_device_get_udi (d)));
} else {
HalDevice *copyfrom;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/freebsd/hf-computer.c new/hal-0.5.13/hald/freebsd/hf-computer.c
--- old/hal-0.5.12/hald/freebsd/hf-computer.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/freebsd/hf-computer.c 2009-05-27 22:26:03.000000000 +0200
@@ -130,6 +130,17 @@
hal_device_property_set_string(device, "info.subsystem", "unknown");
hal_device_property_set_string(device, "info.product", "Computer");
+ if (PACKAGE_VERSION) {
+ int major, minor, micro;
+
+ hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
+ if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ ) == 3 ) {
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
+ }
+ }
+
if (uname(&un) == 0)
{
hal_device_property_set_string(device, "system.kernel.name", un.sysname);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/freebsd/hf-pci.c new/hal-0.5.13/hald/freebsd/hf-pci.c
--- old/hal-0.5.12/hald/freebsd/hf-pci.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/freebsd/hf-pci.c 2009-05-12 14:27:00.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/freebsd/hf-storage.c new/hal-0.5.13/hald/freebsd/hf-storage.c
--- old/hal-0.5.12/hald/freebsd/hf-storage.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/freebsd/hf-storage.c 2009-05-12 14:24:28.000000000 +0200
@@ -644,7 +644,6 @@
hf_storage_device_enable (HalDevice *device)
{
g_return_if_fail(HAL_IS_DEVICE(device));
- g_return_if_fail(devname != NULL);
hal_device_property_set_string(device, "storage.bus", "platform");
hal_device_property_set_string(device, "storage.drive_type", "disk");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/freebsd/libprobe/hfp-cdrom.h new/hal-0.5.13/hald/freebsd/libprobe/hfp-cdrom.h
--- old/hal-0.5.12/hald/freebsd/libprobe/hfp-cdrom.h 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/freebsd/libprobe/hfp-cdrom.h 2009-05-12 14:27:55.000000000 +0200
@@ -28,7 +28,7 @@
# include
#endif
-#include
+#include
#include "hfp.h"
@@ -53,8 +53,8 @@
typedef struct
{
/* mode page data header */
- u_int16_t data_length;
- u_int8_t medium_type;
+ uint16_t data_length;
+ uint8_t medium_type;
#define HFP_CDROM_MST_TYPE_MASK_LOW 0x0f
#define HFP_CDROM_MST_FMT_NONE 0x00
#define HFP_CDROM_MST_DATA_120 0x01
@@ -75,17 +75,17 @@
#define HFP_CDROM_MST_DOOR_OPEN 0x71
#define HFP_CDROM_MST_FMT_ERROR 0x72
- u_int8_t dev_spec;
- u_int16_t unused;
- u_int16_t blk_desc_len;
+ uint8_t dev_spec;
+ uint16_t unused;
+ uint16_t blk_desc_len;
/* capabilities page */
- u_int8_t page_code;
+ uint8_t page_code;
#define HFP_CDROM_CAP_PAGE 0x2a
- u_int8_t param_len;
+ uint8_t param_len;
- u_int16_t media;
+ uint16_t media;
#define HFP_CDROM_MST_READ_CDR 0x0001
#define HFP_CDROM_MST_READ_CDRW 0x0002
#define HFP_CDROM_MST_READ_PACKET 0x0004
@@ -98,7 +98,7 @@
#define HFP_CDROM_MST_WRITE_DVDR 0x1000
#define HFP_CDROM_MST_WRITE_DVDRAM 0x2000
- u_int16_t capabilities;
+ uint16_t capabilities;
#define HFP_CDROM_MSTAUDIO_PLAY 0x0001
#define HFP_CDROM_MST_COMPOSITE 0x0002
#define HFP_CDROM_MST_AUDIO_P1 0x0004
@@ -115,7 +115,7 @@
#define HFP_CDROM_MST_ISRC 0x2000
#define HFP_CDROM_MST_UPC 0x4000
- u_int8_t mechanism;
+ uint8_t mechanism;
#define HFP_CDROM_MST_LOCKABLE 0x01
#define HFP_CDROM_MST_LOCKED 0x02
#define HFP_CDROM_MST_PREVENT 0x04
@@ -131,18 +131,18 @@
#define HFP_CDROM_MST_SEP_VOL 0x01
#define HFP_CDROM_MST_SEP_MUTE 0x02
- u_int16_t max_read_speed; /* max raw data rate in bytes/1000 */
- u_int16_t max_vol_levels; /* number of discrete volume levels */
- u_int16_t buf_size; /* internal buffer size in bytes/1024 */
- u_int16_t cur_read_speed; /* current data rate in bytes/1000 */
-
- u_int8_t reserved3;
- u_int8_t misc;
-
- u_int16_t max_write_speed; /* max raw data rate in bytes/1000 */
- u_int16_t cur_write_speed; /* current data rate in bytes/1000 */
- u_int16_t copy_protect_rev;
- u_int16_t reserved4;
+ uint16_t max_read_speed; /* max raw data rate in bytes/1000 */
+ uint16_t max_vol_levels; /* number of discrete volume levels */
+ uint16_t buf_size; /* internal buffer size in bytes/1024 */
+ uint16_t cur_read_speed; /* current data rate in bytes/1000 */
+
+ uint8_t reserved3;
+ uint8_t misc;
+
+ uint16_t max_write_speed; /* max raw data rate in bytes/1000 */
+ uint16_t cur_write_speed; /* current data rate in bytes/1000 */
+ uint16_t copy_protect_rev;
+ uint16_t reserved4;
} HFPCDROMCapabilities;
HFPCDROM *hfp_cdrom_new (const char *path, const char *parent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/hald_dbus.c new/hal-0.5.13/hald/hald_dbus.c
--- old/hal-0.5.12/hald/hald_dbus.c 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/hald/hald_dbus.c 2009-07-15 08:52:51.000000000 +0200
@@ -3476,7 +3476,7 @@
if (dbus_connection_send_with_reply (connection,
message,
&pending_call,
- /*-1*/ 8000)) {
+ /*-1*/ 8000) && pending_call) {
/*HAL_INFO (("connection=%x message=%x", connection, message));*/
dbus_pending_call_set_notify (pending_call,
reply_from_singleton_device_changed,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/addons/addon-acpi.c new/hal-0.5.13/hald/linux/addons/addon-acpi.c
--- old/hal-0.5.12/hald/linux/addons/addon-acpi.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/linux/addons/addon-acpi.c 2009-05-12 13:28:27.000000000 +0200
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
@@ -45,9 +46,14 @@
acpi_get_event_fp_kernel (void)
{
FILE *fp = NULL;
+ struct stat sbuf;
- fp = fopen ("/proc/acpi/event", "r");
+ if (stat("/usr/sbin/acpid", &sbuf) == 0) {
+ HAL_DEBUG (("acpid installed, not using the kernel acpi event interface"));
+ return NULL;
+ }
+ fp = fopen ("/proc/acpi/event", "r");
if (fp == NULL)
HAL_ERROR (("Cannot open /proc/acpi/event: %s", strerror (errno)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/addons/addon-input.c new/hal-0.5.13/hald/linux/addons/addon-input.c
--- old/hal-0.5.12/hald/linux/addons/addon-input.c 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/hald/linux/addons/addon-input.c 2009-05-28 10:38:58.000000000 +0200
@@ -175,7 +175,11 @@
#ifndef KEY_WLAN
#define KEY_WLAN 238
#endif
- [KEY_WLAN] = "wlan"
+ [KEY_WLAN] = "wlan",
+#ifndef KEY_ZOOM
+#define KEY_ZOOM 0x174
+#endif
+ [KEY_ZOOM] = "zoom"
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/blockdev.c new/hal-0.5.13/hald/linux/blockdev.c
--- old/hal-0.5.12/hald/linux/blockdev.c 2009-02-26 08:55:36.000000000 +0100
+++ new/hal-0.5.13/hald/linux/blockdev.c 2009-05-15 18:29:49.000000000 +0200
@@ -1498,8 +1498,15 @@
hal_device_property_set_bool (d, "volume.is_mounted", FALSE);
hal_device_property_set_bool (d, "volume.is_mounted_read_only", FALSE);
hal_device_property_set_bool (d, "volume.linux.is_device_mapper", is_device_mapper);
- hal_device_property_set_bool (d, "volume.is_disc", strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
-
+ /* Don't assume that the parent has storage capability, eg
+ * if we are an MD partition then this is the case as we were
+ * re-parented to the root computer device object earlier.
+ */
+ if (hal_device_has_property(parent, "storage.drive_type")) {
+ hal_device_property_set_bool (d, "volume.is_disc", strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
+ } else {
+ hal_device_property_set_bool (d, "volume.is_disc", FALSE);
+ }
is_physical_partition = TRUE;
if (is_fakevolume || is_device_mapper)
@@ -1508,8 +1515,10 @@
hal_device_property_set_bool (d, "volume.is_partition", is_physical_partition);
hal_device_property_set_string (d, "info.category", "volume");
- if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
- hal_device_add_capability (d, "volume.disc");
+ if (hal_device_has_property(parent, "storage.drive_type")) {
+ if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
+ hal_device_add_capability (d, "volume.disc");
+ }
}
hal_device_add_capability (d, "volume");
hal_device_add_capability (d, "block");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/coldplug.c new/hal-0.5.13/hald/linux/coldplug.c
--- old/hal-0.5.12/hald/linux/coldplug.c 2009-04-03 16:31:34.000000000 +0200
+++ new/hal-0.5.13/hald/linux/coldplug.c 2009-05-27 22:26:03.000000000 +0200
@@ -256,7 +256,7 @@
} else if (strncmp(line, "E: ID_FS_LABEL_ENC=", 19) == 0) {
len = strlen (&line[15]);
info->fslabel = g_malloc0 (len + 1);
- hal_util_decode_escape (&line[19], info->fslabel, len + 1);
+ hal_util_decode_escape (&line[19], (char *)info->fslabel, len + 1);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/device.c new/hal-0.5.13/hald/linux/device.c
--- old/hal-0.5.12/hald/linux/device.c 2009-02-26 09:03:19.000000000 +0100
+++ new/hal-0.5.13/hald/linux/device.c 2009-07-15 08:54:11.000000000 +0200
@@ -758,6 +758,44 @@
}
+/*--------------------------------------------------------------------------------------------------------------*/
+
+static HalDevice *
+ibmebus_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+{
+ HalDevice *d;
+
+ d = hal_device_new ();
+ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
+ hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path);
+ hal_device_property_set_string (d, "info.bus", "ibmebus");
+ if (parent_dev != NULL) {
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+ } else {
+ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
+ }
+
+ hal_util_set_driver (d, "info.linux.driver", sysfs_path);
+
+ hal_util_set_string_from_file (d, "ibmebus.devspec", sysfs_path, "devspec");
+ hal_util_set_string_from_file (d, "ibmebus.type", sysfs_path, "type");
+
+ return d;
+}
+
+
+static gboolean
+ibmebus_compute_udi (HalDevice *d)
+{
+ gchar udi[256];
+
+ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
+ "/org/freedesktop/Hal/devices/ibmebus%s",
+ hal_device_property_get_string (d, "ibmebus.devspec"));
+ hal_device_set_udi (d, udi);
+ hal_device_property_set_string (d, "info.udi", udi);
+ return TRUE;
+}
/*--------------------------------------------------------------------------------------------------------------*/
@@ -812,6 +850,43 @@
/*--------------------------------------------------------------------------------------------------------------*/
static HalDevice *
+ssb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+{
+ HalDevice *d;
+
+ d = hal_device_new ();
+ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
+ hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path);
+ hal_device_property_set_string (d, "info.bus", "ssb");
+ if (parent_dev != NULL) {
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+ } else {
+ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
+ }
+
+ hal_util_set_driver (d, "info.linux.driver", sysfs_path);
+
+ hal_device_property_set_string (d, "ssb.bus_id",
+ hal_util_get_last_element (sysfs_path));
+ return d;
+}
+
+static gboolean
+ssb_compute_udi (HalDevice *d)
+{
+ gchar udi[256];
+
+ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
+ "/org/freedesktop/Hal/devices/ssb_%s",
+ hal_device_property_get_string (d, "xen.bus_id"));
+ hal_device_set_udi (d, udi);
+ hal_device_property_set_string (d, "info.udi", udi);
+ return TRUE;
+}
+
+/*--------------------------------------------------------------------------------------------------------------*/
+
+static HalDevice *
ieee1394_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
{
HalDevice *d;
@@ -1006,6 +1081,8 @@
} else if (test_bit (KEY_SUSPEND, bitmask)) {
hal_device_property_set_string (d, "button.type", "hibernate");
}
+ if (input_test_keys (bitmask))
+ hal_device_add_capability (d, "input.keys");
} else {
gboolean is_keyboard = input_test_keyboard (bitmask);
gboolean is_keypad = input_test_keypad (bitmask);
@@ -3496,7 +3573,7 @@
hald_compute_udi (udi, sizeof (udi),
"%s_sound_card_%i",
hal_device_property_get_string (d, "info.parent"),
- hal_device_property_get_string (d, "sound.card"));
+ hal_device_property_get_int (d, "sound.card"));
} else if (hal_device_has_property(d, "alsa.card")) {
/* don't include card number as it may not be persistent across reboots */
hald_compute_udi (udi, sizeof (udi),
@@ -4243,6 +4320,13 @@
.remove = dev_remove
};
+static DevHandler dev_handler_ssb = {
+ .subsystem = "ssb",
+ .add = ssb_add,
+ .compute_udi = ssb_compute_udi,
+ .remove = dev_remove
+};
+
/* s390 specific busses */
static DevHandler dev_handler_ccw = {
.subsystem = "ccw",
@@ -4286,6 +4370,13 @@
.remove = dev_remove
};
+static DevHandler dev_handler_ibmebus = {
+ .subsystem = "ibmebus",
+ .add = ibmebus_add,
+ .compute_udi = ibmebus_compute_udi,
+ .remove = dev_remove
+};
+
static DevHandler dev_handler_ide = {
.subsystem = "ide",
.add = ide_add,
@@ -4608,6 +4699,7 @@
&dev_handler_drm,
&dev_handler_dvb,
&dev_handler_firewire,
+ &dev_handler_ibmebus,
&dev_handler_ide,
&dev_handler_ieee1394,
&dev_handler_input,
@@ -4635,6 +4727,7 @@
&dev_handler_serial,
&dev_handler_serio,
&dev_handler_sound,
+ &dev_handler_ssb,
&dev_handler_tape,
&dev_handler_tape390,
/* Don't change order of usbclass and usb */
@@ -4829,11 +4922,22 @@
handler = dev_handlers[i];
if (strcmp (handler->subsystem, subsystem) == 0) {
HalDevice *d;
+ HalDevice *check;
if (strcmp (subsystem, "scsi") == 0)
if (missing_scsi_host (sysfs_path, (HotplugEvent *)end_token, HOTPLUG_ACTION_ADD))
goto out;
+ /* check if there is already a device with this sysfs_path in the system */
+ if ((check = hal_device_store_match_key_value_string (hald_get_gdl (), "linux.sysfs_path", sysfs_path)) != NULL ||
+ (check = hal_device_store_match_key_value_string (hald_get_tdl (), "linux.sysfs_path", sysfs_path)) != NULL) {
+ HAL_WARNING(("Have already a device with sysfs_path='%s' and udi='%s'. Ignore new add event for now.",
+ sysfs_path, hal_device_get_udi(check)));
+ /* maybe we should do a refresh on the found device ??? */
+ hotplug_event_end (end_token);
+ goto out;
+ }
+
/* attempt to add the device */
d = handler->add (sysfs_path, device_file, parent_dev, parent_path);
if (d == NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/osspec.c new/hal-0.5.13/hald/linux/osspec.c
--- old/hal-0.5.12/hald/linux/osspec.c 2009-04-06 18:39:49.000000000 +0200
+++ new/hal-0.5.13/hald/linux/osspec.c 2009-05-27 22:26:03.000000000 +0200
@@ -841,6 +841,17 @@
hal_device_property_set_string (root, "info.product", "Computer");
hal_device_set_udi (root, "/org/freedesktop/Hal/devices/computer");
+ if (PACKAGE_VERSION) {
+ int major, minor, micro;
+
+ hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
+ if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ ) == 3 ) {
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
+ }
+ }
+
if (uname (&un) >= 0) {
hal_device_property_set_string (root, "system.kernel.name", un.sysname);
hal_device_property_set_string (root, "system.kernel.version", un.release);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/probing/probe-volume.c new/hal-0.5.13/hald/linux/probing/probe-volume.c
--- old/hal-0.5.12/hald/linux/probing/probe-volume.c 2009-05-10 21:11:44.000000000 +0200
+++ new/hal-0.5.13/hald/linux/probing/probe-volume.c 2009-05-27 22:26:03.000000000 +0200
@@ -97,8 +97,7 @@
if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL))
type = "";
- if (libhal_changeset_set_property_string (cs, "volume.fstype", type))
- libhal_changeset_set_property_string (cs, "volume.fstype", "");
+ libhal_changeset_set_property_string (cs, "volume.fstype", type);
HAL_DEBUG(("volume.fstype = '%s'", type));
if (blkid_probe_lookup_value(pr, "VERSION", &type_version, NULL))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/solaris/devinfo_misc.c new/hal-0.5.13/hald/solaris/devinfo_misc.c
--- old/hal-0.5.12/hald/solaris/devinfo_misc.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald/solaris/devinfo_misc.c 2009-05-27 22:26:03.000000000 +0200
@@ -74,6 +74,17 @@
hal_device_set_udi (d, "/org/freedesktop/Hal/devices/computer");
hal_device_property_set_string (d, "solaris.devfs_path", devfs_path);
+ if (PACKAGE_VERSION) {
+ int major, minor, micro;
+
+ hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
+ if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ ) == 3 ) {
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
+ hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
+ }
+ }
+
if (uname (&un) >= 0) {
hal_device_property_set_string (d, "system.kernel.name", un.sysname);
hal_device_property_set_string (d, "system.kernel.version", un.release);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald-runner/Makefile.am new/hal-0.5.13/hald-runner/Makefile.am
--- old/hal-0.5.12/hald-runner/Makefile.am 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/hald-runner/Makefile.am 2009-07-15 08:52:51.000000000 +0200
@@ -6,7 +6,7 @@
-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
- -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+ -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
-I$(top_srcdir) \
@DBUS_CFLAGS@ @GLIB_CFLAGS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy new/hal-0.5.13/policy/org.freedesktop.hal.device-access.policy
--- old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy 2009-02-04 23:07:23.000000000 +0100
+++ new/hal-0.5.13/policy/org.freedesktop.hal.device-access.policy 2009-05-15 18:28:34.000000000 +0200
@@ -91,6 +91,15 @@
</defaults>
</action>
+ <action id="org.freedesktop.hal.device-access.smart-card-reader">
+ <description>Directly access to Smart Card Reader security devices</description>
+ <message>System policy prevents access to Smart Card Reader security devices</message>
+ <defaults>
+ no
+ yes
+ </defaults>
+ </action>
+
<action id="org.freedesktop.hal.device-access.joystick">
<description>Directly access Joystick devices</description>
<message>System policy prevents access to Joystick devices</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/Makefile.am new/hal-0.5.13/tools/Makefile.am
--- old/hal-0.5.12/tools/Makefile.am 2008-11-10 11:14:12.000000000 +0100
+++ new/hal-0.5.13/tools/Makefile.am 2009-07-15 08:52:51.000000000 +0200
@@ -17,7 +17,7 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
- -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+ -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
@@ -156,7 +156,7 @@
hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
endif
-scriptdir = $(libdir)/hal/scripts
+scriptdir = $(libexecdir)/scripts
script_SCRIPTS = \
hal-luks-setup \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/freebsd/Makefile.am new/hal-0.5.13/tools/freebsd/Makefile.am
--- old/hal-0.5.12/tools/freebsd/Makefile.am 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/tools/freebsd/Makefile.am 2009-07-15 08:52:51.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-scriptdir = $(libdir)/hal/scripts/freebsd
+scriptdir = $(libexecdir)/scripts/freebsd
script_SCRIPTS = \
hal-system-power-suspend-freebsd \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/hal-storage-mount.c new/hal-0.5.13/tools/hal-storage-mount.c
--- old/hal-0.5.12/tools/hal-storage-mount.c 2009-05-10 21:11:44.000000000 +0200
+++ new/hal-0.5.13/tools/hal-storage-mount.c 2009-05-27 22:26:03.000000000 +0200
@@ -786,12 +786,13 @@
/* don't consider uid= on vfat, iso9660, hfs and udf change-uid for the purpose of policy
* (since these doesn't contain uid/gid bits)
*/
- if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
- strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
- strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
- strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
- strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 &&
- strcmp (libhal_volume_get_fstype (volume), "udf") != 0) {
+ const char *v_fstype;
+
+ v_fstype = libhal_volume_get_fstype (volume);
+ if (v_fstype != NULL &&
+ strcmp (v_fstype, "vfat") != 0 && strcmp (v_fstype, "ntfs") != 0 &&
+ strcmp (v_fstype, "ntfs-3g") != 0 && strcmp (v_fstype, "iso9660") != 0 &&
+ strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "udf") != 0) {
pol_change_uid = wants_to_change_uid;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/hal-system-power-pmu.c new/hal-0.5.13/tools/hal-system-power-pmu.c
--- old/hal-0.5.12/tools/hal-system-power-pmu.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/tools/hal-system-power-pmu.c 2009-05-12 14:25:58.000000000 +0200
@@ -53,7 +53,7 @@
static int
pmac_sleep (void)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
@@ -90,7 +90,7 @@
static int
pmac_get_lcd_brightness (int *val)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
@@ -127,7 +127,7 @@
static int
pmac_set_lcd_brightness (int val)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/hal-system-sonypic.c new/hal-0.5.13/tools/hal-system-sonypic.c
--- old/hal-0.5.12/tools/hal-system-sonypic.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/tools/hal-system-sonypic.c 2009-05-15 18:28:34.000000000 +0200
@@ -63,7 +63,7 @@
static int
sonypi_get_lcd_brightness (__u8 *val)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
@@ -163,7 +163,7 @@
static int
sonypi_set_lcd_brightness (__u8 val)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
@@ -195,7 +195,7 @@
static int
sonypi_set_bluetooth_power (int val)
{
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/hal_set_property.c new/hal-0.5.13/tools/hal_set_property.c
--- old/hal-0.5.12/tools/hal_set_property.c 2008-08-10 15:50:10.000000000 +0200
+++ new/hal-0.5.13/tools/hal_set_property.c 2009-05-12 13:24:50.000000000 +0200
@@ -66,7 +66,7 @@
" (--int <value> | --string <value> | --bool <value> |\n"
" --strlist-pre <value> | --strlist-post <value> |\n"
" --strlist-rem <value> | --double <value> | --remove)\n"
- " [--help] [--version]\n");
+ " [--direct] [--help] [--version]\n");
fprintf (stderr,
"\n" " --udi Unique Device Id\n"
" --key Key of the property to set\n"
@@ -81,6 +81,7 @@
" --strlist-post Append a string to a list\n"
" --strlist-rem Remove a string from a list\n"
" --remove Indicates that the property should be removed\n"
+ " --direct Use direct HAL connection\n"
" --version Show version and exit\n"
" --help Show this information and exit\n"
"\n"
@@ -114,6 +115,7 @@
dbus_bool_t is_version = FALSE;
int type = PROP_INVALID;
DBusError error;
+ dbus_bool_t direct = FALSE;
if (argc <= 1) {
usage (argc, argv);
@@ -135,6 +137,7 @@
{"strlist-pre", 1, NULL, 0},
{"strlist-post", 1, NULL, 0},
{"strlist-rem", 1, NULL, 0},
+ {"direct", 0, NULL, 0},
{"remove", 0, NULL, 0},
{"version", 0, NULL, 0},
{"help", 0, NULL, 0},
@@ -188,6 +191,8 @@
type = PROP_STRLIST_REM;
} else if (strcmp (opt, "remove") == 0) {
remove = TRUE;
+ } else if (strcmp (opt, "direct") == 0) {
+ direct = TRUE;
} else if (strcmp (opt, "udi") == 0) {
udi = strdup (optarg);
} else if (strcmp (opt, "version") == 0) {
@@ -215,24 +220,32 @@
fprintf (stderr, "\n");
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_new ()) == NULL) {
- fprintf (stderr, "error: libhal_ctx_new\n");
- return 1;
- }
- if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
- fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
- LIBHAL_FREE_DBUS_ERROR (&error);
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
- dbus_error_free (&error);
+ dbus_error_init (&error);
+ if (direct) {
+ if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ fprintf (stderr, "error: libhal_ctx_init_direct\n");
+ LIBHAL_FREE_DBUS_ERROR (&error);
+ return 1;
+ }
+ } else {
+ if ((hal_ctx = libhal_ctx_new ()) == NULL) {
+ fprintf (stderr, "error: libhal_ctx_new\n");
+ return 1;
+ }
+ if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
+ fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
+ LIBHAL_FREE_DBUS_ERROR (&error);
+ return 1;
+ }
+ if (!libhal_ctx_init (hal_ctx, &error)) {
+ if (dbus_error_is_set(&error)) {
+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
+ dbus_error_free (&error);
+ }
+ fprintf (stderr, "Could not initialise connection to hald.\n"
+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
+ return 1;
}
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
}
if (remove) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/linux/Makefile.am new/hal-0.5.13/tools/linux/Makefile.am
--- old/hal-0.5.12/tools/linux/Makefile.am 2009-03-23 08:18:33.000000000 +0100
+++ new/hal-0.5.13/tools/linux/Makefile.am 2009-07-15 08:52:51.000000000 +0200
@@ -10,14 +10,14 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
- -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
+ -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
libexec_PROGRAMS =
-scriptdir = $(libdir)/hal/scripts/linux
+scriptdir = $(libexecdir)/scripts/linux
script_SCRIPTS = \
hal-luks-setup-linux \
++++++ hal-info-20090414.tar.bz2 -> hal-info-20090716.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/aclocal.m4 new/hal-info-20090716/aclocal.m4
--- old/hal-info-20090414/aclocal.m4 2009-03-09 12:33:03.000000000 +0100
+++ new/hal-info-20090716/aclocal.m4 2009-07-16 12:26:35.000000000 +0200
@@ -87,14 +87,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,9 +140,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -466,59 +468,61 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/configure new/hal-info-20090716/configure
--- old/hal-info-20090414/configure 2009-04-14 18:19:05.000000000 +0200
+++ new/hal-info-20090716/configure 2009-07-16 12:26:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for hal-info 20090414.
+# Generated by GNU Autoconf 2.63 for hal-info 20090716.
#
# Report bugs to .
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20090414'
-PACKAGE_STRING='hal-info 20090414'
+PACKAGE_VERSION='20090716'
+PACKAGE_STRING='hal-info 20090716'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='LTLIBOBJS
@@ -1281,7 +1281,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 20090414 to adapt to many kinds of systems.
+\`configure' configures hal-info 20090716 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1347,7 +1347,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20090414:";;
+ short | recursive ) echo "Configuration of hal-info 20090716:";;
esac
cat <<\_ACEOF
@@ -1446,7 +1446,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20090414
+hal-info configure 20090716
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1460,7 +1460,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 20090414, which was
+It was created by hal-info $as_me 20090716, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2176,7 +2176,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20090414
+ VERSION=20090716
cat >>confdefs.h <<_ACEOF
@@ -4272,7 +4272,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 20090414, which was
+This file was extended by hal-info $as_me 20090716, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4335,7 +4335,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-hal-info config.status 20090414
+hal-info config.status 20090716
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -5123,27 +5123,28 @@
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
@@ -5166,28 +5167,28 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
@@ -5210,7 +5211,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -5251,10 +5252,11 @@
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-modem.fdi 2009-03-24 08:53:47.000000000 +0100
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-modem.fdi 2009-07-16 12:21:10.000000000 +0200
@@ -154,9 +154,20 @@
<!-- 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">
+ <!-- Ericsson F3507g Mobile Broadband -->
+ <match key="@info.parent:usb.product_id" int_outof="0x1900;0x1902;0x1904">
+ <match key="@info.parent:usb.interface.number" int="1">
+ <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>
+
+ <!-- Toshiba -->
+ <match key="@info.parent:usb.vendor_id" int="0x0930">
+ <!-- Toshiba Mobile Broadband -->
+ <match key="@info.parent:usb.product_id" int="0x130b">
+ <match key="@info.parent:usb.interface.number" int="1">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
@@ -407,9 +418,15 @@
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.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137;0x8138">
+ <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>
+ <!-- 5530 Mobile Broadband (3G HSPA) Mini-Card -->
+ <match key="@info.parent:usb.product_id" int="0x8147">
<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>
@@ -503,5 +520,22 @@
</match>
</match>
+
+<!-- *****************************************************
+ Remove the net.80203 capability of mobile broadband devices which appear
+ after sending some AT commands. These should not be treated as real
+ ethernet interfaces by NetworkManager and friends.
+ ***************************************************** -->
+ <match key="info.parent" contains_outof="413c_8147;bdb_1902;bdb_1900;930_130b">
+ <match key="info.parent" suffix="_if7">
+ <remove key="info.capabilities" type="strlist">net.80203</remove>
+ </match>
+ </match>
+ <match key="info.parent" contains_outof="bdb_1904">
+ <match key="info.parent" suffix="_if6">
+ <remove key="info.capabilities" type="strlist">net.80203</remove>
+ </match>
+ </match>
+
</device>
</deviceinfo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-dell.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-dell.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-dell.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-dell.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.model" contains="DELL">
<match key="battery.vendor" string="Sony">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.vendor" string="Fujitsu">
<match key="battery.model" contains_outof="CP255100;CP255108;CP229720;CP229725;CP234003;CP234019;CP283030;CP267910">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-gateway.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-gateway.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-gateway.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.vendor" string="Gateway">
<match key="battery.model" contains_outof="916C4610F;916C4720F;916C4730F;916C5010F;W230">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-ibm.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-ibm.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-ibm.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.model" contains="IBM">
<match key="battery.vendor" string="SONY">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.vendor" string="SANYO">
<match key="battery.model" string="92P1131">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi 2008-10-09 18:05:37.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi 2009-07-16 10:46:03.000000000 +0200
@@ -2,6 +2,14 @@
<deviceinfo version="0.2">
<device>
+ <!--
+ * !!! DO NOT EDIT THIS FILE !!!
+ *
+ * The battery recall data is now maintained in DeviceKit-power.
+ *
+ * GNOME Power Manager no longer reads these values.
+ -->
+
<match key="battery.vendor" string="TOSHIBA">
<match key="battery.model" contains_outof="PA3465U;PA3399U;PA3400U;PA3465U;PA3399U;PA3400U">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20090716/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/10-usb-music-players.fdi 2009-04-01 09:16:21.000000000 +0200
+++ new/hal-info-20090716/fdi/information/10freedesktop/10-usb-music-players.fdi 2009-07-16 11:57:49.000000000 +0200
@@ -29,8 +29,8 @@
<!-- Creative -->
<match key="@storage.originating_device:usb.vendor_id" int="0x41e">
- <!-- MuVo NX, MuVo2, MuVo TX, Zen Micro,NOMAD Jukebox Zen Xtra, MuVo N200 (MuVo Micro), Zen Micro -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x4115;0x4116;0x4117;0x411e;0x4128;0x412b;0x4130">
+ <!-- MuVo NX, MuVo2, MuVo TX, MuVo TX FM, Zen Micro,NOMAD Jukebox Zen Xtra, MuVo N200 (MuVo Micro), Zen Micro -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x4115;0x4116;0x4117;0x4120;0x411e;0x4128;0x412b;0x4130">
<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>
@@ -184,6 +184,21 @@
<append key="portable_audio_player.audio_folders" type="strlist">Video/</append>
<append key="portable_audio_player.audio_folders" type="strlist">Voice/</append>
</match>
+ <!-- Philips GoGear SA52XX -->
+ <match key="@storage.originating_device:usb.product_id" int="0x2022">
+ <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">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/x-ms-wmv</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/ms-video</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Video/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ </match>
</match>
<!-- Meizu -->
@@ -238,19 +253,25 @@
<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>
- <!-- Samsung YP-J70, YP-T7F -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
+ <!-- Samsung YP-T7F -->
+ <match key="@storage.originating_device:usb.product_id" int="0x503d">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
<!-- Samsung YP-J70 -->
- <match key="@storage.originating_device:usb.product_id" int="0x5032">
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
+ <match key="@storage.originating_device:usb.product_id" int="0x5032">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- Samsung YP-Z5 -->
<match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -300,6 +321,25 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
</match>
+ <!-- Samsung Yepp YP-P3 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x5119">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">image/jpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">text/plain</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/x-shockwave-flash</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/x-ms-wmv</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Video/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Datacasts/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Recorded Files/FM Radio/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Recorded Files/Voice/</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+ </match>
</match>
<!-- Sony -->
@@ -525,8 +565,8 @@
<!-- Cowon -->
<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
- <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
+ <!-- iAUDIO M3 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -535,40 +575,68 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
- <!-- iAUDIO X5, M5, F2, 7 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
- </match>
- <!-- iAUDIO U3 -->
- <match key="@storage.originating_device:usb.product_id" int="0x700">
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
- </match>
</match>
- <!-- iAUDIO U2, G3, 5, G2 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x600;0x601;0x602;0x604;0x760">
+ <!-- iAUDIO X5, M5, F2, 7 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
- <!-- iAUDIO G2 -->
- <match key="@storage.originating_device:usb.product_id" int="0x760">
- <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
- </match>
- <!-- iAUDIO U2 -->
- <match key="@storage.originating_device:usb.product_id" int="0x600">
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
- </match>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+ </match>
+ <!-- iAUDIO U3 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x700">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+ </match>
+ <!-- iAUDIO G3, 5 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ </match>
+ <!-- iAUDIO G2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x760">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+ </match>
+ <!-- iAUDIO U2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x600">
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
</match>
</match>
@@ -645,6 +713,15 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
+ <!-- W302i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe0c8">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</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>
+
<!-- W800 Walkman Phone -->
<!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
<match key="@storage.originating_device:usb.product_id" int="0xd028">
@@ -703,8 +780,8 @@
<append key="portable_audio_player.audio_folders" type="strlist">AUDIO/</append>
</match>
- <!-- Sony Ericsson K850i, W910i -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0xe075;0xe076">
+ <!-- Sony Ericsson K850i, W910i, W580i -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xe075;0xe076;0xe089">
<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>
@@ -871,6 +948,17 @@
</match>
</match>
+ <!-- TrekStor -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0738">
+ <!-- i.Beat cebrax fx 1GB -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1738">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</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/x-wav</append>
+ </match>
+ </match>
+
<!-- Amazon -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1949">
<!-- Amazon Kindle -->
@@ -920,18 +1008,24 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x1019">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
<append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
- <!-- S10 UMS firmware v1.05 folder -->
- <match key="@storage.originating_device:usb.product_id" int="0x1023">
- <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
- </match>
+ </match>
+ <!-- S10 UMS firmware v1.05 folder -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1023">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
+ <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
</match>
<match key="input.product" string="Sony Vaio Keys">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+
+ <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+ <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
+ <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+ <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+ <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+ <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
+ <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
<!-- 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;VGN-S360;VGN-SZ2HP_B">
+ <remove key="input.keymap.data" type="strlist">0x06:mute</remove>
<append key="input.keymap.data" type="strlist">0x06:battery</append>
+ <remove key="input.keymap.data" type="strlist">0x07:volumedown</remove>
<append key="input.keymap.data" type="strlist">0x07:mute</append>
</match>
- <!-- now the generic mapping -->
- <match key="input.keymap.data" exists="false">
- <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
- <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
- <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
- <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
- <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
- </match>
-
- <!-- now the common part -->
- <match key="input.keymap.data" exists="true">
- <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
- <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
- <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
-
</match>
</match>
</device>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hal-info-20090414/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi new/hal-info-20090716/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
--- old/hal-info-20090414/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi 2009-02-09 09:26:49.000000000 +0100
+++ new/hal-info-20090716/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi 2009-06-28 22:13:15.000000000 +0200
@@ -8,7 +8,7 @@
<append key="input.keymap.data" type="strlist">0x01:battery</append> <!-- Fn+F2 battery -->
<append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x04:wlan</append> <!-- Fn+F5 switch radio -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
<append key="input.keymap.data" type="strlist">0x07:zoom</append> <!-- Fn+F8 screen expand -->
<append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
@@ -28,7 +28,7 @@
<append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
<append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
+ <append key="input.keymap.data" type="strlist">0x04:wlan</append> <!-- Fn+F5 wifi -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
<append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
<append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org