diff -pruN 0.5.12~git20090406.46dc48-2/INSTALL 0.5.13-1ubuntu8/INSTALL --- 0.5.12~git20090406.46dc48-2/INSTALL 2009-04-08 06:37:54.000000000 +0100 +++ 0.5.13-1ubuntu8/INSTALL 2009-07-15 08:03:14.000000000 +0100 @@ -2,15 +2,15 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +2006, 2007, 2008 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -73,9 +73,9 @@ The simplest way to compile this package Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ is an example: Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,10 +100,24 @@ architecture at a time in the source cod installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -138,14 +152,36 @@ find the X include and library files aut you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -182,7 +218,7 @@ A warning: not all `configure' scripts l Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -pruN 0.5.12~git20090406.46dc48-2/Makefile.in 0.5.13-1ubuntu8/Makefile.in --- 0.5.12~git20090406.46dc48-2/Makefile.in 2009-04-08 06:37:55.000000000 +0100 +++ 0.5.13-1ubuntu8/Makefile.in 2009-07-15 08:03:15.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -94,6 +94,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLKID_CFLAGS = @BLKID_CFLAGS@ +BLKID_LIBS = @BLKID_LIBS@ BUILD_ACPI_IBM = @BUILD_ACPI_IBM@ BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@ CC = @CC@ @@ -185,8 +187,6 @@ USE_PCI_IDS = @USE_PCI_IDS@ USE_PNP_IDS = @USE_PNP_IDS@ USE_USB_IDS = @USE_USB_IDS@ VERSION = @VERSION@ -VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@ -VOLUME_ID_LIBS = @VOLUME_ID_LIBS@ XMLLINT = @XMLLINT@ XMLTO = @XMLTO@ abs_builddir = @abs_builddir@ @@ -321,7 +321,7 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt install-dist_dbusDATA: $(dist_dbus_DATA) @$(NORMAL_INSTALL) test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" @@ -432,7 +432,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -pruN 0.5.12~git20090406.46dc48-2/NEWS 0.5.13-1ubuntu8/NEWS --- 0.5.12~git20090406.46dc48-2/NEWS 2009-01-07 19:09:53.000000000 +0000 +++ 0.5.13-1ubuntu8/NEWS 2009-07-15 08:08:18.000000000 +0100 @@ -1,16 +1,103 @@ ========== +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 ========== -Released Month 00, 2008. +Released May 12, 2009. Requirements for HAL 0.5.12: - - Linux kernel >= 2.6.19 - - util-linux >= 2.12r1 (--enable-umount-helper requires patch - from RH #188193; it's in util-linux-ng 2.13) - - bash >= 2.0 + - 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 @@ -32,6 +119,278 @@ Requirements for HAL 0.5.12: Contributors to HAL 0.5.12 : +Alex Kanavin (1): + add ACL rule an policy for obex devices + +Andreas Schwab (1): + fixed buffer overrun + +Arjan van de Ven (1): + make hal start a lot faster + +Colin Walters (1): + aallowllow calling KillSwitch methods in D-Bus configuration + +Daniel Drake (1): + disable polling on batteries if battery.quirk.do_not_poll is set + +Daniel Walsh (1): + don't leak file descriptor on umount + +Danny Kukawka (142): + added system.board.* for base-/mainboard information + removed info about hal-device-manager from spec + fixed memory leaks related to usage of g_strsplit + fixed fdi.dtd for the remove rule + updated SPEC for power_management.quirk.pci_save + fix PMU battery and AC handling with power_supply + fixed PropertyModified signal in SPEC and code + fixed possible memory leak + remove storage.model property from volumes + reuse code in addons to check privileges + updated .gitignore + fixed merge for uint64 + added new addon for the generic sysfs backlight interface + fix detection of TabletPCs + fixed device removage + fixed 10-tabletPCs.fdi + added hald-addon-generic-backlight to .gitignore + added new addon for the ipw killswitch interface + add hald-addon-ipw-killswitch to .gitignore + fixed Lock() handling + unify directory usage under /var/run + added check for ConsoleKit >= v0.3.1 to configure + allow acl and user_xattr as mount options for reiserfs + removed needless whitespaces at the end of lines + fix DBus introspection for org.freedesktop.Hal.Manager + ported addon-macbook-backlight to use HAL logging code + fixed cpufreq addon to call setup_logger() + added configure check for libsmbios >= 2.0.3 + use smi::getPasswordStatus() only if available + use udevadm instead of (deprecated) udevinfo + add requirements for next release (0.5.12) + fixed wrong condition in libsmbios checks + don't use hal_util_compute_udi directly inside of hald + added linux rfkill subsystem to HAL + add *.tar.bz2 to .gitignore + get storage.model for SCSI via HDIO_GET_IDENTITY instead of sysfs + remove unneeded variable from commit 702351eaea4 + add battery.quirk.do_not_poll to spec + removed deprecated properties from spec + removed outdated deprecated keys finally from spec + Revert "allow 'locale=' NTFS mount option for Linux" + unify set volume.ignore for recovery partitions + Revert "adapt HAL to changes in the kernel regarding to docking stations" + fix udi: replace '/' in the last part of the udi + prefer sans-serif instead of luxi sans in css file + fixed formatting of org.freedesktop.Hal.SingletonAddon in spec + keep subsystem/devhandler in alphabetical order + add ppdev subsystem + add support for virtual network devices + added obex namespace to spec + sort device access policies/actions alphabetical + add ACL rule and policy for ppdev + fixed ACL rules for PDAs + add support for detect DVD-R DL for storage.cdrom.dvdrdl + fixed spec for vio bus + allow also PCI as possible storage.bus + add support for the BDI subsystem + add bdi namespace to spec + add support for bdi bases block devices + add bdi to storage.bus spec + fixed storage.bus spec to sort values in alphabetical order + reorganise spec: sort 'Subsystem-Specific Properties' alphabetical + reorganise spec: sort 'Functional Properties' alphabetical + reorganise spec: sort 'D-Bus interfaces' alphabetical + add biometric and biometric.fingerprint_reader namespace + added ACL/device access rules for fingerprint reader + small cleanup for configure.in + added volume.(un)mount.valid_options to spec + added new properties to mount alternative fstypes as e.g. ntfs-3g + added support for alternative fstype to Mount() + Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal + added comment to not change order of usb and usbclass handler + Revert "add support for the BDI subsystem" + revert BDI changes from SPEC + Revert "add support for bdi bases block devices" + remove generic sysfs backlight from scripts + add volume.fstype.alternative.prefered to spec + add support for HP Smart Array CCISS block devices + add cciss as possible storage.bus to spec + fixed md related code in hotplug_event_begin_add_blockdev() + check module parameter of acpi video to set brightness_in_hardware + fixed typo, adjust description of volume.fstype.alternative.preferred + fix handling of Device Mapper devices for LUKS + fix commit 151957477daaf985acdb2d7bda5b4a418c612cf3 + Merged changes from git.freedesktop.org/git/hal.git (315ca276ffdde9a) + cleanup handling volume filesystem information + fix commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2 + another fix for commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2 + add memstick and memstick_host namespace to spec + add memstick to storage.bus in spec + fixed call of hotplug_queue_now_empty() under linux + Revert "cleanup handling volume filesystem information" + improve HAL performance for filesystem detection + add a new singleton addon for the rfkill subsystem + add new killswitch.state property + fixed ipw addon + Merge branch 'master' of ssh://dkukawka@people.freedesktop.org/~dkukawka/hal + add the leds linux kernel subsystem to HAL + add a new singleton addon to handle leds + update .gitignore for hald/linux/addons + add org.freedesktop.Hal.Device.Leds interface to spec + fix joystick detection (patch by Ari Mustonen) + fix ACL handling for drm devices + fixed serial.port handling for USB serial devices + add ACL support for scsi_generic scanner devices + Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal + Merge branch 'master' of ssh://dkukawka@people.freedesktop.org/~dkukawka/hal + fix make distcheck + fixing spec for access_control.type due to Policykit changes + fix spec due to path/filename changes with actual PolicyKit + Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal + remove policy rule for org.freedesktop.Hal.Device.VideoAdapterPM + remove second policy context="default" block + put policy rules in alphabetical order + fix policy for org.freedesktop.Hal.Device.KillSwitch + add DBus policy rule for org.freedesktop.Hal.Device.Leds + add DBus policy rule for org.freedesktop.Hal.Device.CPUFreq + add DBus policy rule for org.freedesktop.Hal.Device.LightSensor + add D-Bus policy rule for org.freedesktop.Hal.Device.KeyboardBacklight + add D-Bus policy rule for org.freedesktop.Hal.Device.Storage.Removable + add org.freedesktop.Hal.Device.WakeOnLan to HAL D-Bus config + add org.freedesktop.Hal.Device.Storage to HAL D-Bus config + add org.freedesktop.Hal.Device.DockStation to HAL D-Bus config + add org.freedesktop.DBus.Properties standard iterface + remove all receive_* lines from HAL D-Bus config + fixed HAL D-Bus config: added send_destination for all interfaces + add some parameter checks to hal_util_*et_driver*() functions + add section about "Device Files policies" to spec + put usbraw matches for ACL together into one block + use addset instead of append for ACL rules + add ACL and device-access policy for printers + update spec for printer access policy + filled TODOs with information for the printer namespace + sort existing PolicyKit policies for device access alphabetical + add current default policies for device access to spec + fixed entries to add acl related keys only if there is a device + fix commit 33b54318f73012e24220456216794dd3ff39fc93 + provide comparable linux kernel version information + fix problems with removable-block policy and floppy devs + move all storage/block related policies to one block + Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal + fix commit 92e7f2e8b2a1a36d3ec2b371424719e7078d91da + +Frederic Crozat (1): + adapt new CK library version (>= v0.3.1) to HAL + +Gabriel Burt (1): + export seconds_to_sleep to pm-utils + +Guillem Jover (9): + add mmc_host slot_name support + do not compare arrays against NULL + addon-cpufreq: do not leak va_arg on error condition + do not leak on error conditions + fix some memory leaks on normal operation + remove unused pointer to struct mntent returned from getmntent_r + do not call property_set_lookup before checking param validity + remove unused call to hal_util_get_last_element + make Magneto-Optical devices visible + +Holger Freyther (1): + allow to cross compile hal with host and target having different input.h + +Holger Macht (1): + adapt HAL to changes in the kernel regarding to docking stations + +Johannes Berg (2): + use 'phy80211' instead of 'wiphy' symlink to detect wireless + use wext ioctl instead of sysfs to detect wireless + +Jürg Billeter (1): + inserts the sysfs path at the right position for call udevadm + +Kay Sievers (2): + use '@' for abstract namespace socket, bump udev requirement + move from libvolume_id to libblkid + +Kouhei Sutou (1): + add support for detecting DVD-R DL media + +Lucas Rocha (1): + probe for v4l only if probe for v4l2 failed + +Ludwig Nussel (3): + merge additional device access types from hal-resmgr + hal-acl-tool: don't free strings that are not supposed to be freed + fix ACL handling for removable block devices (as CD/DVD) + +Makoto Dei (1): + include config.h before any other headers + +Mario Limonciello (3): + check if BIOS password is present prior to use libsmbios commands + fix Dell bluetooth killswitch + fix building with current libsmbios + +Markus Rothe (1): + fix issue on 64bit big endian architectures. + +Martin Pitt (7): + volume.num_blocks can become larger than 2G + increase hal helper timeout to fix slow CD-ROMs + add ACL support to removable block devices + fix building on Linux 2.6.28 + fix auto ACL management for DRI + fix volume label parsing + fix volume.num_blocks data type in libhal-storage + +Matthew Garrett (3): + Add newer Macbook Pros, and remove the backlight addon for Nvidia-based Pros (it doesn't work there) + add memstick/memstick_host support + don't add input capabilities to tablet PNP device + +Michael Biebl (1): + allow uid/gid mount option for ntfs + +Ozan Çağlayan (1): + fix SUSBSYSTEM typo in a debug message + +Pacho Ramos (1): + prevent hal from automounting Dell recovery partition + +Patrick Campbell (1): + set Xen storage drive type + +Paul Bolle (1): + add zoom and ThinkPad events to acpi addon for IBM/Lenovo + +Philipp Ittershagen (1): + add save-pci support to hal-system-power-suspend-linux + +Rafał Mużyło (1): + fix some configure issues + +Richard Hughes (11): + fix a crash when the rfkill device does not have a type + revert a tiny bit of the device ording change as it breaks printer detection + remove the forced removal of the trailing newline to fix OLPC probing + prefer openfirmware interface for DMI even when dmidecode is found in the path + check udi in hal-get-property + set the retval of hal-device correctly on error + allow child timeout to be set so hal starts on big servers + Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal + add x11_driver for KVM graphics tablet + allow specifying a udev dir in etc + regenerate cache if it's zero sized + +Rémi Cardona (1): + add libtool-2.2 support + +Scott James Remnant (1): + install udev rule to /lib/udev/rules.d/ + ========== HAL 0.5.11 diff -pruN 0.5.12~git20090406.46dc48-2/aclocal.m4 0.5.13-1ubuntu8/aclocal.m4 --- 0.5.12~git20090406.46dc48-2/aclocal.m4 2009-04-08 06:37:23.000000000 +0100 +++ 0.5.13-1ubuntu8/aclocal.m4 2009-07-15 08:03:02.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,7 +13,7 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.63],, +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, [m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. @@ -4276,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -8139,7 +8142,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8154,7 +8157,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8168,12 +8171,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.10.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -8423,57 +8426,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; 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 @@ -8732,14 +8746,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_PROG_CC_C_O # -------------- @@ -8751,8 +8765,9 @@ AC_REQUIRE_AUX_FILE([compile])dnl # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -8830,13 +8845,13 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -8853,7 +8868,7 @@ AC_DEFUN([_AM_SET_OPTION], # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff -pruN 0.5.12~git20090406.46dc48-2/config.guess 0.5.13-1ubuntu8/config.guess --- 0.5.12~git20090406.46dc48-2/config.guess 2009-04-08 06:37:42.000000000 +0100 +++ 0.5.13-1ubuntu8/config.guess 2009-07-15 08:03:08.000000000 +0100 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -796,7 +812,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +951,9 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +1004,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1102,8 +1118,11 @@ EOF pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1160,16 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1216,6 +1245,9 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1356,9 @@ EOF i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -pruN 0.5.12~git20090406.46dc48-2/config.sub 0.5.13-1ubuntu8/config.sub --- 0.5.12~git20090406.46dc48-2/config.sub 2009-04-08 06:37:42.000000000 +0100 +++ 0.5.13-1ubuntu8/config.sub 2009-07-15 08:03:08.000000000 +0100 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^- case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -249,13 +250,16 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +272,7 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +282,7 @@ case $basic_machine in | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +291,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +334,17 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +366,20 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +447,10 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -459,6 +471,10 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +542,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1148,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1190,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1238,8 +1262,9 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1273,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1413,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff -pruN 0.5.12~git20090406.46dc48-2/configure 0.5.13-1ubuntu8/configure --- 0.5.12~git20090406.46dc48-2/configure 2009-04-08 06:37:33.000000000 +0100 +++ 0.5.13-1ubuntu8/configure 2009-07-15 08:03:05.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for hal 0.5.12. +# Generated by GNU Autoconf 2.63 for hal 0.5.13. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='hal' PACKAGE_TARNAME='hal' -PACKAGE_VERSION='0.5.12' -PACKAGE_STRING='hal 0.5.12' +PACKAGE_VERSION='0.5.13' +PACKAGE_STRING='hal 0.5.13' PACKAGE_BUGREPORT='david@fubar.dk' # Factoring default headers for most tests. @@ -816,8 +816,8 @@ DOCBOOK_DOCS_ENABLED_TRUE XMLLINT XMLTO HALD_OS_LIBS -VOLUME_ID_LIBS -VOLUME_ID_CFLAGS +BLKID_LIBS +BLKID_CFLAGS GLIB_LIBS GLIB_CFLAGS DBUS_LIBS @@ -1101,8 +1101,8 @@ DBUS_CFLAGS DBUS_LIBS GLIB_CFLAGS GLIB_LIBS -VOLUME_ID_CFLAGS -VOLUME_ID_LIBS' +BLKID_CFLAGS +BLKID_LIBS' # Initialize some variables set by options. @@ -1655,7 +1655,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hal 0.5.12 to adapt to many kinds of systems. +\`configure' configures hal 0.5.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1725,7 +1725,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hal 0.5.12:";; + short | recursive ) echo "Configuration of hal 0.5.13:";; esac cat <<\_ACEOF @@ -1825,10 +1825,9 @@ Some influential environment variables: DBUS_LIBS linker flags for DBUS, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - VOLUME_ID_CFLAGS - C compiler flags for VOLUME_ID, overriding pkg-config - VOLUME_ID_LIBS - linker flags for VOLUME_ID, overriding pkg-config + BLKID_CFLAGS + C compiler flags for BLKID, overriding pkg-config + BLKID_LIBS linker flags for BLKID, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1896,7 +1895,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hal configure 0.5.12 +hal configure 0.5.13 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1910,7 +1909,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hal $as_me 0.5.12, which was +It was created by hal $as_me 0.5.13, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2626,7 +2625,7 @@ fi # Define the identity of the package. PACKAGE='hal' - VERSION='0.5.12' + VERSION='0.5.13' cat >>confdefs.h <<_ACEOF @@ -2791,9 +2790,10 @@ fi + 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" -volume_id_module="libvolume_id >= 0.77" +blkid_module="blkid >= 1.43" polkit_module="polkit >= 0.5" # libtool versioning - this applies to libhal and libhal-storage @@ -5389,8 +5389,9 @@ fi # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -6517,13 +6518,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6520: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6521: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6523: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6524: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6526: output\"" >&5) + (eval echo "\"\$as_me:6527: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7728,7 +7729,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7731 "configure"' > conftest.$ac_ext + echo '#line 7732 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9885,11 +9886,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9888: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9889: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9892: \$? = $ac_status" >&5 + echo "$as_me:9893: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10224,11 +10225,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10227: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10228: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10231: \$? = $ac_status" >&5 + echo "$as_me:10232: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10329,11 +10330,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10332: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10333: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10336: \$? = $ac_status" >&5 + echo "$as_me:10337: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10384,11 +10385,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10387: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10388: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10391: \$? = $ac_status" >&5 + echo "$as_me:10392: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10503,6 +10504,9 @@ $as_echo_n "checking whether the $compil openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -13197,7 +13201,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13200 "configure" +#line 13204 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13293,7 +13297,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13296 "configure" +#line 13300 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15313,11 +15317,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15316: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15320: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15320: \$? = $ac_status" >&5 + echo "$as_me:15324: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15412,11 +15416,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15415: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15419: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15419: \$? = $ac_status" >&5 + echo "$as_me:15423: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15464,11 +15468,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15467: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15471: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15471: \$? = $ac_status" >&5 + echo "$as_me:15475: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17197,7 +17201,7 @@ fi if test "${with_udev_prefix+set}" = set; then withval=$with_udev_prefix; else - with_udev_prefix='${exec_prefix}' + with_udev_prefix='${exec_prefix}/lib' fi udev_prefix=$with_udev_prefix @@ -19138,7 +19142,7 @@ else *-*-solaris*) HALD_BACKEND="solaris" ;; - *-*-freebsd*) + *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; *-linux*) @@ -19939,27 +19943,27 @@ fi { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5 $as_echo "$have_glib_2_14" >&6; } -# volume_id +# blkid case "$host" in *-*-solaris*) ;; *) pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for VOLUME_ID" >&5 -$as_echo_n "checking for VOLUME_ID... " >&6; } +{ $as_echo "$as_me:$LINENO: checking for BLKID" >&5 +$as_echo_n "checking for BLKID... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$VOLUME_ID_CFLAGS"; then - pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS" + if test -n "$BLKID_CFLAGS"; then + pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 - ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\"") >&5 + ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null` + pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "$blkid_module" 2>/dev/null` else pkg_failed=yes fi @@ -19968,16 +19972,16 @@ else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$VOLUME_ID_LIBS"; then - pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS" + if test -n "$BLKID_LIBS"; then + pkg_cv_BLKID_LIBS="$BLKID_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 - ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\"") >&5 + ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null` + pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "$blkid_module" 2>/dev/null` else pkg_failed=yes fi @@ -19996,33 +20000,33 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"` + BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$blkid_module"` else - VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"` + BLKID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$blkid_module"` fi # Put the nasty error message in config.log where it belongs - echo "$VOLUME_ID_PKG_ERRORS" >&5 + echo "$BLKID_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($volume_id_module) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($blkid_module) were not met: -$VOLUME_ID_PKG_ERRORS +$BLKID_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -and VOLUME_ID_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BLKID_CFLAGS +and BLKID_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -$as_echo "$as_me: error: Package requirements ($volume_id_module) were not met: +$as_echo "$as_me: error: Package requirements ($blkid_module) were not met: -$VOLUME_ID_PKG_ERRORS +$BLKID_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -and VOLUME_ID_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BLKID_CFLAGS +and BLKID_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&2;} { (exit 1); exit 1; }; } @@ -20033,8 +20037,8 @@ $as_echo "$as_me: error: in \`$ac_pwd':" is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -and VOLUME_ID_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BLKID_CFLAGS +and BLKID_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . @@ -20043,16 +20047,16 @@ $as_echo "$as_me: error: The pkg-config is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -and VOLUME_ID_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BLKID_CFLAGS +and BLKID_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } else - VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS - VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS + BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS + BLKID_LIBS=$pkg_cv_BLKID_LIBS { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } : @@ -21948,7 +21952,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hal $as_me 0.5.12, which was +This file was extended by hal $as_me 0.5.13, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22011,7 +22015,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -hal config.status 0.5.12 +hal config.status 0.5.13 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -23185,18 +23189,28 @@ $as_echo "$as_me: executing $ac_file com case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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\(//\)$' \| \ @@ -23219,28 +23233,28 @@ $as_echo X"$mf" | 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\(//\)$' \| \ @@ -23263,7 +23277,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir + { as_dir=$dirpart/$fdir case $as_dir in #( -*) as_dir=./$as_dir;; esac @@ -23304,10 +23318,11 @@ $as_echo X"$as_dir" | } || 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 +} ;; "libtool":C) diff -pruN 0.5.12~git20090406.46dc48-2/configure.in 0.5.13-1ubuntu8/configure.in --- 0.5.12~git20090406.46dc48-2/configure.in 2009-02-26 11:10:17.000000000 +0000 +++ 0.5.13-1ubuntu8/configure.in 2009-07-15 07:52:51.000000000 +0100 @@ -7,13 +7,14 @@ dnl Process this file with autoconf to p # 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" -volume_id_module="libvolume_id >= 0.77" +blkid_module="blkid >= 1.43" polkit_module="polkit >= 0.5" # libtool versioning - this applies to libhal and libhal-storage @@ -76,7 +77,7 @@ AC_ARG_WITH([socket-dir], 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 @@ else *-*-solaris*) HALD_BACKEND="solaris" ;; - *-*-freebsd*) + *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; *-linux*) @@ -685,14 +686,14 @@ else fi AC_MSG_RESULT($have_glib_2_14) -# volume_id +# blkid case "$host" in *-*-solaris*) ;; *) - PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) - AC_SUBST(VOLUME_ID_CFLAGS) - AC_SUBST(VOLUME_ID_LIBS) + PKG_CHECK_MODULES(BLKID, [$blkid_module]) + AC_SUBST(BLKID_CFLAGS) + AC_SUBST(BLKID_LIBS) esac # OS specific libs diff -pruN 0.5.12~git20090406.46dc48-2/debian/changelog 0.5.13-1ubuntu8/debian/changelog --- 0.5.12~git20090406.46dc48-2/debian/changelog 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/changelog 2009-10-21 14:43:59.000000000 +0100 @@ -1,3 +1,297 @@ +hal (0.5.13-1ubuntu8) karmic; urgency=low + + * debian/patches/04_nvidia_brightness.patch: Fix mismatched tags (LP: + #440797). + + -- Colin Watson Mon, 05 Oct 2009 13:17:09 +0100 + +hal (0.5.13-1ubuntu7) karmic; urgency=low + + * debian/hal.postinst: Drop polkit-auth call. + + -- Martin Pitt Thu, 24 Sep 2009 09:00:29 +0200 + +hal (0.5.13-1ubuntu6) karmic; urgency=low + + * 60_upstream_backlight_actual_brightness.patch: pull fix from upstream to + read the current brightness value from the correct file under /sys. + LP: #372874. + + -- Steve Langasek Wed, 23 Sep 2009 16:20:47 -0700 + +hal (0.5.13-1ubuntu5) karmic; urgency=low + + * Drop support for the obsolete policykit 0.9, so that we don't need to + carry two stacks: + - debian/control: Drop libpolkit-dev build dependency and policykit + dependency. + - Drop 10-no-polkit-policy-file-validate-check.patch, not necessary any + more. + - debian/rules: Configure with --disable-policykit. + - Add 01_at_console.patch: Allow access to hal functions to local console + users, in particular the ones which were allowed unauthorized access in + policykit. Do not allow access to mounting internal storage devices; + Kubuntu does not use it, and GNOME does not use hal at all. + - debian/hal.manpages: Drop PK specific manpages which aren't built any + more. + - debian/hal.install: Drop installation of PolicyKit files. + + -- Martin Pitt Wed, 23 Sep 2009 17:05:21 +0200 + +hal (0.5.13-1ubuntu4) karmic; urgency=low + + * Since we need an upstart-enabled dbus, bump our versioned dependency + accordingly. + + -- Steve Langasek Wed, 16 Sep 2009 01:56:38 -0700 + +hal (0.5.13-1ubuntu3) karmic; urgency=low + + FFE LP: #427356. + + * Replace init script with Upstart job. + * debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:31:00 +0100 + +hal (0.5.13-1ubuntu2) karmic; urgency=low + + [ Steve Langasek ] + * debian/patches/series: add debian/patches/04_nvidia_brightness.patch so + it actually gets applied. + * debian/patches/04_nvidia_brightness.patch: copy logic from + /usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi to + apply the correct methods as well, in place of + hald-addon-generic-backlight. LP: #277589. + + [ Martin Pitt ] + * debian/control: Add back smartdimmer recommends for above patch. + + -- Steve Langasek Thu, 27 Aug 2009 15:54:42 +0200 + +hal (0.5.13-1ubuntu1) karmic; urgency=low + + * Merge with Debian experimental and svn head, to minimize our Delta. + Drop MacBook and smartdimmer brightness support, since hal is being + deprecated, and already not used for brightness changes any more. + Remaining Ubuntu changes: + - Enable support for X11 input hotplugging: + + debian/rules: Do not remove 10-x11-input.fdi, we want to install it by + default. + + Drop 10-x11-input.fdi from debian/hal.examples, since we install + it by default. + - debian/rules: Disable support for keymaps, now done by udev. + - debian/rules: Disable support for ACL management, now done by udev. Drop + "acl" dependency. + + -- Martin Pitt Wed, 29 Jul 2009 09:47:48 +0200 + +hal (0.5.13-2) UNRELEASED; urgency=low + + [ Martin Pitt ] + * debian/control: Drop libsmbios-dev from build depends. Kernel 2.6.30 + provides dell_laptop kernel module which exports these interfaces into + standard "generic" ones. Drop recommends for libsmbios-bin. + * debian/control: Bump libblkid-dev build dep to >= 2.15 as done by + upstream recently; 1.43 was a synthetic version number before the + util-linux release number was determined. + * debian/hal.init: Check for /sys/devices, not /sys/kernel. The latter + doesn't exist in OpenVZ. (LP: #399629) + + -- Michael Biebl Wed, 29 Jul 2009 09:08:39 +0200 + +hal (0.5.13-1) experimental; urgency=low + + * New upstream release. + - Fix crash when assembling certain MD devices. (Closes: #522136) + - Fixes for GNU/kFreeBSD. + - Set default udev_prefix to ${exec_prefix}/lib in configure.in. + - Define new (sub-)namespace(s) and policy for smart card readers. + - Ignore ADD events if there is already a device with same sysfs_path. + - probe-volume: remove needless check for empty fstype. + - Use $libexecdir not $libdir/hal to define private hal directory. + - Various startup speedups. + - Add hal-set-property --direct. + - addon-acpi.c: Support acpid. + - 10-x11-input.fdi: Add tablets. + - Add input.keys capability to input buttons. + - Add support for devices on the SSB and ibme bus. + * debian/patches/11-direct-hal-set-propery.patch + - Removed, merged upstream. + * debian/patches/23_addon_acpi.patch + - Removed, merged upstream. + * Add support for GNU/kFreeBSD. (Closes: #528383) + Thanks to Aurelien Jarno and Cyril Brulebois for the patch(es). + * debian/control + - Change Build-Depends from libvolume-id-dev to libblkid-dev (>= 1.43). + - Bump Standards-Version to 3.8.2. No further changes. + - Wrap hal dependencies. + - Demote pm-utils to Recommends now that pm-utils is in the laptop and + desktop task and Recommends are installed by default. (Closes: #477913) + * debian/hal.init + - Refactor safety checks into a separate function and make sure they are + also run on restart. (Closes: #537251) + - Use s-s-d's --retry option on stop which allows us to safely remove the + ugly "sleep 1" between start and stop within restart. + * debian/patches/20_cpufreq_warning_message_fix.patch + - Fix a misleading warning message in ondemand_set_consider_nice(). + (Closes: #532999) + + -- Michael Biebl Tue, 28 Jul 2009 06:03:06 +0200 + +hal (0.5.13-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Fix crash when assembling certain MD devices + - Fixes for GNU/kFreeBSD + - Set default udev_prefix to ${exec_prefix}/lib in configure.in + - Define new (sub-)namespace(s) and policy for smart card readers + - Ignore ADD events if there is already a device with same sysfs_path + - probe-volume: remove needless check for empty fstype + - Use $libexecdir not $libdir/hal to define private hal directory + - Various startup speedups + - Add hal-set-property --direct + - addon-acpi.c: Support acpid + - 10-x11-input.fdi: Add tablets + - Add input.keys capability to input buttons + - Add support for devices on the SSB and ibme bus + * Drop 05_ssb_bus_support.patch, upstream now. + * Re-add smartdimmer recommends, got lost in a merge. + * Drop ubuntu_01_ignore_single_slash_label.patch. It's conceptually wrong to + change this in hal itself, should rather be done in the presentation + layer. Also, the installer stopped labelling partitions as "/" ages ago. + + -- Martin Pitt Wed, 15 Jul 2009 09:38:52 +0200 + +hal (0.5.12+git20090626-0ubuntu3) karmic; urgency=low + + * add chroot check to the restart function in the initscript to fix FTBFS of + xscreensaver on armel + + -- Oliver Grawert Tue, 07 Jul 2009 16:33:26 +0200 + +hal (0.5.12+git20090626-0ubuntu2) karmic; urgency=low + + * Drop debian-setup-keyboard and debian/10-x11-keymap.fdi, shipped in xorg + now. + + -- Martin Pitt Tue, 30 Jun 2009 18:19:24 +0200 + +hal (0.5.12+git20090626-0ubuntu1) karmic; urgency=low + + * New upstream git snapshot: + - Add input.keys capability to power/hibernate/etc. keys. (LP: #384890) + * Drop 01_tablet_evdev.patch, 50_no_crash_on_md_blockdev.patch: Applied + upstream. + * 04_nvidia_brightness.patch: Update to new upstream version. + * debian/control: Change back Vcs-Bzr:, Ubuntu package are only for full + source trees. + + -- Martin Pitt Fri, 26 Jun 2009 10:04:33 +0200 + +hal (0.5.12+git20090512-0ubuntu3) karmic; urgency=low + + * Drop ACL management, this is done by udev-extras now: + - debian/rules: Drop --enable-acl-management. + - debian/control: Drop acl dependency. + * debian/control: Update Vcs-Bzr: for new location (moved from LP project + branch to Ubuntu package branch). + + -- Martin Pitt Tue, 02 Jun 2009 15:24:00 +0200 + +hal (0.5.12+git20090512-0ubuntu2) karmic; urgency=low + + * debian/patches/50_no_crash_on_md_blockdev.patch: + - When adding a block device, don't assume that the parent + has storage capability. This fixes a crash where the device + is re-parented to the root computer device object (such as + with mdraid devices). LP: #361689. + + -- Chris Coulson Fri, 15 May 2009 18:34:58 +0200 + +hal (0.5.12+git20090512-0ubuntu1) karmic; urgency=low + + * Final hal 0.5.12 release (no actual changes since our previous git + snapshot), plus some extra commits from git head to drop some of our + patches: + - 02_smart_card_readers_acl.patch + - 11-direct-hal-set-propery.patch + - 23_addon_acpi.patch + * 04_nvidia_brightness.patch: Update for new autoconfiscation. + * debian/10-x11-keymap.fdi: Do not check for existing input.xkb.layout + property; this was only set by the previous 10-keymap.fdi, which got + disabled together with hal-setup-keymap. Directly check for input.keys + capabilities, to make the fdi independent. This restores proper X.org + keyboard layout setting from console-setup. (LP: #375618) + + -- Martin Pitt Wed, 13 May 2009 09:53:30 +0200 + +hal (0.5.12~rc1+git20090510-0ubuntu2) karmic; urgency=low + + * debian/rules: Disable hal-setup-keymap, this is replaced with udev-extras. + + -- Martin Pitt Mon, 11 May 2009 17:15:50 +0200 + +hal (0.5.12~rc1+git20090510-0ubuntu1) karmic; urgency=low + + * New upstream git snapshot: + - Now use libblkid instead of libvolume-id (which is gone). + * debian/control: libvolume-id-dev → libblkid-dev build dependency. + + -- Martin Pitt Mon, 11 May 2009 11:23:03 +0200 + +hal (0.5.12~rc1+git20090406.46dc48-2ubuntu3) karmic; urgency=low + + * debian/control: + - Drop libsmbios-dev from build depends. Kernel 2.6.30 provides dell_laptop + kernel module which exports these interfaces into standard "generic" + ones. + - Drop recommends for libsmbios-bin. + * debian/patches/series: + - Disable 03_standalone_smbios.patch for same above reason. + * debian/patches/03_standalone_smbios.patch: dropped + + -- Mario Limonciello Mon, 04 May 2009 13:27:47 -0500 + +hal (0.5.12~rc1+git20090406.46dc48-2ubuntu2) karmic; urgency=low + + * 03_standalone_smbios.patch: Fix typo in Dell "wwan" killswitch type + handling, thanks to Fredrik Motin! (LP: #368553) + + -- Martin Pitt Tue, 28 Apr 2009 16:43:15 +0200 + +hal (0.5.12~rc1+git20090406.46dc48-2ubuntu1) karmic; urgency=low + + * Merge with Debian unstable. Remaining Ubuntu changes: + - Rename orig.tar.gz to use our current versioning scheme (~rc1+git). + - Enable support for X11 input hotplugging: + + debian/debian-setup-keyboard: Callout for setting input.xkb.* from + console-setup. + + Add debian/10-x11-keymap.fdi to run above callout for input devices. + Install it in debian/hal.install. + + debian/rules: Do not remove 10-x11-input.fdi, we want to install it by + default. + + Drop 10-x11-input.fdi from debian/debian/hal.examples, since we install + it by default. + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Patches, see their headers: + + 01_tablet_evdev.patch + + 02_smart_card_readers_acl.patch + + 03_standalone_smbios.patch + + 04_nvidia_brightness.patch + + ubuntu_01_ignore_single_slash_label.patch + - 05_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + + -- Martin Pitt Tue, 28 Apr 2009 10:27:21 +0200 + hal (0.5.12~git20090406.46dc48-2) unstable; urgency=low * debian/hal.postinst @@ -111,6 +405,206 @@ hal (0.5.11-7) unstable; urgency=high -- Sjoerd Simons Wed, 07 Jan 2009 00:35:16 +0000 +hal (0.5.12~rc1+git20090403-0ubuntu1) jaunty; urgency=low + + * Update to current git HEAD to collect some more bug fixes: + - Fix volume label parsing (directly committed upstream) (LP: #347370) + - Regenerate FDI cache if it's zero sized + - Fix handling of floppy and MO discs. + - Fix various memory leaks and unused pointers. + - Fix linking against libsmbios. + - Allow specifying a udev dir in etc (Fedora still has udev rules dir in + /etc) + * debian/rules: Update --with-udev-prefix according to above upstream + change. + * Drop 86_smbios_configure_error.patch, applied upstream. + + -- Martin Pitt Fri, 03 Apr 2009 17:10:56 +0200 + +hal (0.5.12~rc1+git20090204-0ubuntu4) jaunty; urgency=low + + [ Steve Langasek ] + * debian/control: Recommend: smartdimmer for sony backlight support. + * 88_nvidia_brightness.patch: add a new sony-nvidia brightness get/set + method, using the smartdimmer tool, and an fdi policy file so that we + use this method on Sony laptops with known nVidia chips. Many thanks + to Lee-tin-yien Yohan for working on this! + Closes LP: #277589. + + [ Martin Pitt ] + * 88_nvidia_brightness.patch: Also patch Makefile.{am,in} to install the new + fdi file. + + -- Steve Langasek Mon, 23 Mar 2009 11:55:53 +0100 + +hal (0.5.12~rc1+git20090204-0ubuntu3) jaunty; urgency=low + + * 87_standalone_smbios.patch: Add missing bit from + autoreconfiscation, which brings back the building and + installation of hal-acl-tool. This repairs automatic ACLs, and + thus sound card, camera, scanner, DRI, and other device access. + Thanks to Mario Limonciello for the patch! (LP: #334299) + + -- Martin Pitt Wed, 25 Feb 2009 15:54:09 +0100 + +hal (0.5.12~rc1+git20090204-0ubuntu2) jaunty; urgency=low + + * 86_smbios_configure_error.patch: + - Fix a compilation error that prevented the smbios based Dell + backlight control from working with later libsmbios builds. + * 87_standalone_smbios.patch: + - Provide a lightweight C utility for querying WLAN,BT,WWAN rather than + using the python one from smbios-utils. + + -- Mario Limonciello Tue, 24 Feb 2009 21:22:47 -0600 + +hal (0.5.12~rc1+git20090204-0ubuntu1) jaunty; urgency=low + + * Update to latest upstream git snapshot: + - Fix buffer overrun with incorrectly formatted LED + devices (LP: #322649). + + -- Chris Coulson Wed, 04 Feb 2009 23:18:31 +0100 + +hal (0.5.12~rc1+git20090120-0ubuntu1) jaunty; urgency=low + + * Update to latest upstream git snapshot. + * Drop patches applied upstream: + - 00git_build_2.6.28.patch + - 00git_fix_drm_acls.patch + - 07_joystick_detection.patch + - ubuntu_02_udevrulesdir.patch + * Add 01_tablet_evdev.patch: Use evdev driver for tablets. Patch + taken from Fedora, as requested by Timo Aaltonen. + + -- Martin Pitt Wed, 21 Jan 2009 02:04:40 +0100 + +hal (0.5.12~rc1-0ubuntu6) jaunty; urgency=low + + * Add 00git_fix_drm_acls.patch: Fix copy&paste error which assigned + the wrong access_control.file for /dev/drm/card* devices. It + previously copied "input.device", but should be + "linux.device_file". This brings back hardware GL rendering, + instead of always using the Mesa software rasterizer. (Part of + LP #269509) + + -- Martin Pitt Mon, 19 Jan 2009 12:33:07 +0100 + +hal (0.5.12~rc1-0ubuntu5) jaunty; urgency=low + + * Bump dependency on udev. + + -- Scott James Remnant Fri, 09 Jan 2009 11:47:29 +0000 + +hal (0.5.12~rc1-0ubuntu4) jaunty; urgency=low + + * debian/patches/ubuntu_02_udevrulesdir.patch: Install udev rules into + /lib/udev/rules.d instead of /etc + * debian/hal.preinst: Remove the old rule file unless it's modified. + + -- Scott James Remnant Wed, 07 Jan 2009 17:27:06 +0000 + +hal (0.5.12~rc1-0ubuntu3) jaunty; urgency=low + + * debian/10-x11-keymap.fdi: revert the evdev workaround for ThinkPad + extra buttons, which is not required in jaunty and above. + + -- Steve Langasek Fri, 12 Dec 2008 14:31:53 -0800 + +hal (0.5.12~rc1-0ubuntu2) jaunty; urgency=low + + * Drop 99_new-kernel-rfkill-interface.patch, it's allegedly not necessary + with this new hal any more. The upstream rfkill addon now handles all + kernel rfkill types. + * Add 00git_build_2.6.28.patch: Fix FTBFS with linux-libc-dev from Linux + 2.6.28. Committed to upstream git, too. + + -- Martin Pitt Thu, 27 Nov 2008 19:39:05 +0100 + +hal (0.5.12~rc1-0ubuntu1) jaunty; urgency=low + + * New upstream release; first candidate for 0.5.12. + * Drop patches which got accepted upstream: + - 03_increase_helper_timeout.patch + - 04_read_brightness_not_actual_brightness.patch + - 05_removable_block_acl_support.patch + - 10_ntfs_uid_mount.patch + - 84_memstick_bus_support.patch + * Drop 01_default_suspend_quirks.patch: Current hal-info sets default quirks + now, while pm-utils' 98smart-kernel-video disables the quirks on intel and + nvidia. + + -- Martin Pitt Thu, 27 Nov 2008 16:59:24 +0100 + +hal (0.5.11+git20081110-0ubuntu1) jaunty; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/{hal.init,rules}: Use /var/run/hald/ as PID file directory, not + /var/run/hal/, since the former is needed for sockets, ACL caches, etc. + (LP #205496) + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Use PolicyKit/: + + Add libpolkit-dev build dependency and policykit, consolekit, acl + runtime dependencies. + + debian/rules: Enable PK, CK, and automatic ACL management. + + hal.install, debian/hal.manpages: Ship usr/share/PolicyKit/ and + hal-is-caller-privileged.1. + + hal.postinst: Allow haldaemon user to query the PolicyKit database to + enforce privileges. + + debian/README.Debian: Adapt description for dynamic privileges. + + debian/hal.postinst: Do not create the powerdev/plugdev system groups. + + Drop Debian's 01_hal_debian_dbuspolicy.patch (which assumes + powerdev/plugdev system groups). + - Enable input-hotplug for xorg: + + 85_set_property_direct.patch: a patch from Fedora to add --direct + option to hal-set-property. + + debian/debian-setup-keyboard: modify a callout script from Fedora to + work with console-setup. + + debian/10-x11-keymap.fdi: add a callout to run debian-setup-keyboard + + debian/rules, debian/hal.install: install 10-x11-input.fdi again. + - 05_removable_block_acl_support.patch: Add support for adding ACLs to + removable block devices (such as USB keys) on insertion. + - Various bug fixes, see their patch headers: + + 01_default_suspend_quirks.patch + + 02_long_storage_size.patch + + 03_increase_helper_timeout.patch + + 04_read_brightness_not_actual_brightness.patch + + 05_dell_backlight_lockups.patch + + 06_smart_card_readers_acl.patch + + 96_uinput_device_support.patch + + 99_new-kernel-rfkill-interface.patch + + 100_dell_killswitch.patch + + ubuntu_01_ignore_single_slash_label.patch + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + * Update to current git head snapshot. + - Works with ConsoleKit 0.3 API. Bumped consolekit dependency + accordingly, and add libck-connector-dev build dependency, so that + configure can check the available ConsoleKit version. (LP: #273711) + - Delete patches applied upstream: + + 02_long_storage_size.patch + + 05_dell_backlight_lockups.patch + + 56_revert_ntfs_locale_mount_option.patch + + 60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch + + 61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch + + 100_dell_killswitch.patch + - Ported 99_new-kernel-rfkill-interface.patch to new code base, as far as + possible. + * Add 07_joystick_detection.patch: Add proper detection for Joysticks, so + that they don't end up as being detected as mouse. Thanks to Ari Mustonen + for the patch! (LP: #284129) + + -- Martin Pitt Mon, 10 Nov 2008 12:55:42 +0100 + hal (0.5.11-6) unstable; urgency=low * debian/patches/56_revert_ntfs_locale_mount_option.patch @@ -120,7 +614,7 @@ hal (0.5.11-6) unstable; urgency=low used. (Closes: #497463) * debian/hal.postinst - Remove existing stop symlinks in rc0 and rc6 on package upgrades. - (Closes: #501662) + (Closes: 501662) -- Michael Biebl Sat, 25 Oct 2008 15:16:30 +0200 @@ -132,6 +626,95 @@ hal (0.5.11-5) unstable; urgency=low -- Loic Minier Mon, 06 Oct 2008 16:42:53 +0200 +hal (0.5.11-4ubuntu4) intrepid; urgency=low + + * 100_dell_killswitch.patch: don't disable the hardware switch + for bluetooth radio on Dell laptops with the killswitch interface, + only toggle software radio options. (LP: #288294) + * 99_new-kernel-rfkill-interface.patch: Update upstream bug number to point + to bug rather than attachement. + + -- Mario Limonciello Sat, 25 Oct 2008 23:22:09 -0500 + +hal (0.5.11-4ubuntu3) intrepid; urgency=low + + * 99_new-kernel-rfkill-interface.patch: use + /sys/class/net/$device/rfkill/rfkill/state to detect that an + antenna has been powered off. LP: #267875. + + -- Steve Langasek Tue, 14 Oct 2008 21:48:23 +0000 + +hal (0.5.11-4ubuntu2) intrepid; urgency=low + + * 01_default_suspend_quirks.patch: Disable remaining quirks (s3-bios, + s3-mode, dpms-suspend, and radeon-off) for systems using the proprietary + nvidia and fglrx drivers and newer Intels, too, since they break + suspend/hibernate. (LP: #253223) + + -- Martin Pitt Thu, 09 Oct 2008 08:38:29 +0200 + +hal (0.5.11-4ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + (LP #134712) + - debian/{hal.init,rules}: Use /var/run/hald/ as PID file directory, not + /var/run/hal/, since the former is needed for sockets, ACL caches, etc. + (LP #205496) + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/rules, debian/hal.init: Do not run stop init.d script for levels 1 + and 6 (TearDown). (Debian #501310) + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Use PolicyKit/: + + Add libpolkit-dev build dependency and policykit, consolekit, acl + runtime dependencies. + + debian/rules: Enable PK, CK, and automatic ACL management. + + hal.install, debian/hal.manpages: Ship usr/share/PolicyKit/ and + hal-is-caller-privileged.1. + + hal.postinst: Allow haldaemon user to query the PolicyKit database to + enforce privileges. + + debian/README.Debian: Adapt description for dynamic privileges. + + debian/hal.postinst: Do not create the powerdev/plugdev system groups. + + Drop Debian's 01_hal_debian_dbuspolicy.patch (which assumes + powerdev/plugdev system groups). + - Enable input-hotplug for xorg: + + 85_set_property_direct.patch: a patch from Fedora to add --direct + option to hal-set-property. + + debian/debian-setup-keyboard: modify a callout script from Fedora to + work with console-setup. + + debian/10-x11-keymap.fdi: add a callout to run debian-setup-keyboard + + debian/rules, debian/hal.install: install 10-x11-input.fdi again. + - 05_removable_block_acl_support.patch: Add support for adding ACLs to + removable block devices (such as USB keys) on insertion. + - Various bug fixes, see their patch headers: + + 01_default_suspend_quirks.patch + + 02_long_storage_size.patch + + 03_increase_helper_timeout.patch + + 04_read_brightness_not_actual_brightness.patch + + 05_dell_backlight_lockups.patch + + 06_smart_card_readers_acl.patch + + 96_uinput_device_support.patch + + ubuntu_01_ignore_single_slash_label.patch + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 88_change_pm_quirk_policy.patch: Patch by Matthew Garret, undocumented, + non-obvious purpose. + * debian/hal.init: Drop the FDI cache removal again, replaced with better + dpkg trigger solution in Debian. + * debian/hal.init: Drop gparted-disable-automount.fdi handling, it has been + fixed properly in gparted now. + * debian/hal.init: Fix Default-Stop: to match update-rc.d call. (Don't stop + on 0 and 6) + + -- Martin Pitt Mon, 06 Oct 2008 16:26:33 +0200 + hal (0.5.11-4) unstable; urgency=low [ Loic Minier ] @@ -150,6 +733,109 @@ hal (0.5.11-4) unstable; urgency=low -- Michael Biebl Sun, 05 Oct 2008 17:50:25 +0200 +hal (0.5.11-3~ubuntu10) intrepid; urgency=low + + [ Martin Pitt ] + * debian/hal.init: Remove the FDI cache before startup. dpkg preserves + original timestamps of unpacked fdi files in packages, so changes in those + will never get picked up on upgrade, not even after a reboot. + (LP: #275825) + + [ Michael Bienia ] + * Add debian/patches/06_smart_card_readers_acl.patch: + Grant access to the currently logged-in user on some SCM smart-card + readers (LP: #57755). This should improve the out-of-box support for + OpenGPG card users. + + -- Martin Pitt Thu, 02 Oct 2008 17:16:53 +0200 + +hal (0.5.11-3~ubuntu9) intrepid; urgency=low + + * debian/10-x11-keymap.fdi: Disable -evdev for the ThinkPad extra buttons; + -evdev currently exclusively grabs that input device without properly + passing it on. This workaround restores the old path through acpid and + hal. (LP: #267682) + + -- Martin Pitt Mon, 29 Sep 2008 14:58:51 +0200 + +hal (0.5.11-3~ubuntu8) intrepid; urgency=low + + * debian-setup-keyboard: Read the model from + /etc/default/console-setup, and force input.xkb.rules as evdev. + + -- Timo Aaltonen Tue, 09 Sep 2008 19:22:19 +0300 + +hal (0.5.11-3~ubuntu7) intrepid; urgency=low + + * Build depend on newer libsmbios. (LP: #261665) + + -- Mario Limonciello Tue, 26 Aug 2008 18:15:52 -0500 + +hal (0.5.11-3~ubuntu6) intrepid; urgency=low + + * List lpia in libsmbios bdeps and deps; LP: #239843. + + -- Loic Minier Fri, 08 Aug 2008 18:46:41 +0200 + +hal (0.5.11-3~ubuntu5) intrepid; urgency=low + + * Enable input-hotplug for xorg + - 85_set_property_direct.patch: a patch from Fedora to add --direct + option to hal-set-property. + - debian/debian-setup-keyboard: modify a callout script from Fedora to + work with console-setup. + - debian/10-x11-keymap.fdi: add a callout to run debian-setup-keyboard + - debian/rules, debian/hal.install: install 10-x11-input.fdi again. + + -- Timo Aaltonen Tue, 05 Aug 2008 11:10:51 +0300 + +hal (0.5.11-3~ubuntu4) intrepid; urgency=low + + * debian/control + - Depends on lsb-base >= 3.2-14, provides status_of_proc() + * debian/hal.init + - Added the 'status' action, (LP: #252350) + + -- Timothy Bielawa Sun, 27 Jul 2008 11:12:16 -0400 + +hal (0.5.11-3~ubuntu3) intrepid; urgency=low + + * Add 05_dell_backlight_lockups.patch: + -Resolves lockups caused if a BIOS password of some type is active. + Changing backlight via BIOS w/ a BIOS password is an unsupported + mechanism currently. (LP: #189814) + * debian/control: + - Depend on libsmbios 0.13.13-1ubuntu2 or later for the above patch + to work. + + -- Mario Limonciello Tue, 22 Jul 2008 16:45:13 +0200 + +hal (0.5.11-3~ubuntu2) intrepid; urgency=low + + * Drop 96_uinput_device_support.patch: It is a bad security design (user + processes should not have direct access to the hardware, such a thing + belongs into an unix_chkpwd-like wrapper), was intended as a hack for + Hardy, and not accepted upstream. [UbuntuSpec:intrepid-device-permissions] + * 02_long_storage_size.patch: Use uint64 instead of int for + volume.num_blocks, as it can get larger than 2G. (LP: #209483) + + -- Martin Pitt Mon, 21 Jul 2008 15:49:17 +0200 + +hal (0.5.11-3~ubuntu1) intrepid; urgency=low + + [ Steve Kowalik ] + * 05_removable_block_acl_support.patch: Add, adds support for adding ACLs to + removable block devices (such as USB keys) on insertion. + + [ Martin Pitt ] + * Merge latest changes from Debian. + * debian/hal.preinst: Clean up the old Debian/Ubuntu specific hal rules + file. This needs to be kept until after the next LTS. + * debian/hal.init: Ignore failure of removing gparted-disable-automount.fdi, + which happens if /usr is read-only. (LP: #248649) + + -- Martin Pitt Tue, 15 Jul 2008 17:43:21 +0100 + hal (0.5.11-3) unstable; urgency=low [ Michael Biebl ] @@ -184,6 +870,60 @@ hal (0.5.11-2) unstable; urgency=low -- Michael Biebl Sun, 15 Jun 2008 22:50:13 +0200 +hal (0.5.11-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + Needs to be kept until Gnome #324220 is fixed properly. + (LP #134712) + - debian/{hal.init,rules}: Use /var/run/hald/ as PID file directory, not + /var/run/hal/, since the former is needed for sockets, ACL caches, etc. + (LP #205496) + - debian/hal.init: Unconditionally chown the directory in the init script. + (LP #175525) + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Use PolicyKit/: + + Add libpolkit-dev build dependency and policykit, consolekit, acl + runtime dependencies. + + debian/rules: Enable PK, CK, and automatic ACL management. + + hal.install, debian/hal.manpages: Ship usr/share/PolicyKit/ and + hal-is-caller-privileged.1. + + hal.postinst: Allow haldaemon user to query the PolicyKit database to + enforce privileges. + + debian/README.Debian: Adapt description for dynamic privileges. + + debian/hal.postinst: Do not create the powerdev/plugdev system groups. + + Drop Debian's 01_hal_debian_dbuspolicy.patch (which assumes + powerdev/plugdev system groups). + - Various bug fixes, see their patch headers: + + 01_default_suspend_quirks.patch + + 03_increase_helper_timeout.patch + + 04_read_brightness_not_actual_brightness.patch + + 96_uinput_device_support.patch + + ubuntu_01_ignore_single_slash_label.patch + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 88_change_pm_quirk_policy.patch: Patch by Matthew Garret, undocumented, + non-obvious purpose. + * debian/hal.postinst: Only do polkit-auth call for a fresh installation. No + need to do it on upgrade. + + -- Martin Pitt Thu, 15 May 2008 17:15:26 +0200 + hal (0.5.11-1) unstable; urgency=low * New upstream release. @@ -198,6 +938,103 @@ hal (0.5.11-1) unstable; urgency=low -- Michael Biebl Thu, 08 May 2008 13:36:20 +0200 +hal (0.5.11~rc2-1ubuntu9) intrepid; urgency=low + + * Add 03_increase_helper_timeout.patch: Increase helper timeout from 10 to + 20 seconds. Some CD-ROMs are too slow to do all the detection in 10 + seconds. (LP: #218834) + + -- Martin Pitt Wed, 30 Apr 2008 11:00:07 +0200 + +hal (0.5.11~rc2-1ubuntu8) hardy-proposed; urgency=low + + * debian/hal.postinst: If hal has any start rc symlinks, force them back to + 24. A lot of people end up with priority 12 for some reason, which races + with dbus startup, especially with CONCURRENCY=shell. (LP: #25931) + * Add 00upstream-fix-macbook-backlight.patch: Fix backlight control on + MacBooks. Thanks to godlygeek! (LP: #206921) + + -- Martin Pitt Mon, 28 Apr 2008 07:44:11 +0200 + +hal (0.5.11~rc2-1ubuntu7) hardy; urgency=low + + * Add 02_input_spin_removed_fd.patch: + - Avoid spinning on already invalidated/closed file descriptors in the + input addon. This fixes "hal takes 100% CPU and breaks input device + handling" on a lot of machines. (LP: #203679) + - Thanks to Jon Oberheide for the patch! + + -- Martin Pitt Mon, 21 Apr 2008 10:36:50 +0200 + +hal (0.5.11~rc2-1ubuntu6) hardy; urgency=low + + * debian/patches/01_default_suspend_quirks.patch: Use quirks on i845 and + i865, too; thanks, Matthew Garrett. + * debian/hal.postinst: Fix rc.d symlinks harder on upgrades from dapper. + (LP: #211343) + + -- Martin Pitt Tue, 08 Apr 2008 18:24:15 -0500 + +hal (0.5.11~rc2-1ubuntu5) hardy; urgency=low + + * 01_default_suspend_quirks.patch: Apply the same logic to the + suspend-hybrid and hibernate script. + * debian/hal.postinst: Fix /var/run/hal -> /var/run/hald as well and drop + the chown'ing completely, since the init script does it already. + (LP: #175525) + * debian/hal.postinst: Fix upgrade version comparison to also force-reload + dbus when installing from scratch. (LP: #206787) + + -- Martin Pitt Wed, 26 Mar 2008 18:12:24 +0100 + +hal (0.5.11~rc2-1ubuntu4) hardy; urgency=low + + * debian/{hal.init,rules}: Use /var/run/hald/ as PID file directory, not + /var/run/hal/, since the former is needed for sockets, ACL caches, etc. + (LP: #205496) + + -- Martin Pitt Tue, 25 Mar 2008 16:50:58 +0100 + +hal (0.5.11~rc2-1ubuntu3) hardy; urgency=low + + * 01_default_suspend_quirks.patch: Disable video quirks when running on a + known-good video driver (proprietary nvidia and fglrx, and Intel >= + 915GM). Doing this here is better than the previously applied pm-utils + patch, since it avoids ignoring explicit pm-utils command line arguments, + consistently uses the same behaviour for suspend and resume, and keeps the + logic where it actually belongs. + + -- Martin Pitt Mon, 24 Mar 2008 17:35:38 +0100 + +hal (0.5.11~rc2-1ubuntu2) hardy; urgency=low + + * debian/rules: build using --with-deprecated-keys, since we don't want to + break packages that were assuming this worked right up through beta. + LP: #204768. + + -- Steve Langasek Fri, 21 Mar 2008 13:24:43 -0700 + +hal (0.5.11~rc2-1ubuntu1) hardy; urgency=low + + * Update our git snapshot from March 01 to current 0.5.11-RC2, which brings + a few bug fixes. + - Adds properties for tablet PCs (LP: #90451) + - Fixes operation on MacBookPro third generation. (LP: #129869) + * Remove patches applied upstream: + - 02_allow_ufs_ufstype.patch + - 05_fix_dell_brightness.patch + * Adapt patches to new upstream version: + - 96_uinput_device_support.patch + - 96_uinput_device_support.patch + * Merge with Debian unstable; see 0.5.10+git20080301-1ubuntu1 for remaining + Ubuntu changes. + * Replace 88_change_pm_quirk_policy.patch with + 01_default_suspend_quirks.patch: Only set the default suspend quirks for + kernel problem workarounds if hal-info does not define any quirks at all + for the hardware. (LP: #198808) + + -- Martin Pitt Fri, 21 Mar 2008 13:39:03 +0100 + hal (0.5.11~rc2-1) unstable; urgency=low * New upstream release candidate @@ -206,6 +1043,105 @@ hal (0.5.11~rc2-1) unstable; urgency=low -- Sjoerd Simons Tue, 18 Mar 2008 14:46:04 +0100 +hal (0.5.10+git20080301-1ubuntu3) hardy; urgency=low + + * debian/hal.postinst: + - make sure that the start scripts are installed on + dapper->hardy upgrades (LP: #203756) + + -- Michael Vogt Thu, 20 Mar 2008 10:17:43 +0100 + +hal (0.5.10+git20080301-1ubuntu2) hardy; urgency=low + + * debian/hal.preinst: Fix copy&paste error in mv_conffile(), so that the + udev rules transition actually works and a standard dapper->hardy upgrade + does not produce a conffile prompt. (LP: #172837) + + -- Martin Pitt Thu, 13 Mar 2008 19:01:51 +0100 + +hal (0.5.10+git20080301-1ubuntu1) hardy; urgency=low + + * Merge with Debian to pull in a current snapshot from upstream git head + (upstream neglects doing a long-overdue 0.5.11 release). This pulls in two + tons of bug fixes and reduces our insane stack of patches to a + maintainable level again. (LP: #198295) + - Uses MMC profile reading for CDs/DVDs. (LP: #66254) + * Remove the following patches which are upstream now: + - 01_proc_sys_batteries.patch + - 02_sysfs_battery_serial.patch + - 92_gxx43.patch + - 94_batter-model_name.patch + - 97_fix_power_info_via_sysfs.patch + * Drop 80_allow_vfat_usefree.patch; Using 'usefree' VFAT mount option is not + necessary with the current Hardy kernel any more. + * Drop debian/patches/82_ignore_fixed_nonmedia.patch: Obsolete, GVFS treats + fixed partitions correctly. + * Tag and forward the subset of our remaining patches which have some kind + of documentation and justification. Rename them to clean up patch order + prefixes a bit. + * 96_uinput_device_support.patch: Adapt to new upstream version. + * Remaining Ubuntu changes: + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + Needs to be kept until Gnome #324220 is fixed properly. + (LP #134712) + - debian/hal.init: Unconditionally chown the directory in the init script. + (LP #175525) + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + + debian/hal.{preinst,postinst,postrm}: Transition code for changing the + udev rule priority (see 0.5.8.1-3ubuntu7, needs to be kept until after + Hardy's release). + - debian/hal.preinst, debian/libhal1.preinst: Clean up doc directory + symlinking when upgrading from Gutsy. Needs to be kept until after + Hardy's release. + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Various bug fixes, see their patch headers: + + 02_allow_ufs_ufstype.patch + + 03_virtual_net_devices.patch + + 04_read_brightness_not_actual_brightness.patch + + 96_uinput_device_support.patch + + ubuntu_01_ignore_single_slash_label.patch + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 88_change_pm_quirk_policy.patch: Patch by Matthew Garret, undocumented, + non-obvious purpose. + - Use PolicyKit/ConsoleKit: + + Add libpolkit-dev build dependency and policykit, consolekit, acl + runtime dependencies. + + debian/rules: Enable PK, CK, and automatic ACL management. + + hal.install, debian/hal.manpages: Ship usr/share/PolicyKit/ and + hal-is-caller-privileged.1. + + hal.postinst: Allow haldaemon user to query the PolicyKit database to + enforce privileges. + + debian/README.Debian: Adapt description for dynamic privileges. + + debian/hal.postinst: Do not create the powerdev/plugdev system groups. + + Drop Debian's 01_hal_debian_dbuspolicy.patch (which assumes + powerdev/plugdev system groups). + - debian/hal.postinst: Do not restart hal when upgrading from 6.06. This + needs to be kept until after Hardy's release. + * Add policykit build dependency so that the build can use + polkit-policy-file-validate. + * Add debian/patches/05_fix_dell_brightness.patch: Fix Dell brightness + backend. (LP: #191725) + * Remove debian/patches/03_virtual_net_devices.patch. While being correct, + it would require fixing client applications, too, which is too late for + hardy. By request from Kees Cook. (See LP #199140, #198541) + + -- Martin Pitt Wed, 05 Mar 2008 18:14:57 +0100 + hal (0.5.10+git20080301-1) unstable; urgency=low [ Michael Biebl ] @@ -249,6 +1185,82 @@ hal (0.5.10+git20080301-1) unstable; urg -- Sjoerd Simons Mon, 03 Mar 2008 15:22:39 +0100 +hal (0.5.10-5ubuntu8) hardy; urgency=low + + [ Scott James Remnant ] + * Add debian/patches/96_uinput_device_support.patch: This creates a HAL + device for the uinput device, allowing us to set ACLs for it using + PolicyKit/ConsoleKit. (LP: #187130) + + [ Daniel T Chen ] + * Add debian/patches/97_fix_power_info_via_sysfs.patch: Fix battery status + reading from /sys. Patches taken from upstream GIT head. + (LP: #194052, #194719) + + [ Martin Pitt ] + * Add debian/patches/02_sysfs_battery_serial.patch: Get battery serial + number from sysfs. Patch taken fro upstream GIT head. + + -- Martin Pitt Mon, 03 Mar 2008 15:02:40 +0100 + +hal (0.5.10-5ubuntu7) hardy; urgency=low + + * Add debian/patches/95_virtual_net_devices.patch: Include virtual network + devices which do not have a physical parent. Thanks to Kees Cook for the + patch. + * Add debian/patches/01_proc_sys_batteries.patch: Fix showing batteries + twice. Taken from upstream git head, see patch header for details. + (LP: #177570) + + -- Martin Pitt Wed, 20 Feb 2008 12:09:48 +0100 + +hal (0.5.10-5ubuntu6) hardy; urgency=low + + * debian/patches/94_batter-model_name.patch: Battery probe was using + 'technology' for info.product, instead of 'model_name' attribute. + + -- Ben Collins Fri, 25 Jan 2008 11:30:47 +0000 + +hal (0.5.10-5ubuntu5) hardy; urgency=low + + * Fix build failure with g++-4.3. + + -- Matthias Klose Thu, 24 Jan 2008 16:53:58 +0000 + +hal (0.5.10-5ubuntu4) hardy; urgency=low + + * debian/hal.postinst: + - do not restart hal on dapper upgrades (that breaks) + + -- Michael Vogt Wed, 23 Jan 2008 10:48:43 +0000 + +hal (0.5.10-5ubuntu3) hardy; urgency=low + + * debian/hal.postinst: Allow user haldaemon to query the PolicyKit database. + Bump policykit dependency accordingly. + + -- Martin Pitt Tue, 15 Jan 2008 22:41:12 +0100 + +hal (0.5.10-5ubuntu2) hardy; urgency=low + + * debian/patches/88_change_pm_quirk_policy.patch: Change default pm + quirk policy to match previous Ubuntu behaviour. + + -- Matthew Garrett Sun, 30 Dec 2007 19:57:28 +0000 + +hal (0.5.10-5ubuntu1) hardy; urgency=low + + * Merge with Debian unstable. See 0.5.10-1ubuntu1 for remaining changes. + * debian/rules: Configure with --enable-acl-management, and add dependency + to 'acl'. (See hardy-hardware-detection spec.) + * Stop using the 'plugdev' and 'powerdev' system groups: + - Drop debian/patches/01_hal_debian_dbuspolicy.patch. + - debian/hal.postinst: Do not create these groups any more. + - debian/README.Debian: Adapt text about volume and power management + (users must be on a local console instead of in these groups). + + -- Martin Pitt Wed, 02 Jan 2008 14:51:43 +0100 + hal (0.5.10-5) unstable; urgency=low [ Michael Biebl ] @@ -302,6 +1314,30 @@ hal (0.5.10-5) unstable; urgency=low -- Sjoerd Simons Sat, 22 Dec 2007 18:12:30 +0100 +hal (0.5.10-5~ubuntu3) hardy; urgency=low + + * debian/postinst: Drop chown'ing of /var/run/hal/, it does not exist on + fresh installations yet. Unconditionally chown the directory in the init + script instead. (LP: #175525) + + -- Martin Pitt Wed, 12 Dec 2007 09:55:46 +0100 + +hal (0.5.10-5~ubuntu2) hardy; urgency=low + + * Re-add accidentally dropped pciutils-dev build dependency. + + -- Martin Pitt Tue, 11 Dec 2007 09:36:59 +0100 + +hal (0.5.10-5~ubuntu1) hardy; urgency=low + + * Merge to Debian svn head to collect some bug fixes. See 0.5.10-1ubuntu1 + for remaining changes. + * debian/hal.postinst: Do not fail if haldaemon user or system groups + already exist. Debian removed these check recently, but it does not seem + to work for Ubuntu, or under all conditions. + + -- Martin Pitt Mon, 10 Dec 2007 17:06:20 +0100 + hal (0.5.10-4) unstable; urgency=low * debian/patches/85_fix_strlist_to_string.patch: @@ -335,6 +1371,56 @@ hal (0.5.10-3) unstable; urgency=low -- Sjoerd Simons Sun, 25 Nov 2007 13:24:59 +0100 +hal (0.5.10-2ubuntu3) hardy; urgency=low + + * debian/hal.postinst: + - do not hal force-reload on upgrades from dapper (otherwise dbus + breaks badly) + + -- Michael Vogt Tue, 04 Dec 2007 13:41:27 +0100 + +hal (0.5.10-2ubuntu2) hardy; urgency=low + + * Merge Debian's experimental version to enable PolicyKit. + + -- Martin Pitt Tue, 20 Nov 2007 12:56:05 +0100 + +hal (0.5.10-2exp1) experimental; urgency=low + + * Enable the ConsoleKit/PolicyKit support in hal. Upload to experimental to + give this feature some wider testing. + * debian/control + - Add a Build-Depends on libpolkit-dev (>= 0.5). + - Add a Depends on policykit and consolekit to the hal package. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Change maintainer address to pkg-utopia-maintainers@l.a.d.o. + - Add sjoerd, slomo and myself to Uploaders. + * debian/rules + - Add --enable-console-kit and --enable-policy-kit to + DEB_CONFIGURE_EXTRA_FLAGS. + * debian/hal.install + - Install the hal-is-caller-privileged binary. + - Install the policy files in /usr/share/PolicyKit/. + * debian/hal.manpages + - Install the man page for hal-is-caller-privileged. + * debian/patches/55_nonpolkit-mount-policy.patch + - Removed. Patch has become obsolete as we use PolicyKit now. + * debian/patches/41_no_policy_validate.patch + - Don't fail during configure if polkit-policy-file-validate is not found. + This avoids an unnecessary build dependency on policykit. + + -- Michael Biebl Mon, 05 Nov 2007 10:36:25 +0100 + +hal (0.5.10-2ubuntu1) hardy; urgency=low + + * Merge with Debian unstable to get the X.org input hotplug reversion for + the time being. + * *.preinst: On upgrades from Gutsy, remove the symlinks to entire + /usr/share/doc// directories which got introduced in Gutsy. They + break upgrades all over, and current cdbs just symlinks individual files. + + -- Martin Pitt Wed, 31 Oct 2007 10:46:49 -0400 + hal (0.5.10-2) unstable; urgency=low * debian/rules @@ -353,6 +1439,69 @@ hal (0.5.10-2) unstable; urgency=low -- Michael Biebl Wed, 24 Oct 2007 15:38:34 +0200 +hal (0.5.10-1ubuntu1) hardy; urgency=low + + * Redo the bzr branch of this package as clean fork from the Debian svn + (https://code.launchpad.net/~ubuntu-core-dev/hal/debian, thanks bzr-svn!) + and commit the remaining relevant Ubuntu patches to it: + https://code.launchpad.net/~ubuntu-core-dev/hal/ubuntu + * Merge with Debian unstable; remaining Ubuntu changes: + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + + debian/hal.{preinst,postinst,postrm}: Transition code for changing the + udev rule priority (see 0.5.8.1-3ubuntu7, needs to be kept until after + next LTS). + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + (LP #134712) + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - 80_allow_vfat_usefree.patch: Allow vfat mount option "usefree". + (LP #133567) + - 81_ignore_single_slash_label.patch: Ignore labels which only consist of a + slash, so that they do not end up as /media/-. An earlier Ubuntu + d-i/ubiquity created those labels by default. (LP #83323) + - 82_ignore_fixed_nonmedia.patch: Ignore fixed partitions which mounted, + but not below /media/. + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 85_read_brightness_not_actual_brightness.patch: Read the brightness from + /sys/class/backlight/foo/brightness, not actual_brightness. It makes more + sense to change based on the brightness that we wanted to set, not the + brightness that we actually set. Patch by Matthew Garrett. Forwarded to + FD#12891. + * Now build with libsmbios to get Dell backlight support. (LP: #43572) + * Dropped the following Ubuntu changes: + - hwdb icons and patches, python-launchpad-integration, .desktop file + translation fixes: hal-device-manager is gone, will be replaced by + indepentent gnome-device-manager project. + - symlinking of doc directories in debian/rules: current cdbs does that + automatically now. + - 02_powerscripts.patch, 90_pmi.patch: pm-utils is the only supported + backend now. + - 26-addon-acpi-fix-free-before-init.diff, + 63_my_dbus_is_full_of_uints.patch, 69_set_dmi_before_matching.patch, + macbook-backlight.diff: Applied upstream. + - 56_probe_fstab.patch and the disabling of mounting for unmounted + partitions which are 'auto' in fstab: The patch does not fit into hal's + design to always show current information, was rejected upstream, + only handles a corner case, and we do not automount fixed drives anyway. + * Add 86_allow_ufs_ufstype.patch: Allow ufs mount option 'ufstype', thanks + to Georges Discry. (LP: #110865, FD#10998) + + -- Martin Pitt Tue, 23 Oct 2007 12:33:58 +0200 + hal (0.5.10-1) unstable; urgency=low [ Michael Biebl ] diff -pruN 0.5.12~git20090406.46dc48-2/debian/control 0.5.13-1ubuntu8/debian/control --- 0.5.12~git20090406.46dc48-2/debian/control 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/control 2009-10-21 14:43:59.000000000 +0100 @@ -1,9 +1,10 @@ Source: hal Section: admin Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Dröge , Michael Biebl -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 7.3.15ubuntu2), cdbs, autotools-dev, libdbus-glib-1-dev (>= 0.61), @@ -16,24 +17,33 @@ Build-Depends: debhelper (>= 7), doxygen, intltool (>= 0.22), libusb-dev [!hurd-i386], - libvolume-id-dev, + libblkid-dev (>= 2.15), xmlto, libxml2-utils, gtk-doc-tools, - libsmbios-dev (>= 2.0.3) [amd64 i386 lpia], gperf, quilt, - libpolkit-dev (>= 0.7), libck-connector-dev (>= 0.3) -Standards-Version: 3.8.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/hal -Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal +Standards-Version: 3.8.2 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/hal/ubuntu Homepage: http://hal.freedesktop.org/ Package: hal Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.125), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit (>= 0.3), acl -Recommends: eject, libsmbios-bin [amd64 i386 lpia] +Depends: ${shlibs:Depends}, ${misc:Depends}, + adduser, + pciutils, + usbutils, + udev (>= 0.125) [!kfreebsd-amd64 !kfreebsd-i386], + dbus (>= 1.2.16-0ubuntu3), + lsb-base (>= 3.2-14), + hal-info (>= 20070402), + mount (>= 2.13) [!kfreebsd-amd64 !kfreebsd-i386], + freebsd-utils [kfreebsd-amd64 kfreebsd-i386], + consolekit (>= 0.3) +Recommends: eject, + pm-utils [!kfreebsd-amd64 !kfreebsd-i386], + smartdimmer Suggests: gnome-device-manager Description: Hardware Abstraction Layer HAL provides an abstract view on hardware. diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.examples 0.5.13-1ubuntu8/debian/hal.examples --- 0.5.12~git20090406.46dc48-2/debian/hal.examples 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.examples 2009-10-21 14:43:59.000000000 +0100 @@ -1,2 +1 @@ debian/no-cd-media-check.fdi -fdi/policy/10osvendor/10-x11-input.fdi diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.init 0.5.13-1ubuntu8/debian/hal.init --- 0.5.12~git20090406.46dc48-2/debian/hal.init 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.init 2009-10-21 14:43:59.000000000 +0100 @@ -42,13 +42,12 @@ do_start() { } do_stop() { - start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ - --exec $DAEMON + start-stop-daemon --stop --retry 5 --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON } -case "$1" in - start) - if [ ! -d /proc/sys/fs/inotify ]; then +check_prerequisites() { + if [ ! -d /proc/sys/fs/inotify ] && [ `uname` = "Linux" ]; then log_failure_msg "Can't start $DESC - enable inotify support in your kernel" exit 0 fi @@ -57,7 +56,7 @@ case "$1" in exit 0 fi - if [ ! -d /sys/kernel ]; then + if [ ! -d /sys/devices ] && [ `uname` = "Linux" ]; then log_failure_msg "Can't start $DESC - sysfs not mounted on /sys" exit 0 fi @@ -66,7 +65,11 @@ case "$1" in log_failure_msg "Can't start $DESC - detected chrooted session" exit 0 fi - +} + +case "$1" in + start) + check_prerequisites log_daemon_msg "Starting $DESC" "$NAME" do_start log_end_msg $? @@ -77,9 +80,9 @@ case "$1" in log_end_msg $? ;; restart|force-reload) + check_prerequisites log_daemon_msg "Restarting $DESC" "$NAME" do_stop - sleep 1 do_start log_end_msg $? ;; diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.install 0.5.13-1ubuntu8/debian/hal.install --- 0.5.12~git20090406.46dc48-2/debian/hal.install 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.install 2009-10-21 14:43:59.000000000 +0100 @@ -4,7 +4,7 @@ debian/tmp/usr/sbin/ debian/tmp/sbin/umount.hal usr/sbin debian/tmp/usr/lib/hal/ debian/tmp/usr/share/hal/fdi/ -debian/tmp/usr/share/PolicyKit/ -debian/tmp/lib/udev/rules.d/ +# Now conditionally installed from debian/rules: +# debian/tmp/lib/udev/rules.d/ debian/preferences.fdi etc/hal/fdi/policy debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.manpages 0.5.13-1ubuntu8/debian/hal.manpages --- 0.5.12~git20090406.46dc48-2/debian/hal.manpages 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.manpages 2009-10-21 14:43:59.000000000 +0100 @@ -3,8 +3,6 @@ debian/tmp/usr/share/man/man1/hal-disabl debian/tmp/usr/share/man/man1/hal-find-by-capability.1 debian/tmp/usr/share/man/man1/hal-find-by-property.1 debian/tmp/usr/share/man/man1/hal-get-property.1 -debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1 -debian/tmp/usr/share/man/man1/hal-is-caller-privileged.1 debian/tmp/usr/share/man/man1/hal-lock.1 debian/tmp/usr/share/man/man1/hal-set-property.1 debian/tmp/usr/share/man/man1/lshal.1 diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.postinst 0.5.13-1ubuntu8/debian/hal.postinst --- 0.5.12~git20090406.46dc48-2/debian/hal.postinst 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.postinst 2009-10-21 14:43:59.000000000 +0100 @@ -46,17 +46,13 @@ case "$1" in if [ -x /etc/init.d/dbus ]; then invoke-rc.d dbus force-reload || true fi - - # Allow hal to query the PolicyKit database to enforce privileges - polkit-auth --user haldaemon --grant 'org.freedesktop.policykit.read' > /dev/null 2>&1 || true - ;; abort-upgrade|abort-remove|abort-deconfigure) ;; triggered) echo "Regenerating hal fdi cache ..." rm -f /var/cache/hald/fdi-cache - invoke-rc.d hal restart || true + restart hal || : exit 0 ;; *) diff -pruN 0.5.12~git20090406.46dc48-2/debian/hal.upstart 0.5.13-1ubuntu8/debian/hal.upstart --- 0.5.12~git20090406.46dc48-2/debian/hal.upstart 1970-01-01 01:00:00.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/hal.upstart 2009-10-21 14:43:59.000000000 +0100 @@ -0,0 +1,18 @@ +# hal - hardware abstraction layer +# +# The HAL daemon collects and maintains information about your hardware +# and provides an abstraction layer for applications to access that +# information and utilise the hardware. + +description "hardware abstraction layer" + +start on (filesystem + and started dbus + and started udev) +stop on (stopping dbus + or stopping udev) + +expect fork +respawn + +exec hald --daemon=yes diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/00git_cpufreq_warning_message_fix.patch 0.5.13-1ubuntu8/debian/patches/00git_cpufreq_warning_message_fix.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/00git_cpufreq_warning_message_fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/00git_cpufreq_warning_message_fix.patch 2009-10-21 14:43:59.000000000 +0100 @@ -0,0 +1,13 @@ +diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c +index f8d29ab..977ee08 100644 +--- a/hald/linux/addons/addon-cpufreq.c ++++ b/hald/linux/addons/addon-cpufreq.c +@@ -408,7 +408,7 @@ static gboolean ondemand_set_consider_nice(void *data, gboolean consider) + consider_file = g_strdup_printf(ONDEMAND_IGNORE_NICE_LOAD_FILE, iface->base_cpu); + + if(!write_line(consider_file, "%u", !consider)){ +- HAL_WARNING(("Could not set ignore_nice_load to: %u kHz; %s", consider, ++ HAL_WARNING(("Could not set ignore_nice_load to: %u; %s", consider, + strerror(errno))); + g_free(consider_file); + return FALSE; diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/01_at_console.patch 0.5.13-1ubuntu8/debian/patches/01_at_console.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/01_at_console.patch 1970-01-01 01:00:00.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/01_at_console.patch 2009-10-21 14:43:59.000000000 +0100 @@ -0,0 +1,44 @@ +Index: hal-0.5.13/hal.conf.in +=================================================================== +--- hal-0.5.13.orig/hal.conf.in 2009-09-23 16:41:51.000000000 +0200 ++++ hal-0.5.13/hal.conf.in 2009-09-23 16:41:57.000000000 +0200 +@@ -25,7 +25,39 @@ + send_interface="org.freedesktop.Hal.Device"/> + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + ++ ++ + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ \n ++ 86 ++ sony-nvidia ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ org.freedesktop.Hal.Device.LaptopPanel ++ ++ SetBrightness ++ i ++ brightness_value ++ hal-system-lcd-set-brightness ++ ++ GetBrightness ++ ++ ++ hal-system-lcd-get-brightness ++ ++ ++ ++ +Index: hal-0.5.13/fdi/policy/10osvendor/Makefile.am +=================================================================== +--- hal-0.5.13.orig/fdi/policy/10osvendor/Makefile.am ++++ hal-0.5.13/fdi/policy/10osvendor/Makefile.am +@@ -8,6 +8,7 @@ + 10-leds.fdi \ + 10-power-mgmt-policy.fdi \ + 10-rfkill-switch.fdi \ ++ 10-sony-laptop-brightness.fdi \ + 10-tabletPCs.fdi \ + 10-x11-input.fdi \ + 15-storage-luks.fdi \ +Index: hal-0.5.13/fdi/policy/10osvendor/Makefile.in +=================================================================== +--- hal-0.5.13.orig/fdi/policy/10osvendor/Makefile.in ++++ hal-0.5.13/fdi/policy/10osvendor/Makefile.in +@@ -58,7 +58,7 @@ + DIST_SOURCES = + am__dist_fdi_DATA_DIST = 10-input-policy.fdi 10-dockstation.fdi \ + 10-laptop-panel-mgmt-policy.fdi 10-leds.fdi \ +- 10-power-mgmt-policy.fdi 10-rfkill-switch.fdi 10-tabletPCs.fdi \ ++ 10-power-mgmt-policy.fdi 10-rfkill-switch.fdi 10-sony-laptop-brightness.fdi 10-tabletPCs.fdi \ + 10-x11-input.fdi 15-storage-luks.fdi 20-storage-methods.fdi \ + 30-wol.fdi 10-keymap.fdi 10-macbookpro-utils.fdi \ + 10-macbook-backlight.fdi 10-imac-backlight.fdi 10-cpufreq.fdi \ +@@ -236,7 +236,7 @@ + fdidir = $(datadir)/hal/fdi/policy/10osvendor + dist_fdi_DATA = 10-input-policy.fdi 10-dockstation.fdi \ + 10-laptop-panel-mgmt-policy.fdi 10-leds.fdi \ +- 10-power-mgmt-policy.fdi 10-rfkill-switch.fdi 10-tabletPCs.fdi \ ++ 10-power-mgmt-policy.fdi 10-rfkill-switch.fdi 10-sony-laptop-brightness.fdi 10-tabletPCs.fdi \ + 10-x11-input.fdi 15-storage-luks.fdi 20-storage-methods.fdi \ + 30-wol.fdi $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) $(am__append_6) \ +Index: hal-0.5.13/tools/linux/hal-system-lcd-get-brightness-linux +=================================================================== +--- hal-0.5.13.orig/tools/linux/hal-system-lcd-get-brightness-linux ++++ hal-0.5.13/tools/linux/hal-system-lcd-get-brightness-linux +@@ -23,6 +23,15 @@ + exit 1 + fi + exit ${value} ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony-nvidia" ]; then ++ # smartdimmer -g ++ value=$(( $(smartdimmer -g | awk '{print $3;}') - 15 )) ++ if [ $? -ne 0 ]; then ++ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 ++ echo "smartdimmer -g returned != 0" >&2 ++ exit 1 ++ fi ++ exit ${value} + fi + + # Check for file existance and that it's readable +Index: hal-0.5.13/tools/linux/hal-system-lcd-set-brightness-linux +=================================================================== +--- hal-0.5.13.orig/tools/linux/hal-system-lcd-set-brightness-linux ++++ hal-0.5.13/tools/linux/hal-system-lcd-set-brightness-linux +@@ -23,6 +23,15 @@ + exit 1 + fi + exit 0 ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony-nvidia" ]; then ++ # -s --set Set brightness level (15-100) ++ smartdimmer -s "$(( $value + 15 ))" ++ if [ $? -ne 0 ]; then ++ echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 ++ echo "smartdimmer -s returned != 0" >&2 ++ exit 1 ++ fi ++ exit 0 + fi + + # Check for file existance and that it's writable diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/10-no-polkit-policy-file-validate-check.patch 0.5.13-1ubuntu8/debian/patches/10-no-polkit-policy-file-validate-check.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/10-no-polkit-policy-file-validate-check.patch 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/10-no-polkit-policy-file-validate-check.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -Index: hal-0.5.12/configure.in -=================================================================== ---- hal-0.5.12.orig/configure.in 2009-03-16 04:22:46.000000000 +0100 -+++ hal-0.5.12/configure.in 2009-03-16 04:23:02.000000000 +0100 -@@ -589,7 +589,7 @@ - AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], - [polkit-policy-file-validate], [polkit-policy-file-validate]) - if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then -- AC_MSG_ERROR([polkit-policy-file-validate not found]) -+ AC_MSG_WARN([polkit-policy-file-validate not found]) - fi - fi - -Index: hal-0.5.12/configure -=================================================================== ---- hal-0.5.12.orig/configure 2009-03-16 04:22:46.000000000 +0100 -+++ hal-0.5.12/configure 2009-03-16 04:23:12.000000000 +0100 -@@ -19507,9 +19507,8 @@ - - - if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then -- { { $as_echo "$as_me:$LINENO: error: polkit-policy-file-validate not found" >&5 --$as_echo "$as_me: error: polkit-policy-file-validate not found" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:$LINENO: WARNING: polkit-policy-file-validate not found" >&5 -+$as_echo "$as_me: WARNING: polkit-policy-file-validate not found" >&2;} - fi - fi - diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/11-direct-hal-set-propery.patch 0.5.13-1ubuntu8/debian/patches/11-direct-hal-set-propery.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/11-direct-hal-set-propery.patch 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/11-direct-hal-set-propery.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# In order to set the X keymap correctly in the future it looks like we'll -# need the following patch in hal to make hal-set-property call -# libhal_ctx_init_direct. -# Debian http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513928 -diff -up hal-0.5.10/tools/hal_set_property.c.jx hal-0.5.10/tools/hal_set_property.c ---- hal-0.5.10/tools/hal_set_property.c.jx 2007-07-26 14:00:28.000000000 -0400 -+++ hal-0.5.10/tools/hal_set_property.c 2008-03-10 14:22:58.000000000 -0400 -@@ -66,7 +66,7 @@ usage (int argc, char *argv[]) - " (--int | --string | --bool |\n" - " --strlist-pre | --strlist-post |\n" - " --strlist-rem | --double | --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 @@ usage (int argc, char *argv[]) - " --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 @@ main (int argc, char *argv[]) - 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 @@ main (int argc, char *argv[]) - {"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 @@ main (int argc, char *argv[]) - 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 @@ main (int argc, char *argv[]) - - 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 -pruN 0.5.12~git20090406.46dc48-2/debian/patches/23_addon_acpi.patch 0.5.13-1ubuntu8/debian/patches/23_addon_acpi.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/23_addon_acpi.patch 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/23_addon_acpi.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -diff -aur hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c hal-0.5.8/hald/linux/addons/addon-acpi.c ---- hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c 2006-09-11 23:56:39.000000000 +0200 -+++ hal-0.5.8/hald/linux/addons/addon-acpi.c 2006-09-17 16:12:51.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))); - -Only in hal-0.5.8/hald/linux/addons: addon-acpi.c.orig diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/50_kfreebsd.patch 0.5.13-1ubuntu8/debian/patches/50_kfreebsd.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/50_kfreebsd.patch 1970-01-01 01:00:00.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/50_kfreebsd.patch 2009-10-21 14:43:59.000000000 +0100 @@ -0,0 +1,145 @@ +diff --git a/hald/freebsd/libprobe/Makefile.am b/hald/freebsd/libprobe/Makefile.am +index 20f8788..f0a8211 100644 +--- a/hald/freebsd/libprobe/Makefile.am ++++ b/hald/freebsd/libprobe/Makefile.am +@@ -8,7 +8,7 @@ AM_CPPFLAGS = \ + @DBUS_CFLAGS@ + + if HALD_COMPILE_FREEBSD +-lib_LTLIBRARIES = libhald_freebsd_probe.la ++noinst_LTLIBRARIES = libhald_freebsd_probe.la + endif + + libhald_freebsd_probe_la_SOURCES = \ +diff --git a/hald/freebsd/libprobe/Makefile.in b/hald/freebsd/libprobe/Makefile.in +index 1e04a3c..04b0a83 100644 +--- a/hald/freebsd/libprobe/Makefile.in ++++ b/hald/freebsd/libprobe/Makefile.in +@@ -42,15 +42,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libdir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(lib_LTLIBRARIES) ++LTLIBRARIES = $(noinst_LTLIBRARIES) + libhald_freebsd_probe_la_LIBADD = + am_libhald_freebsd_probe_la_OBJECTS = hfp.lo hfp-cdrom.lo + libhald_freebsd_probe_la_OBJECTS = \ +@@ -58,8 +50,7 @@ libhald_freebsd_probe_la_OBJECTS = \ + libhald_freebsd_probe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libhald_freebsd_probe_la_LDFLAGS) $(LDFLAGS) -o $@ +-@HALD_COMPILE_FREEBSD_TRUE@am_libhald_freebsd_probe_la_rpath = -rpath \ +-@HALD_COMPILE_FREEBSD_TRUE@ $(libdir) ++@HALD_COMPILE_FREEBSD_TRUE@am_libhald_freebsd_probe_la_rpath = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -244,7 +235,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir) -I.. \ + @DBUS_CFLAGS@ + +-@HALD_COMPILE_FREEBSD_TRUE@lib_LTLIBRARIES = libhald_freebsd_probe.la ++@HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd_probe.la + libhald_freebsd_probe_la_SOURCES = \ + hfp.c \ + hfp.h \ +@@ -285,28 +276,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libLTLIBRARIES: $(lib_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-libLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +- done + +-clean-libLTLIBRARIES: +- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ +@@ -428,9 +401,6 @@ check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) + installdirs: +- for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -457,7 +427,7 @@ maintainer-clean-generic: + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + + distclean: distclean-am +@@ -480,7 +450,7 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-html: install-html-am + +@@ -512,23 +482,22 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-libLTLIBRARIES ++uninstall-am: + + .MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool ctags distclean \ ++ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am \ +- install-libLTLIBRARIES install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-libLTLIBRARIES ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/60_upstream_backlight_actual_brightness.patch 0.5.13-1ubuntu8/debian/patches/60_upstream_backlight_actual_brightness.patch --- 0.5.12~git20090406.46dc48-2/debian/patches/60_upstream_backlight_actual_brightness.patch 1970-01-01 01:00:00.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/60_upstream_backlight_actual_brightness.patch 2009-10-21 14:43:59.000000000 +0100 @@ -0,0 +1,29 @@ +From d792a792846f9632edfdea3651a74fcd24b2ead7 Mon Sep 17 00:00:00 2001 +From: Johannes Hessellund +Date: Fri, 24 Jul 2009 09:25:02 +0000 +Subject: read brightness from actual_brightness and not from brightness + +The get_backlight function read from the wrong sysfs file. +The real backlight value is available from 'actual_brightness', whereas +'brightness' is used for changing/setting the backlight through software. +'brightness' always reads last value writen to it. +Backlight which is hardware controlled, as with many thinkpads (ex T42), does +not update 'brightness'. Thus hald is not returning the right value! + +fd.o#21612 +--- +diff --git a/hald/linux/addons/addon-generic-backlight.c b/hald/linux/addons/addon-generic-backlight.c +index 952a369..fd2d8f5 100644 +--- a/hald/linux/addons/addon-generic-backlight.c ++++ b/hald/linux/addons/addon-generic-backlight.c +@@ -64,7 +64,7 @@ get_backlight () + f = NULL; + value = -1; + +- g_snprintf (sysfs_path, sizeof (sysfs_path), "%s/brightness", path); ++ g_snprintf (sysfs_path, sizeof (sysfs_path), "%s/actual_brightness", path); + + f = fopen (sysfs_path, "rb"); + if (f == NULL) { +-- +cgit v0.8.2 diff -pruN 0.5.12~git20090406.46dc48-2/debian/patches/series 0.5.13-1ubuntu8/debian/patches/series --- 0.5.12~git20090406.46dc48-2/debian/patches/series 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/patches/series 2009-10-21 14:43:59.000000000 +0100 @@ -1,4 +1,7 @@ -10-no-polkit-policy-file-validate-check.patch -23_addon_acpi.patch +00git_cpufreq_warning_message_fix.patch +01_at_console.patch 40_readme_remove_hacking.patch -11-direct-hal-set-propery.patch +50_kfreebsd.patch +04_nvidia_brightness.patch +60_upstream_backlight_actual_brightness.patch + diff -pruN 0.5.12~git20090406.46dc48-2/debian/rules 0.5.13-1ubuntu8/debian/rules --- 0.5.12~git20090406.46dc48-2/debian/rules 2009-10-21 14:43:59.000000000 +0100 +++ 0.5.13-1ubuntu8/debian/rules 2009-10-21 14:43:59.000000000 +0100 @@ -13,11 +13,11 @@ DEB_CONFIGURE_EXTRA_FLAGS := --with-pid- --with-hwdata=/usr/share/misc \ --without-macbook \ --without-macbookpro \ - --enable-policy-kit \ + --disable-policy-kit \ --enable-console-kit \ - --enable-acl-management \ --enable-umount-helper \ --enable-docbook-docs \ + --without-keymaps \ --docdir=/usr/share/doc/hal-doc \ --with-udev-prefix=/lib @@ -26,7 +26,10 @@ DEB_DH_INSTALLINIT_ARGS := -- start 24 2 install/hal:: # Remove executable bit as this is nothing that can be executed chmod -x $(DEB_DESTDIR)/usr/lib/hal/scripts/hal-functions - # Don't install 10-x11-input.fdi until xorg input hotplugging is fixed to - # properly support non-US keyboard layouts (see also: #442316). - rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi +binary-install/hal:: + # Only install udev rules on Linux architectures. The + # directory doesn't even exist on e.g. GNU/kFreeBSD +ifeq ($(DEB_HOST_ARCH_OS),linux) + dh_install -phal debian/tmp/lib/udev/rules.d/ +endif diff -pruN 0.5.12~git20090406.46dc48-2/doc/Makefile.in 0.5.13-1ubuntu8/doc/Makefile.in --- 0.5.12~git20090406.46dc48-2/doc/Makefile.in 2009-04-08 06:37:42.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/Makefile.in 2009-07-15 08:03:09.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -65,6 +65,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLKID_CFLAGS = @BLKID_CFLAGS@ +BLKID_LIBS = @BLKID_LIBS@ BUILD_ACPI_IBM = @BUILD_ACPI_IBM@ BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@ CC = @CC@ @@ -156,8 +158,6 @@ USE_PCI_IDS = @USE_PCI_IDS@ USE_PNP_IDS = @USE_PNP_IDS@ USE_USB_IDS = @USE_USB_IDS@ VERSION = @VERSION@ -VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@ -VOLUME_ID_LIBS = @VOLUME_ID_LIBS@ XMLLINT = @XMLLINT@ XMLTO = @XMLTO@ abs_builddir = @abs_builddir@ @@ -227,8 +227,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -334,7 +334,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/Makefile.in 0.5.13-1ubuntu8/doc/api/Makefile.in --- 0.5.12~git20090406.46dc48-2/doc/api/Makefile.in 2009-04-08 06:37:43.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/api/Makefile.in 2009-07-15 08:03:09.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -65,6 +65,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLKID_CFLAGS = @BLKID_CFLAGS@ +BLKID_LIBS = @BLKID_LIBS@ BUILD_ACPI_IBM = @BUILD_ACPI_IBM@ BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@ CC = @CC@ @@ -156,8 +158,6 @@ USE_PCI_IDS = @USE_PCI_IDS@ USE_PNP_IDS = @USE_PNP_IDS@ USE_USB_IDS = @USE_USB_IDS@ VERSION = @VERSION@ -VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@ -VOLUME_ID_LIBS = @VOLUME_ID_LIBS@ XMLLINT = @XMLLINT@ XMLTO = @XMLTO@ abs_builddir = @abs_builddir@ @@ -227,8 +227,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -334,7 +334,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/Makefile.in 0.5.13-1ubuntu8/doc/api/libhal/Makefile.in --- 0.5.12~git20090406.46dc48-2/doc/api/libhal/Makefile.in 2009-04-08 06:37:43.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/api/libhal/Makefile.in 2009-07-15 08:03:09.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -60,6 +60,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BLKID_CFLAGS = @BLKID_CFLAGS@ +BLKID_LIBS = @BLKID_LIBS@ BUILD_ACPI_IBM = @BUILD_ACPI_IBM@ BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@ CC = @CC@ @@ -151,8 +153,6 @@ USE_PCI_IDS = @USE_PCI_IDS@ USE_PNP_IDS = @USE_PNP_IDS@ USE_USB_IDS = @USE_USB_IDS@ VERSION = @VERSION@ -VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@ -VOLUME_ID_LIBS = @VOLUME_ID_LIBS@ XMLLINT = @XMLLINT@ XMLTO = @XMLTO@ abs_builddir = @abs_builddir@ @@ -306,8 +306,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/index.html 0.5.13-1ubuntu8/doc/api/libhal/html/index.html --- 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/index.html 2009-04-08 06:44:23.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/api/libhal/html/index.html 2009-07-15 08:09:29.000000000 +0100 @@ -3,8 +3,8 @@ HAL Client Library Reference Manual - - + + @@ -13,7 +13,7 @@ -
+
@@ -25,11 +25,11 @@     
  

-

Version 0.5.12 +

Version 0.5.13

Copyright © 2007 The HAL Authors

-
-

+

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/ix01.html 0.5.13-1ubuntu8/doc/api/libhal/html/ix01.html --- 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/ix01.html 2009-04-08 06:44:23.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/api/libhal/html/ix01.html 2009-07-15 08:09:29.000000000 +0100 @@ -3,8 +3,8 @@ Index - - + + @@ -22,9 +22,9 @@ HAL Client Library Reference Manual Next -

+

-Index

+Index

D

diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/libhal-libhal.html 0.5.13-1ubuntu8/doc/api/libhal/html/libhal-libhal.html --- 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/libhal-libhal.html 2009-04-08 06:44:23.000000000 +0100 +++ 0.5.13-1ubuntu8/doc/api/libhal/html/libhal-libhal.html 2009-07-15 08:09:29.000000000 +0100 @@ -3,8 +3,8 @@ libhal - - + + @@ -29,7 +29,7 @@ Description -
+
@@ -38,7 +38,7 @@
-
+

Synopsis

 #define             DBUS_API_SUBJECT_TO_CHANGE
@@ -418,14 +418,14 @@ char*
-
+

Description

-
+

Details

-
+

DBUS_API_SUBJECT_TO_CHANGE

#define DBUS_API_SUBJECT_TO_CHANGE
@@ -433,14 +433,14 @@ char*
-
+

LIBHAL_DEPRECATED

#define             LIBHAL_DEPRECATED

-
+

LIBHAL_FREE_DBUS_ERROR()

#define             LIBHAL_FREE_DBUS_ERROR(_dbus_error_)

@@ -455,7 +455,7 @@ char*

-
+

LIBHAL_CHECK_LIBHALCONTEXT()

#define             LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_)

@@ -479,7 +479,7 @@ Handy macro for checking whether a conte

-
+

enum LibHalPropertyType

typedef enum {
         /** Used to report error condition */
@@ -510,7 +510,7 @@ Possible types for properties on hal dev
-
+

LibHalContext

typedef struct LibHalContext_s LibHalContext;
@@ -521,7 +521,7 @@ libhal_ctx_*() family of functions to ac

-
+

LibHalProperty

typedef struct LibHalProperty_s LibHalProperty;
@@ -531,7 +531,7 @@ Represents a property. Opaque.

-
+

LibHalPropertySet

typedef struct LibHalPropertySet_s LibHalPropertySet;
@@ -542,7 +542,7 @@ libhal_property_set_*() family of functi

-
+

LibHalIntegrateDBusIntoMainLoop ()

void                (*LibHalIntegrateDBusIntoMainLoop)  (LibHalContext *ctx,
                                                          DBusConnection *dbus_connection);
@@ -568,7 +568,7 @@ DBusConnection object into its own mainl
-
+

LibHalDeviceAdded ()

void                (*LibHalDeviceAdded)                (LibHalContext *ctx,
                                                          const char *udi);
@@ -593,7 +593,7 @@ Type for callback when a device is added
-
+

LibHalDeviceRemoved ()

void                (*LibHalDeviceRemoved)              (LibHalContext *ctx,
                                                          const char *udi);
@@ -618,7 +618,7 @@ Type for callback when a device is remov
-
+

LibHalDeviceNewCapability ()

void                (*LibHalDeviceNewCapability)        (LibHalContext *ctx,
                                                          const char *udi,
@@ -649,7 +649,7 @@ Type for callback when a device gains a
-
+

LibHalDeviceLostCapability ()

void                (*LibHalDeviceLostCapability)       (LibHalContext *ctx,
                                                          const char *udi,
@@ -680,7 +680,7 @@ Type for callback when a device loses a
-
+

LibHalDevicePropertyModified ()

void                (*LibHalDevicePropertyModified)     (LibHalContext *ctx,
                                                          const char *udi,
@@ -723,7 +723,7 @@ Type for callback when a property of a d
-
+

LibHalDeviceCondition ()

void                (*LibHalDeviceCondition)            (LibHalContext *ctx,
                                                          const char *udi,
@@ -760,7 +760,7 @@ Type for callback when a non-continuous
-
+

LibHalGlobalInterfaceLockAcquired ()

void                (*LibHalGlobalInterfaceLockAcquired)
                                                         (LibHalContext *ctx,
@@ -798,7 +798,7 @@ Type for callback when someone acquires
-
+

LibHalGlobalInterfaceLockReleased ()

void                (*LibHalGlobalInterfaceLockReleased)
                                                         (LibHalContext *ctx,
@@ -836,7 +836,7 @@ Type for callback when someone releases
-
+

LibHalInterfaceLockAcquired ()

void                (*LibHalInterfaceLockAcquired)      (LibHalContext *ctx,
                                                          const char *udi,
@@ -879,7 +879,7 @@ Type for callback when someone acquires
-
+

LibHalInterfaceLockReleased ()

void                (*LibHalInterfaceLockReleased)      (LibHalContext *ctx,
                                                          const char *udi,
@@ -922,7 +922,7 @@ Type for callback when someone acquires
-
+

LibHalSingletonDeviceAdded ()

void                (*LibHalSingletonDeviceAdded)       (LibHalContext *ctx,
                                                          const char *udi,
@@ -953,7 +953,7 @@ Type for callback for addon singletons w
-
+

LibHalSingletonDeviceRemoved ()

void                (*LibHalSingletonDeviceRemoved)     (LibHalContext *ctx,
                                                          const char *udi,
@@ -984,7 +984,7 @@ Type for callback for addon singletons w
-
+

libhal_ctx_new ()

LibHalContext *     libhal_ctx_new                      (void);

@@ -1001,7 +1001,7 @@ Create a new LibHalContext

-
+

libhal_ctx_set_cache ()

dbus_bool_t         libhal_ctx_set_cache                (LibHalContext *ctx,
                                                          dbus_bool_t use_cache);
@@ -1032,7 +1032,7 @@ implemented yet.

-
+

libhal_ctx_set_dbus_connection ()

dbus_bool_t         libhal_ctx_set_dbus_connection      (LibHalContext *ctx,
                                                          DBusConnection *conn);
@@ -1062,7 +1062,7 @@ Set DBus connection to use to talk to ha
-
+

libhal_ctx_get_dbus_connection ()

DBusConnection *    libhal_ctx_get_dbus_connection      (LibHalContext *ctx);

@@ -1086,7 +1086,7 @@ Get DBus connection used for talking to

-
+

libhal_ctx_set_user_data ()

dbus_bool_t         libhal_ctx_set_user_data            (LibHalContext *ctx,
                                                          void *user_data);
@@ -1116,7 +1116,7 @@ Set user data for the context.

-
+

libhal_ctx_get_user_data ()

void*               libhal_ctx_get_user_data            (LibHalContext *ctx);

@@ -1140,7 +1140,7 @@ Get user data for the context.

-
+

libhal_ctx_set_device_added ()

dbus_bool_t         libhal_ctx_set_device_added         (LibHalContext *ctx,
                                                          LibHalDeviceAdded callback);
@@ -1170,7 +1170,7 @@ Set the callback for when a device is ad
-
+

libhal_ctx_set_device_removed ()

dbus_bool_t         libhal_ctx_set_device_removed       (LibHalContext *ctx,
                                                          LibHalDeviceRemoved callback);
@@ -1200,7 +1200,7 @@ Set the callback for when a device is re
-
+

libhal_ctx_set_device_new_capability ()

dbus_bool_t         libhal_ctx_set_device_new_capability
                                                         (LibHalContext *ctx,
@@ -1231,7 +1231,7 @@ Set the callback for when a device gains
-
+

libhal_ctx_set_device_lost_capability ()

dbus_bool_t         libhal_ctx_set_device_lost_capability
                                                         (LibHalContext *ctx,
@@ -1262,7 +1262,7 @@ Set the callback for when a device loses
-
+

libhal_ctx_set_device_property_modified ()

dbus_bool_t         libhal_ctx_set_device_property_modified
                                                         (LibHalContext *ctx,
@@ -1293,7 +1293,7 @@ Set the callback for when a property is
-
+

libhal_ctx_set_device_condition ()

dbus_bool_t         libhal_ctx_set_device_condition     (LibHalContext *ctx,
                                                          LibHalDeviceCondition callback);
@@ -1323,7 +1323,7 @@ Set the callback for when a device emits
-
+

libhal_ctx_set_global_interface_lock_acquired ()

dbus_bool_t         libhal_ctx_set_global_interface_lock_acquired
                                                         (LibHalContext *ctx,
@@ -1354,7 +1354,7 @@ Set the callback for when a global inter
-
+

libhal_ctx_set_global_interface_lock_released ()

dbus_bool_t         libhal_ctx_set_global_interface_lock_released
                                                         (LibHalContext *ctx,
@@ -1385,7 +1385,7 @@ Set the callback for when a global inter
-
+

libhal_ctx_set_interface_lock_acquired ()

dbus_bool_t         libhal_ctx_set_interface_lock_acquired
                                                         (LibHalContext *ctx,
@@ -1416,7 +1416,7 @@ Set the callback for when an interface l
-
+

libhal_ctx_set_interface_lock_released ()

dbus_bool_t         libhal_ctx_set_interface_lock_released
                                                         (LibHalContext *ctx,
@@ -1447,7 +1447,7 @@ Set the callback for when an interface l
-
+

libhal_ctx_set_singleton_device_added ()

dbus_bool_t         libhal_ctx_set_singleton_device_added
                                                         (LibHalContext *ctx,
@@ -1478,7 +1478,7 @@ Set the callback for when a singleton sh
-
+

libhal_ctx_set_singleton_device_removed ()

dbus_bool_t         libhal_ctx_set_singleton_device_removed
                                                         (LibHalContext *ctx,
@@ -1509,7 +1509,7 @@ Set the callback for when a singleton sh
-
+

libhal_ctx_init ()

dbus_bool_t         libhal_ctx_init                     (LibHalContext *ctx,
                                                          DBusError *error);
@@ -1539,7 +1539,7 @@ Initialize the connection to hald.

-
+

libhal_ctx_shutdown ()

dbus_bool_t         libhal_ctx_shutdown                 (LibHalContext *ctx,
                                                          DBusError *error);
@@ -1569,7 +1569,7 @@ Shut down a connection to hald.

-
+

libhal_ctx_free ()

dbus_bool_t         libhal_ctx_free                     (LibHalContext *ctx);

@@ -1593,7 +1593,7 @@ Free a LibHalContext resource.

-
+

libhal_ctx_init_direct ()

LibHalContext *     libhal_ctx_init_direct              (DBusError *error);

@@ -1617,7 +1617,7 @@ Create an already initialized connection

-
+

libhal_get_all_devices ()

char **             libhal_get_all_devices              (LibHalContext *ctx,
                                                          int *num_devices,
@@ -1655,7 +1655,7 @@ the responsibility of the caller to free
-
+

libhal_device_exists ()

dbus_bool_t         libhal_device_exists                (LibHalContext *ctx,
                                                          const char *udi,
@@ -1691,7 +1691,7 @@ Determine if a device exists.
-
+

libhal_device_print ()

dbus_bool_t         libhal_device_print                 (LibHalContext *ctx,
                                                          const char *udi,
@@ -1727,7 +1727,7 @@ Print a device to stdout; useful for deb
-
+

libhal_device_property_exists ()

dbus_bool_t         libhal_device_property_exists       (LibHalContext *ctx,
                                                          const char *udi,
@@ -1769,7 +1769,7 @@ Determine if a property on a device exis
-
+

libhal_device_get_property_string ()

char *              libhal_device_get_property_string   (LibHalContext *ctx,
                                                          const char *udi,
@@ -1813,7 +1813,7 @@ NULL if the property didn't exist or we
-
+

libhal_device_get_property_int ()

dbus_int32_t        libhal_device_get_property_int      (LibHalContext *ctx,
                                                          const char *udi,
@@ -1855,7 +1855,7 @@ Get the value of a property of type inte
-
+

libhal_device_get_property_uint64 ()

dbus_uint64_t       libhal_device_get_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
@@ -1897,7 +1897,7 @@ Get the value of a property of type sign
-
+

libhal_device_get_property_double ()

double              libhal_device_get_property_double   (LibHalContext *ctx,
                                                          const char *udi,
@@ -1939,7 +1939,7 @@ Get the value of a property of type doub
-
+

libhal_device_get_property_bool ()

dbus_bool_t         libhal_device_get_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
@@ -1981,7 +1981,7 @@ Get the value of a property of type bool
-
+

libhal_device_get_property_strlist ()

char **             libhal_device_get_property_strlist  (LibHalContext *ctx,
                                                          const char *udi,
@@ -2026,7 +2026,7 @@ NULL if the property didn't exist or we
-
+

libhal_device_set_property_string ()

dbus_bool_t         libhal_device_set_property_string   (LibHalContext *ctx,
                                                          const char *udi,
@@ -2075,7 +2075,7 @@ exist or the property had a different ty
-
+

libhal_device_set_property_int ()

dbus_bool_t         libhal_device_set_property_int      (LibHalContext *ctx,
                                                          const char *udi,
@@ -2124,7 +2124,7 @@ exist or the property had a different ty
-
+

libhal_device_set_property_uint64 ()

dbus_bool_t         libhal_device_set_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
@@ -2173,7 +2173,7 @@ exist or the property had a different ty
-
+

libhal_device_set_property_double ()

dbus_bool_t         libhal_device_set_property_double   (LibHalContext *ctx,
                                                          const char *udi,
@@ -2222,7 +2222,7 @@ exist or the property had a different ty
-
+

libhal_device_set_property_bool ()

dbus_bool_t         libhal_device_set_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
@@ -2271,7 +2271,7 @@ exist or the property had a different ty
-
+

libhal_device_property_strlist_append ()

dbus_bool_t         libhal_device_property_strlist_append
                                                         (LibHalContext *ctx,
@@ -2321,7 +2321,7 @@ exist or the property had a different ty
-
+

libhal_device_property_strlist_prepend ()

dbus_bool_t         libhal_device_property_strlist_prepend
                                                         (LibHalContext *ctx,
@@ -2371,7 +2371,7 @@ didn't exist or the property had a diffe
-
+

libhal_device_property_strlist_remove_index ()

dbus_bool_t         libhal_device_property_strlist_remove_index
                                                         (LibHalContext *ctx,
@@ -2421,7 +2421,7 @@ exist or the property had a different ty
-
+

libhal_device_property_strlist_remove ()

dbus_bool_t         libhal_device_property_strlist_remove
                                                         (LibHalContext *ctx,
@@ -2471,7 +2471,7 @@ exist or the property had a different ty
-
+

libhal_device_remove_property ()

dbus_bool_t         libhal_device_remove_property       (LibHalContext *ctx,
                                                          const char *udi,
@@ -2514,7 +2514,7 @@ exist
-
+

libhal_device_get_property_type ()

LibHalPropertyType  libhal_device_get_property_type     (LibHalContext *ctx,
                                                          const char *udi,
@@ -2557,14 +2557,14 @@ return if the property doesn't exist.
-
+

struct LibHalChangeSet_s

struct LibHalChangeSet_s;

-
+

LibHalChangeSet

typedef struct LibHalChangeSet_s LibHalChangeSet;
@@ -2572,7 +2572,7 @@ return if the property doesn't exist.

-
+

libhal_device_new_changeset ()

LibHalChangeSet *   libhal_device_new_changeset         (const char *udi);

@@ -2597,7 +2597,7 @@ performance is critical and also for ato

-
+

libhal_changeset_set_property_string ()

dbus_bool_t         libhal_changeset_set_property_string
                                                         (LibHalChangeSet *changeset,
@@ -2634,7 +2634,7 @@ Set a property.
-
+

libhal_changeset_set_property_int ()

dbus_bool_t         libhal_changeset_set_property_int   (LibHalChangeSet *changeset,
                                                          const char *key,
@@ -2670,7 +2670,7 @@ Set a property.
-
+

libhal_changeset_set_property_uint64 ()

dbus_bool_t         libhal_changeset_set_property_uint64
                                                         (LibHalChangeSet *changeset,
@@ -2707,7 +2707,7 @@ Set a property.
-
+

libhal_changeset_set_property_double ()

dbus_bool_t         libhal_changeset_set_property_double
                                                         (LibHalChangeSet *changeset,
@@ -2744,7 +2744,7 @@ Set a property.
-
+

libhal_changeset_set_property_bool ()

dbus_bool_t         libhal_changeset_set_property_bool  (LibHalChangeSet *changeset,
                                                          const char *key,
@@ -2780,7 +2780,7 @@ Set a property.
-
+

libhal_changeset_set_property_strlist ()

dbus_bool_t         libhal_changeset_set_property_strlist
                                                         (LibHalChangeSet *changeset,
@@ -2817,7 +2817,7 @@ Set a property.
-
+

libhal_device_commit_changeset ()

dbus_bool_t         libhal_device_commit_changeset      (LibHalContext *ctx,
                                                          LibHalChangeSet *changeset,
@@ -2853,7 +2853,7 @@ Commit a changeset to the daemon.
-
+

libhal_device_free_changeset ()

void                libhal_device_free_changeset        (LibHalChangeSet *changeset);

@@ -2870,7 +2870,7 @@ Free a changeset.

-
+

libhal_device_get_all_properties ()

LibHalPropertySet * libhal_device_get_all_properties    (LibHalContext *ctx,
                                                          const char *udi,
@@ -2906,7 +2906,7 @@ Retrieve all the properties on a device.
-
+

libhal_get_all_devices_with_properties ()

dbus_bool_t         libhal_get_all_devices_with_properties
                                                         (LibHalContext *ctx,
@@ -2962,7 +2962,7 @@ href="/usr/share/gtk-doc/html/glib/glib-
-
+

libhal_property_set_sort ()

void                libhal_property_set_sort            (LibHalPropertySet *set);

@@ -2979,7 +2979,7 @@ Sort all properties according to propert

-
+

libhal_free_property_set ()

void                libhal_free_property_set            (LibHalPropertySet *set);

@@ -2996,7 +2996,7 @@ Free a property set earlier obtained wit

-
+

libhal_property_set_get_num_elems ()

unsigned int        libhal_property_set_get_num_elems   (LibHalPropertySet *set);

@@ -3020,7 +3020,7 @@ Get the number of properties in a proper

-
+

libhal_ps_get_type ()

LibHalPropertyType  libhal_ps_get_type                  (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3051,7 +3051,7 @@ LIBHAL_PROPERTY_TYPE_INVALID if property
-
+

libhal_ps_get_string ()

const char *        libhal_ps_get_string                (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3083,7 +3083,7 @@ this property belongs to. NULL if proper
-
+

libhal_ps_get_int32 ()

dbus_int32_t        libhal_ps_get_int32                 (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3111,7 +3111,7 @@ this property belongs to. NULL if proper
-
+

libhal_ps_get_uint64 ()

dbus_uint64_t       libhal_ps_get_uint64                (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3141,7 +3141,7 @@ Get the value of a property of type unsi
-
+

libhal_ps_get_double ()

double              libhal_ps_get_double                (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3171,7 +3171,7 @@ Get the value of a property of type doub
-
+

libhal_ps_get_bool ()

dbus_bool_t         libhal_ps_get_bool                  (const LibHalPropertySet *set,
                                                          const char *key);
@@ -3201,7 +3201,7 @@ Get the value of a property of type bool
-
+

LibHalPropertySetIterator

typedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator;
@@ -3212,7 +3212,7 @@ use the libhal_psi_* family of functions

-
+

libhal_psi_init ()

void                libhal_psi_init                     (LibHalPropertySetIterator *iter,
                                                          LibHalPropertySet *set);
@@ -3237,7 +3237,7 @@ Initialize a property set iterator.

-
+

libhal_psi_has_more ()

dbus_bool_t         libhal_psi_has_more                 (LibHalPropertySetIterator *iter);

@@ -3261,7 +3261,7 @@ Determine whether there are more propert

-
+

libhal_psi_next ()

void                libhal_psi_next                     (LibHalPropertySetIterator *iter);

@@ -3278,7 +3278,7 @@ Advance iterator to next property.

-
+

libhal_psi_get_type ()

LibHalPropertyType  libhal_psi_get_type                 (LibHalPropertySetIterator *iter);

@@ -3302,7 +3302,7 @@ Get type of property.

-
+

libhal_psi_get_key ()

char *              libhal_psi_get_key                  (LibHalPropertySetIterator *iter);

@@ -3328,7 +3328,7 @@ this property belongs to.

-
+

libhal_psi_get_string ()

char *              libhal_psi_get_string               (LibHalPropertySetIterator *iter);

@@ -3354,7 +3354,7 @@ this property belongs to.

-
+

libhal_psi_get_int ()

dbus_int32_t        libhal_psi_get_int                  (LibHalPropertySetIterator *iter);

@@ -3378,7 +3378,7 @@ Get the value of a property of type sign

-
+

libhal_psi_get_uint64 ()

dbus_uint64_t       libhal_psi_get_uint64               (LibHalPropertySetIterator *iter);

@@ -3402,7 +3402,7 @@ Get the value of a property of type unsi

-
+

libhal_psi_get_double ()

double              libhal_psi_get_double               (LibHalPropertySetIterator *iter);

@@ -3426,7 +3426,7 @@ Get the value of a property of type doub

-
+

libhal_psi_get_bool ()

dbus_bool_t         libhal_psi_get_bool                 (LibHalPropertySetIterator *iter);

@@ -3450,7 +3450,7 @@ Get the value of a property of type bool

-
+

libhal_psi_get_strlist ()

char **             libhal_psi_get_strlist              (LibHalPropertySetIterator *iter);

@@ -3474,7 +3474,7 @@ Get the value of a property of type stri

-
+

libhal_string_array_length ()

unsigned int        libhal_string_array_length          (char **str_array);

@@ -3498,7 +3498,7 @@ Get the length of an array of strings.

-
+

libhal_free_string_array ()

void                libhal_free_string_array            (char **str_array);

@@ -3515,7 +3515,7 @@ Frees a NULL-terminated array of strings

-
+

libhal_free_string ()

void                libhal_free_string                  (char *str);

@@ -3532,7 +3532,7 @@ Used to free strings returned by libhal.

-
+

libhal_new_device ()

char *              libhal_new_device                   (LibHalContext *ctx,
                                                          DBusError *error);
@@ -3566,7 +3566,7 @@ problem. This string must be freed by th
-
+

libhal_device_commit_to_gdl ()

dbus_bool_t         libhal_device_commit_to_gdl         (LibHalContext *ctx,
                                                          const char *temp_udi,
@@ -3619,7 +3619,7 @@ user privileges.
-
+

libhal_remove_device ()

dbus_bool_t         libhal_remove_device                (LibHalContext *ctx,
                                                          const char *udi,
@@ -3661,7 +3661,7 @@ user privileges.
-
+

libhal_merge_properties ()

dbus_bool_t         libhal_merge_properties             (LibHalContext *ctx,
                                                          const char *target_udi,
@@ -3703,7 +3703,7 @@ Merge properties from one device to anot
-
+

libhal_device_matches ()

dbus_bool_t         libhal_device_matches               (LibHalContext *ctx,
                                                          const char *udi1,
@@ -3762,7 +3762,7 @@ parameter from one device is in the othe
-
+

libhal_manager_find_device_string_match ()

char **             libhal_manager_find_device_string_match
                                                         (LibHalContext *ctx,
@@ -3812,7 +3812,7 @@ given value.
-
+

libhal_device_add_capability ()

dbus_bool_t         libhal_device_add_capability        (LibHalContext *ctx,
                                                          const char *udi,
@@ -3854,7 +3854,7 @@ Assign a capability to a device.
-
+

libhal_device_query_capability ()

dbus_bool_t         libhal_device_query_capability      (LibHalContext *ctx,
                                                          const char *udi,
@@ -3897,7 +3897,7 @@ device doesn't exist.
-
+

libhal_find_device_by_capability ()

char **             libhal_find_device_by_capability    (LibHalContext *ctx,
                                                          const char *capability,
@@ -3939,7 +3939,7 @@ Find devices with a given capability.
-
+

libhal_device_property_watch_all ()

dbus_bool_t         libhal_device_property_watch_all    (LibHalContext *ctx,
                                                          DBusError *error);
@@ -3970,7 +3970,7 @@ invoked when the properties on any devic
-
+

libhal_device_add_property_watch ()

dbus_bool_t         libhal_device_add_property_watch    (LibHalContext *ctx,
                                                          const char *udi,
@@ -4011,7 +4011,7 @@ libhal_device_remove_property_watch, if
-
+

libhal_device_remove_property_watch ()

dbus_bool_t         libhal_device_remove_property_watch (LibHalContext *ctx,
                                                          const char *udi,
@@ -4047,7 +4047,7 @@ Remove a watch on a device.
-
+

libhal_device_lock ()

dbus_bool_t         libhal_device_lock                  (LibHalContext *ctx,
                                                          const char *udi,
@@ -4095,7 +4095,7 @@ Take an advisory lock on the device.
-
+

libhal_device_unlock ()

dbus_bool_t         libhal_device_unlock                (LibHalContext *ctx,
                                                          const char *udi,
@@ -4132,7 +4132,7 @@ Release an advisory lock on the device.<
-
+

libhal_device_rescan ()

dbus_bool_t         libhal_device_rescan                (LibHalContext *ctx,
                                                          const char *udi,
@@ -4168,7 +4168,7 @@ TODO document me.
-
+

libhal_device_reprobe ()

dbus_bool_t         libhal_device_reprobe               (LibHalContext *ctx,
                                                          const char *udi,
@@ -4204,7 +4204,7 @@ TODO document me.
-
+

libhal_device_emit_condition ()

dbus_bool_t         libhal_device_emit_condition        (LibHalContext *ctx,
                                                          const char *udi,
@@ -4253,7 +4253,7 @@ Emit a condition from a device. Can only
-
+

libhal_device_claim_interface ()

dbus_bool_t         libhal_device_claim_interface       (LibHalContext *ctx,
                                                          const char *udi,
@@ -4303,7 +4303,7 @@ helpers.
-
+

libhal_device_addon_is_ready ()

dbus_bool_t         libhal_device_addon_is_ready        (LibHalContext *ctx,
                                                          const char *udi,
@@ -4343,7 +4343,7 @@ Can only be used from hald helpers.
-
+

libhal_device_singleton_addon_is_ready ()

dbus_bool_t         libhal_device_singleton_addon_is_ready
                                                         (LibHalContext *ctx,
@@ -4384,7 +4384,7 @@ Can only be used from hald helpers.
-
+

libhal_device_acquire_interface_lock ()

dbus_bool_t         libhal_device_acquire_interface_lock
                                                         (LibHalContext *ctx,
@@ -4433,7 +4433,7 @@ Releases a lock on an interface for a sp
-
+

libhal_device_release_interface_lock ()

dbus_bool_t         libhal_device_release_interface_lock
                                                         (LibHalContext *ctx,
@@ -4476,7 +4476,7 @@ Acquires a lock on an interface for a sp
-
+

libhal_acquire_global_interface_lock ()

dbus_bool_t         libhal_acquire_global_interface_lock
                                                         (LibHalContext *ctx,
@@ -4519,7 +4519,7 @@ Acquires a global lock on an interface.<
-
+

libhal_release_global_interface_lock ()

dbus_bool_t         libhal_release_global_interface_lock
                                                         (LibHalContext *ctx,
@@ -4556,7 +4556,7 @@ Releases a global lock on an interface.<
-
+

libhal_device_is_caller_locked_out ()

dbus_bool_t         libhal_device_is_caller_locked_out  (LibHalContext *ctx,
                                                          const char *udi,
@@ -4606,7 +4606,7 @@ are privileged to use this method.
-
+

libhal_device_is_locked_by_others ()

dbus_bool_t         libhal_device_is_locked_by_others   (LibHalContext *ctx,
                                                          const char *udi,
@@ -4648,7 +4648,7 @@ Determines whether a determines other pr
-
+

libhal_device_is_caller_privileged ()

char*               libhal_device_is_caller_privileged  (LibHalContext *ctx,
                                                          const char *udi,
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/license.html 0.5.13-1ubuntu8/doc/api/libhal/html/license.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/license.html	2009-04-08 06:44:23.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal/html/license.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 Appendix A. License
-
-
+
+
 
 
 
@@ -21,7 +21,7 @@
 HAL Client Library Reference Manual
  
 
-

+

 

 Appendix A. License

 

diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/rn01.html 0.5.13-1ubuntu8/doc/api/libhal/html/rn01.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal/html/rn01.html	2009-04-08 06:44:23.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal/html/rn01.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 API Reference
-
-
+
+
 
 
 
@@ -22,13 +22,13 @@
 HAL Client Library Reference Manual
 Next
 
-

+

 

 

-API Reference

+API Reference

 

 

-

+

 

 

 	This part presents the class and function reference for the
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/libhal-sections.txt 0.5.13-1ubuntu8/doc/api/libhal/libhal-sections.txt
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal/libhal-sections.txt	2009-04-08 06:43:22.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal/libhal-sections.txt	2009-07-15 08:05:23.000000000 +0100
@@ -1,4 +1,46 @@
 

+uthash
+uthash_fatal
+uthash_bkt_malloc
+uthash_bkt_free
+uthash_tbl_malloc
+uthash_tbl_free
+uthash_noexpand_fyi
+uthash_expand_fyi
+HASH_INITIAL_NUM_BUCKETS
+HASH_BKT_CAPACITY_THRESH
+HASH_FIND
+HASH_ADD
+HASH_ADD_KEYPTR
+HASH_DELETE
+HASH_FIND_STR
+HASH_ADD_STR
+HASH_FIND_INT
+HASH_ADD_INT
+HASH_DEL
+HASH_OOPS
+HASH_FSCK
+HASH_EMIT_KEY
+HASH_FCN
+HASH_BER
+HASH_SAX
+HASH_FNV
+HASH_OAT
+HASH_JEN_MIX
+HASH_JEN
+HASH_JSW
+HASH_KEYCMP
+HASH_FIND_IN_BKT
+HASH_ADD_TO_BKT
+HASH_DEL_IN_BKT
+HASH_EXPAND_BUCKETS
+HASH_SORT
+UT_hash_bucket
+UT_hash_table
+UT_hash_handle
+

+
+

 libhal
 DBUS_API_SUBJECT_TO_CHANGE
 LIBHAL_DEPRECATED
@@ -130,45 +172,3 @@ libhal_device_is_locked_by_others
 libhal_device_is_caller_privileged
 

 
-

-uthash
-uthash_fatal
-uthash_bkt_malloc
-uthash_bkt_free
-uthash_tbl_malloc
-uthash_tbl_free
-uthash_noexpand_fyi
-uthash_expand_fyi
-HASH_INITIAL_NUM_BUCKETS
-HASH_BKT_CAPACITY_THRESH
-HASH_FIND
-HASH_ADD
-HASH_ADD_KEYPTR
-HASH_DELETE
-HASH_FIND_STR
-HASH_ADD_STR
-HASH_FIND_INT
-HASH_ADD_INT
-HASH_DEL
-HASH_OOPS
-HASH_FSCK
-HASH_EMIT_KEY
-HASH_FCN
-HASH_BER
-HASH_SAX
-HASH_FNV
-HASH_OAT
-HASH_JEN_MIX
-HASH_JEN
-HASH_JSW
-HASH_KEYCMP
-HASH_FIND_IN_BKT
-HASH_ADD_TO_BKT
-HASH_DEL_IN_BKT
-HASH_EXPAND_BUCKETS
-HASH_SORT
-UT_hash_bucket
-UT_hash_table
-UT_hash_handle
-

-
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal/version.xml 0.5.13-1ubuntu8/doc/api/libhal/version.xml
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal/version.xml	2009-04-08 06:38:26.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal/version.xml	2009-07-15 08:03:40.000000000 +0100
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/Makefile.in 0.5.13-1ubuntu8/doc/api/libhal-storage/Makefile.in
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/Makefile.in	2009-04-08 06:37:43.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/Makefile.in	2009-07-15 08:03:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -151,8 +153,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -306,8 +306,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/index.html 0.5.13-1ubuntu8/doc/api/libhal-storage/html/index.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/index.html	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/index.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 HAL Storage Library Reference Manual
-
-
+
+
 
 
 
@@ -13,7 +13,7 @@
 
 
 
-

+

 

 

 

@@ -25,11 +25,11 @@
 	    

 	  

 

-
Version 0.5.12
+
Version 0.5.13
 

 
Copyright © 2007 The HAL Authors

-

-

+

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/ix01.html 0.5.13-1ubuntu8/doc/api/libhal-storage/html/ix01.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/ix01.html	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/ix01.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 Index
-
-
+
+
 
 
 
@@ -22,9 +22,9 @@
 HAL Storage Library Reference Manual
 Next
 
-

+

 

-Index

+Index

 

 
L

 

diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html 0.5.13-1ubuntu8/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 libhal-storage
-
-
+
+
 
 
 
@@ -29,7 +29,7 @@
                 Description
 
 
-

+

 

 

 
@@ -38,7 +38,7 @@
 
 
 

-

+

 
Synopsis

 
 struct              LibHalDrive_s;
@@ -142,21 +142,21 @@ int                 
 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
struct LibHalDrive_s

 
struct LibHalDrive_s;

 

 

 

 

-

+

 
LibHalDrive

 
typedef struct LibHalDrive_s LibHalDrive;
 

@@ -164,14 +164,14 @@ int                 
 

 

-

+

 
struct LibHalVolume_s

 
struct LibHalVolume_s;

 

 

 

 

-

+

 
LibHalVolume

 
typedef struct LibHalVolume_s LibHalVolume;
 

@@ -179,14 +179,14 @@ int                 
 

 

-

+

 
struct LibHalStoragePolicy_s

 
struct LibHalStoragePolicy_s;

 

 

 

 

-

+

 
LibHalStoragePolicy

 
typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
 

@@ -194,7 +194,7 @@ int                 
 

 

-

+

 
enum LibHalStoragePolicyIcon

 
typedef enum {
 	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK           = 0x10000,
@@ -284,7 +284,7 @@ int                 
 

 

-

+

 
LibHalStoragePolicyIconPair

 
typedef struct {
 	LibHalStoragePolicyIcon icon;
@@ -295,7 +295,7 @@ int                 
 

 

-

+

 
libhal_storage_policy_new ()

 
LibHalStoragePolicy * libhal_storage_policy_new         ();

 

@@ -310,7 +310,7 @@ int                 

 

 

-

+

 
libhal_drive_from_device_file ()

 
LibHalDrive *       libhal_drive_from_device_file       (
+

 
libhal_drive_free ()

 
void                libhal_drive_free                   (LibHalDrive *drive);

 

@@ -362,7 +362,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_is_hotpluggable ()

 
dbus_bool_t         libhal_drive_is_hotpluggable        (LibHalDrive *drive);

 

@@ -384,7 +384,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_uses_removable_media ()

 
dbus_bool_t         libhal_drive_uses_removable_media   (LibHalDrive *drive);

 

@@ -406,7 +406,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_is_media_detected ()

 
dbus_bool_t         libhal_drive_is_media_detected      (LibHalDrive *drive);

 

@@ -428,7 +428,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_is_media_detection_automatic ()

 
dbus_bool_t         libhal_drive_is_media_detection_automatic
                                                         (LibHalDrive *drive);

@@ -451,7 +451,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_size ()

 
dbus_uint64_t       libhal_drive_get_size               (LibHalDrive *drive);

 

@@ -473,7 +473,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_media_size ()

 
dbus_uint64_t       libhal_drive_get_media_size         (LibHalDrive *drive);

 

@@ -495,7 +495,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_partition_scheme ()

 
const char *        libhal_drive_get_partition_scheme   (LibHalDrive *drive);

 

@@ -517,7 +517,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_no_partitions_hint ()

 
dbus_bool_t         libhal_drive_no_partitions_hint     (LibHalDrive *drive);

 

@@ -539,7 +539,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_requires_eject ()

 
dbus_bool_t         libhal_drive_requires_eject         (LibHalDrive *drive);

 

@@ -561,7 +561,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_type ()

 
LibHalDriveType     libhal_drive_get_type               (LibHalDrive *drive);

 

@@ -583,7 +583,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_bus ()

 
LibHalDriveBus      libhal_drive_get_bus                (LibHalDrive *drive);

 

@@ -605,7 +605,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_cdrom_caps ()

 
LibHalDriveCdromCaps  libhal_drive_get_cdrom_caps       (LibHalDrive *drive);

 

@@ -627,7 +627,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_device_major ()

 
unsigned int        libhal_drive_get_device_major       (LibHalDrive *drive);

 

@@ -649,7 +649,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_device_minor ()

 
unsigned int        libhal_drive_get_device_minor       (LibHalDrive *drive);

 

@@ -671,7 +671,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_type_textual ()

 
const char *        libhal_drive_get_type_textual       (LibHalDrive *drive);

 

@@ -693,7 +693,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_device_file ()

 
const char *        libhal_drive_get_device_file        (LibHalDrive *drive);

 

@@ -715,7 +715,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_udi ()

 
const char *        libhal_drive_get_udi                (LibHalDrive *drive);

 

@@ -737,7 +737,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_serial ()

 
const char *        libhal_drive_get_serial             (LibHalDrive *drive);

 

@@ -759,7 +759,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_firmware_version ()

 
const char *        libhal_drive_get_firmware_version   (LibHalDrive *drive);

 

@@ -781,7 +781,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_model ()

 
const char *        libhal_drive_get_model              (LibHalDrive *drive);

 

@@ -803,7 +803,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_vendor ()

 
const char *        libhal_drive_get_vendor             (LibHalDrive *drive);

 

@@ -825,7 +825,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_physical_device_udi ()

 
const char *        libhal_drive_get_physical_device_udi
                                                         (LibHalDrive *drive);

@@ -848,7 +848,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_dedicated_icon_drive ()

 
const char *        libhal_drive_get_dedicated_icon_drive
                                                         (LibHalDrive *drive);

@@ -871,7 +871,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_get_dedicated_icon_volume ()

 
const char *        libhal_drive_get_dedicated_icon_volume
                                                         (LibHalDrive *drive);

@@ -894,7 +894,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_policy_compute_display_name ()

 
char *              libhal_drive_policy_compute_display_name
                                                         (LibHalDrive *drive,
@@ -923,7 +923,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_drive_policy_default_get_mount_root ()

 
char *              libhal_drive_policy_default_get_mount_root
                                                         ();

@@ -939,7 +939,7 @@ Free all resources used by a LibHalDrive
 

 

 

-

+

 
libhal_volume_from_device_file ()

 
LibHalVolume *      libhal_volume_from_device_file      (
+

 
libhal_volume_from_mount_point ()

 
LibHalVolume *      libhal_volume_from_mount_point      (
+

 
libhal_volume_free ()

 
void                libhal_volume_free                  (LibHalVolume *volume);

 

@@ -1024,7 +1024,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_size ()

 
dbus_uint64_t       libhal_volume_get_size              (LibHalVolume *volume);

 

@@ -1046,7 +1046,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_disc_capacity ()

 
dbus_uint64_t       libhal_volume_get_disc_capacity     (LibHalVolume *volume);

 

@@ -1068,7 +1068,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_udi ()

 
const char *        libhal_volume_get_udi               (LibHalVolume *volume);

 

@@ -1090,7 +1090,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_device_file ()

 
const char *        libhal_volume_get_device_file       (LibHalVolume *volume);

 

@@ -1112,7 +1112,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_device_major ()

 
unsigned int        libhal_volume_get_device_major      (LibHalVolume *volume);

 

@@ -1134,7 +1134,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_device_minor ()

 
unsigned int        libhal_volume_get_device_minor      (LibHalVolume *volume);

 

@@ -1156,7 +1156,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_fstype ()

 
const char *        libhal_volume_get_fstype            (LibHalVolume *volume);

 

@@ -1178,7 +1178,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_fsversion ()

 
const char *        libhal_volume_get_fsversion         (LibHalVolume *volume);

 

@@ -1200,7 +1200,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_fsusage ()

 
LibHalVolumeUsage   libhal_volume_get_fsusage           (LibHalVolume *volume);

 

@@ -1222,7 +1222,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_is_mounted ()

 
dbus_bool_t         libhal_volume_is_mounted            (LibHalVolume *volume);

 

@@ -1244,7 +1244,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_is_mounted_read_only ()

 
dbus_bool_t         libhal_volume_is_mounted_read_only  (LibHalVolume *volume);

 

@@ -1266,7 +1266,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_is_partition ()

 
dbus_bool_t         libhal_volume_is_partition          (LibHalVolume *volume);

 

@@ -1288,7 +1288,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_is_disc ()

 
dbus_bool_t         libhal_volume_is_disc               (LibHalVolume *volume);

 

@@ -1310,7 +1310,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_scheme ()

 
const char *        libhal_volume_get_partition_scheme  (LibHalVolume *volume);

 

@@ -1332,7 +1332,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_type ()

 
const char *        libhal_volume_get_partition_type    (LibHalVolume *volume);

 

@@ -1354,7 +1354,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_label ()

 
const char *        libhal_volume_get_partition_label   (LibHalVolume *volume);

 

@@ -1376,7 +1376,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_uuid ()

 
const char *        libhal_volume_get_partition_uuid    (LibHalVolume *volume);

 

@@ -1398,7 +1398,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_flags ()

 
const char **       libhal_volume_get_partition_flags   (LibHalVolume *volume);

 

@@ -1420,7 +1420,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_number ()

 
unsigned int        libhal_volume_get_partition_number  (LibHalVolume *volume);

 

@@ -1442,7 +1442,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_start_offset ()

 
dbus_uint64_t       libhal_volume_get_partition_start_offset
                                                         (LibHalVolume *volume);

@@ -1465,7 +1465,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_partition_media_size ()

 
dbus_uint64_t       libhal_volume_get_partition_media_size
                                                         (LibHalVolume *volume);

@@ -1488,7 +1488,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_label ()

 
const char *        libhal_volume_get_label             (LibHalVolume *volume);

 

@@ -1510,7 +1510,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_mount_point ()

 
const char *        libhal_volume_get_mount_point       (LibHalVolume *volume);

 

@@ -1532,7 +1532,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_uuid ()

 
const char *        libhal_volume_get_uuid              (LibHalVolume *volume);

 

@@ -1554,7 +1554,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_get_storage_device_udi ()

 
const char *        libhal_volume_get_storage_device_udi
                                                         (LibHalVolume *volume);

@@ -1577,7 +1577,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_crypto_get_backing_volume_udi ()

 
const char *        libhal_volume_crypto_get_backing_volume_udi
                                                         (LibHalVolume *volume);

@@ -1600,7 +1600,7 @@ Free all resources used by a LibHalVolum
 

 

 

-

+

 
libhal_volume_crypto_get_clear_volume_udi ()

 
char *              libhal_volume_crypto_get_clear_volume_udi
                                                         (
+

 
libhal_volume_disc_has_audio ()

 
dbus_bool_t         libhal_volume_disc_has_audio        (LibHalVolume *volume);

 

@@ -1653,7 +1653,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_disc_has_data ()

 
dbus_bool_t         libhal_volume_disc_has_data         (LibHalVolume *volume);

 

@@ -1675,7 +1675,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_disc_is_blank ()

 
dbus_bool_t         libhal_volume_disc_is_blank         (LibHalVolume *volume);

 

@@ -1697,7 +1697,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_disc_is_rewritable ()

 
dbus_bool_t         libhal_volume_disc_is_rewritable    (LibHalVolume *volume);

 

@@ -1719,7 +1719,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_disc_is_appendable ()

 
dbus_bool_t         libhal_volume_disc_is_appendable    (LibHalVolume *volume);

 

@@ -1741,7 +1741,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_get_disc_type ()

 
LibHalVolumeDiscType  libhal_volume_get_disc_type       (LibHalVolume *volume);

 

@@ -1763,7 +1763,7 @@ href="/usr/share/gtk-doc/html/libhal/lib
 

 

 

-

+

 
libhal_volume_get_msdos_part_table_type ()

 
int                 libhal_volume_get_msdos_part_table_type
                                                         ();

diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/license.html 0.5.13-1ubuntu8/doc/api/libhal-storage/html/license.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/license.html	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/license.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 Appendix A. License
-
-
+
+
 
 
 
@@ -21,7 +21,7 @@
 HAL Storage Library Reference Manual
  
 
-

+

 

 Appendix A. License

 

diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/rn01.html 0.5.13-1ubuntu8/doc/api/libhal-storage/html/rn01.html
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/rn01.html	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/rn01.html	2009-07-15 08:09:29.000000000 +0100
@@ -3,8 +3,8 @@
 
 
 API Reference
-
-
+
+
 
 
 
@@ -22,13 +22,13 @@
 HAL Storage Library Reference Manual
 Next
 
-

+

 

 

-API Reference

+API Reference

 

 

-

+

 

 

 	This part presents the class and function reference for the
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/version.xml 0.5.13-1ubuntu8/doc/api/libhal-storage/html/version.xml
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/html/version.xml	2009-04-08 06:44:24.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/html/version.xml	2009-07-15 08:09:29.000000000 +0100
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -pruN 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/version.xml 0.5.13-1ubuntu8/doc/api/libhal-storage/version.xml
--- 0.5.12~git20090406.46dc48-2/doc/api/libhal-storage/version.xml	2009-04-08 06:38:26.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/api/libhal-storage/version.xml	2009-07-15 08:03:40.000000000 +0100
@@ -1 +1 @@
-0.5.12
+0.5.13
diff -pruN 0.5.12~git20090406.46dc48-2/doc/man/Makefile.in 0.5.13-1ubuntu8/doc/man/Makefile.in
--- 0.5.12~git20090406.46dc48-2/doc/man/Makefile.in	2009-04-08 06:37:43.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/man/Makefile.in	2009-07-15 08:03:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -150,8 +152,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -224,8 +224,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -266,8 +266,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    1*) ;; \
@@ -311,8 +311,8 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    8*) ;; \
diff -pruN 0.5.12~git20090406.46dc48-2/doc/spec/Makefile.in 0.5.13-1ubuntu8/doc/spec/Makefile.in
--- 0.5.12~git20090406.46dc48-2/doc/spec/Makefile.in	2009-04-08 06:37:44.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/spec/Makefile.in	2009-07-15 08:03:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,6 +64,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -155,8 +157,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -241,8 +241,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec-access-control.xml 0.5.13-1ubuntu8/doc/spec/hal-spec-access-control.xml
--- 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec-access-control.xml	2009-01-28 13:46:51.000000000 +0000
+++ 0.5.13-1ubuntu8/doc/spec/hal-spec-access-control.xml	2009-05-15 17:28:34.000000000 +0100
@@ -138,6 +138,14 @@
             
             
               
+                smart-card-reader
+              
+              Directly access Smart Card Reader security devices.
+	      no
+	      yes
+            
+            
+              
                 joystick
               
               Directly access Joystick devices.
diff -pruN 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec-properties.xml 0.5.13-1ubuntu8/doc/spec/hal-spec-properties.xml
--- 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec-properties.xml	2009-02-22 16:34:19.000000000 +0000
+++ 0.5.13-1ubuntu8/doc/spec/hal-spec-properties.xml	2009-05-27 21:26:03.000000000 +0100
@@ -12,6 +12,64 @@
     can catch.
   
 
+  
+    
+      org.freedesktop.Hal namespace
+    
+    
+      The org.freedesktop.Hal namespace contain properties that
+      can be considered metadata about HAL itself and not about device objects. They
+      are only available at the root object (/org/freedesktop/Hal/devices/computer) 
+      and allow to query information about HAL from fdi files.
+    
+    
+      
+        
+          
+            Key (type)
+            Values
+            Mandatory
+            Description
+          
+        
+        
+          
+            
+              org.freedesktop.Hal.version (string)
+            
+            example: 0.5.13
+            Yes
+            The version number of the running HAL daemon.
+          
+          
+            
+              org.freedesktop.Hal.version.major (int)
+            
+            example: 0
+            Yes
+            The major version number of the running HAL daemon.
+          
+          
+            
+              org.freedesktop.Hal.version.minor (int)
+            
+            example: 5
+            Yes
+            The minor version number of the running HAL daemon.
+          
+          
+            
+              org.freedesktop.Hal.version.micro (int)
+            
+            example: 13
+            Yes
+            The micro version number of the running HAL daemon.
+          
+        
+      
+     
+  
+
   
     General Properties
     
@@ -19,6 +77,7 @@
       physical or functional characteristics of what the device
       object represents.
     
+
     
       
         info namespace
@@ -6248,6 +6307,41 @@ org.freedesktop.Hal.Device.Volume.method
       </informaltable>
     </sect2>
 
+    <sect2 id="device-properties-smart_card_reader">
+      <title>
+        smart_card_reader namespace
+      
+      
+	Device objects with the capability smart_card_reader represent
+	a smart card device/systems (e.g. smart card reader) . No namespace specific
+        properties.
+      
+    
+
+    
+      
+        smart_card_reader.card_reader namespace
+      
+      
+	Device objects with the capabilities smart_card_reader
+	and smart_card_reader.card_reader represent a 
+	smart card reader. No namespace specific properties.
+      
+    
+
+    
+      
+        smart_card_reader.crypto_token namespace
+      
+      
+	Device objects with the capabilities smart_card_reader and 
+	smart_card_reader.crypto_token represent a smart token, a 
+	device where the smart card and the smart card reader are in one device. No 
+	namespace specific properties.
+      
+    
+
+
     
       
         storage namespace
diff -pruN 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec.xml.in 0.5.13-1ubuntu8/doc/spec/hal-spec.xml.in
--- 0.5.12~git20090406.46dc48-2/doc/spec/hal-spec.xml.in	2009-04-08 06:38:26.000000000 +0100
+++ 0.5.13-1ubuntu8/doc/spec/hal-spec.xml.in	2009-07-15 08:03:40.000000000 +0100
@@ -3,8 +3,8 @@
 
 <book id="index">
   <bookinfo>
-    <title>HAL 0.5.12 Specification
-    Version 0.5.12
+    HAL 0.5.13 Specification
+    Version 0.5.13
     March 24th, 2007 
     
       
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/Makefile.in 0.5.13-1ubuntu8/fdi/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/Makefile.in	2009-04-08 06:37:44.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/Makefile.in	2009-07-15 08:03:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -236,8 +236,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -360,7 +360,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/information/10freedesktop/Makefile.in 0.5.13-1ubuntu8/fdi/information/10freedesktop/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/information/10freedesktop/Makefile.in	2009-04-08 06:37:44.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/information/10freedesktop/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,6 +66,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -157,8 +159,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -224,8 +224,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/information/20thirdparty/Makefile.in 0.5.13-1ubuntu8/fdi/information/20thirdparty/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/information/20thirdparty/Makefile.in	2009-04-08 06:37:44.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/information/20thirdparty/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,6 +64,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -155,8 +157,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -222,8 +222,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/information/Makefile.in 0.5.13-1ubuntu8/fdi/information/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/information/Makefile.in	2009-04-08 06:37:45.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/information/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -235,8 +235,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -359,7 +359,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/10-tabletPCs.fdi 0.5.13-1ubuntu8/fdi/policy/10osvendor/10-tabletPCs.fdi
--- 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/10-tabletPCs.fdi	2008-08-25 21:40:02.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/policy/10osvendor/10-tabletPCs.fdi	2009-05-15 17:28:34.000000000 +0100
@@ -3,17 +3,10 @@
 
 
   
-    
-      
-      
-	/dev/ttyS2
-      
-
-      
-      
-	/dev/ttyS0
-	38400
-      
+    
+    
+      /dev/ttyS0
+      38400
     
 
     
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/10-x11-input.fdi 0.5.13-1ubuntu8/fdi/policy/10osvendor/10-x11-input.fdi
--- 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/10-x11-input.fdi	2009-02-26 11:10:17.000000000 +0000
+++ 0.5.13-1ubuntu8/fdi/policy/10osvendor/10-x11-input.fdi	2009-06-26 08:28:39.000000000 +0100
@@ -16,6 +16,13 @@
       
     
 
+    
+      
+        evdev
+      
+    
+
     
       
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/20-acl-management.fdi 0.5.13-1ubuntu8/fdi/policy/10osvendor/20-acl-management.fdi
--- 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/20-acl-management.fdi	2009-02-22 16:34:19.000000000 +0000
+++ 0.5.13-1ubuntu8/fdi/policy/10osvendor/20-acl-management.fdi	2009-05-15 17:28:34.000000000 +0100
@@ -73,6 +73,11 @@
 	  usbraw.device
 	  fingerprint-reader
         
+        
+	  access_control
+	  usbraw.device
+	  smart-card-reader
+        
       
     
 
@@ -104,6 +109,11 @@
           fingerprint-reader
           @info.parent:linux.device_file
         
+        
+          access_control
+          smart-card-reader
+          @info.parent:linux.device_file
+        
       
     
 
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/Makefile.in 0.5.13-1ubuntu8/fdi/policy/10osvendor/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/policy/10osvendor/Makefile.in	2009-04-08 06:37:45.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/policy/10osvendor/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -175,8 +177,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -249,8 +249,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/20thirdparty/Makefile.in 0.5.13-1ubuntu8/fdi/policy/20thirdparty/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/policy/20thirdparty/Makefile.in	2009-04-08 06:37:45.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/policy/20thirdparty/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,6 +64,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -155,8 +157,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -222,8 +222,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/policy/Makefile.in 0.5.13-1ubuntu8/fdi/policy/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/policy/Makefile.in	2009-04-08 06:37:45.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/policy/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -235,8 +235,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -359,7 +359,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/preprobe/10freedesktop/Makefile.in 0.5.13-1ubuntu8/fdi/preprobe/10freedesktop/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/preprobe/10freedesktop/Makefile.in	2009-04-08 06:37:46.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/preprobe/10freedesktop/Makefile.in	2009-07-15 08:03:10.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,6 +64,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -155,8 +157,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -222,8 +222,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/preprobe/20thirdparty/Makefile.in 0.5.13-1ubuntu8/fdi/preprobe/20thirdparty/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/preprobe/20thirdparty/Makefile.in	2009-04-08 06:37:46.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/preprobe/20thirdparty/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,6 +64,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -155,8 +157,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -222,8 +222,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/fdi/preprobe/Makefile.in 0.5.13-1ubuntu8/fdi/preprobe/Makefile.in
--- 0.5.12~git20090406.46dc48-2/fdi/preprobe/Makefile.in	2009-04-08 06:37:46.000000000 +0100
+++ 0.5.13-1ubuntu8/fdi/preprobe/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -235,8 +235,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -359,7 +359,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/Makefile.am 0.5.13-1ubuntu8/hald/Makefile.am
--- 0.5.12~git20090406.46dc48-2/hald/Makefile.am	2008-08-11 16:41:11.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/Makefile.am	2009-07-15 07:52:51.000000000 +0100
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 	-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 -pruN 0.5.12~git20090406.46dc48-2/hald/Makefile.in 0.5.13-1ubuntu8/hald/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/Makefile.in	2009-04-08 06:37:47.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -117,6 +117,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -208,8 +210,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -274,7 +274,7 @@ AM_CPPFLAGS = \
 	-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)"\" \
@@ -341,8 +341,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -586,7 +586,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -642,7 +642,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -653,7 +653,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -665,7 +665,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -679,23 +679,36 @@ check-TESTS: $(TESTS)
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
diff -pruN 0.5.12~git20090406.46dc48-2/hald/device_info.c 0.5.13-1ubuntu8/hald/device_info.c
--- 0.5.12~git20090406.46dc48-2/hald/device_info.c	2009-02-22 16:34:19.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/device_info.c	2009-07-15 07:52:51.000000000 +0100
@@ -122,27 +122,10 @@ get_match_type_str (enum match_type type
 }
 #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 @@ out:
 	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 @@ out:
 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 @@ handle_match (struct rule *rule, HalDevi
 	/* 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 @@ handle_merge (struct rule *rule, HalDevi
 {
 	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 @@ handle_merge (struct rule *rule, HalDevi
 			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 @@ handle_merge (struct rule *rule, HalDevi
 				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 -pruN 0.5.12~git20090406.46dc48-2/hald/dummy/Makefile.in 0.5.13-1ubuntu8/hald/dummy/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/dummy/Makefile.in	2009-04-08 06:37:47.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/dummy/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,6 +72,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -163,8 +165,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -242,8 +242,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -319,7 +319,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/Makefile.in 0.5.13-1ubuntu8/hald/freebsd/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/Makefile.in	2009-04-08 06:37:48.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/freebsd/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -90,6 +90,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -181,8 +183,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -299,8 +299,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -464,7 +464,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/addons/Makefile.in 0.5.13-1ubuntu8/hald/freebsd/addons/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/addons/Makefile.in	2009-04-08 06:37:48.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/freebsd/addons/Makefile.in	2009-07-15 08:03:12.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -246,8 +246,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -343,7 +343,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-computer.c 0.5.13-1ubuntu8/hald/freebsd/hf-computer.c
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-computer.c	2008-03-06 21:08:02.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/freebsd/hf-computer.c	2009-05-27 21:26:03.000000000 +0100
@@ -130,6 +130,17 @@ hf_computer_device_add (void)
   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 -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-pci.c 0.5.13-1ubuntu8/hald/freebsd/hf-pci.c
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-pci.c	2008-03-03 14:27:29.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/freebsd/hf-pci.c	2009-05-12 13:27:00.000000000 +0100
@@ -27,7 +27,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-storage.c 0.5.13-1ubuntu8/hald/freebsd/hf-storage.c
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/hf-storage.c	2008-03-03 14:27:29.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/freebsd/hf-storage.c	2009-05-12 13:24:28.000000000 +0100
@@ -644,7 +644,6 @@ void
 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 -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/libprobe/Makefile.in 0.5.13-1ubuntu8/hald/freebsd/libprobe/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/libprobe/Makefile.in	2009-04-08 06:37:48.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/freebsd/libprobe/Makefile.in	2009-07-15 08:03:12.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -86,6 +86,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -177,8 +179,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -260,8 +260,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -356,7 +356,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/libprobe/hfp-cdrom.h 0.5.13-1ubuntu8/hald/freebsd/libprobe/hfp-cdrom.h
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/libprobe/hfp-cdrom.h	2008-02-03 17:24:11.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/freebsd/libprobe/hfp-cdrom.h	2009-05-12 13:27:55.000000000 +0100
@@ -28,7 +28,7 @@
 #  include 
 #endif
 
-#include 
+#include 
 
 #include "hfp.h"
 
@@ -53,8 +53,8 @@ enum
 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 @@ typedef struct
 #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 @@ typedef struct
 #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 @@ typedef struct
 #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 @@ typedef struct
 #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 -pruN 0.5.12~git20090406.46dc48-2/hald/freebsd/probing/Makefile.in 0.5.13-1ubuntu8/hald/freebsd/probing/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/freebsd/probing/Makefile.in	2009-04-08 06:37:48.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/freebsd/probing/Makefile.in	2009-07-15 08:03:12.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -191,8 +193,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -293,8 +293,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -464,7 +464,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/hald_dbus.c 0.5.13-1ubuntu8/hald/hald_dbus.c
--- 0.5.12~git20090406.46dc48-2/hald/hald_dbus.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/hald_dbus.c	2009-07-15 07:52:51.000000000 +0100
@@ -3476,7 +3476,7 @@ singleton_signal_device_changed (DBusCon
 	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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/Makefile.in 0.5.13-1ubuntu8/hald/linux/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/linux/Makefile.in	2009-04-08 06:37:49.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/Makefile.in	2009-07-15 08:03:12.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -101,6 +101,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -192,8 +194,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -274,8 +274,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -429,7 +429,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/linux/addons/Makefile.in 0.5.13-1ubuntu8/hald/linux/addons/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/linux/addons/Makefile.in	2009-04-08 06:37:49.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/addons/Makefile.in	2009-07-15 08:03:12.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,6 +265,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -356,8 +358,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -467,8 +467,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -710,7 +710,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/linux/addons/addon-acpi.c 0.5.13-1ubuntu8/hald/linux/addons/addon-acpi.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/addons/addon-acpi.c	2008-06-17 19:15:04.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/addons/addon-acpi.c	2009-05-12 12:28:27.000000000 +0100
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -45,9 +46,14 @@ static FILE *
 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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/addons/addon-input.c 0.5.13-1ubuntu8/hald/linux/addons/addon-input.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/addons/addon-input.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/linux/addons/addon-input.c	2009-05-28 09:38:58.000000000 +0100
@@ -175,7 +175,11 @@ static char *key_name[KEY_MAX + 1] = {
 #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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/blockdev.c 0.5.13-1ubuntu8/hald/linux/blockdev.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/blockdev.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/linux/blockdev.c	2009-05-15 17:29:49.000000000 +0100
@@ -1498,8 +1498,15 @@ hotplug_event_begin_add_blockdev (const 
 		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 @@ hotplug_event_begin_add_blockdev (const 
 		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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/coldplug.c 0.5.13-1ubuntu8/hald/linux/coldplug.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/coldplug.c	2009-04-03 17:10:03.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/coldplug.c	2009-05-27 21:26:03.000000000 +0100
@@ -256,7 +256,7 @@ hal_util_init_sysfs_to_udev_map (void)
 		} 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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/device.c 0.5.13-1ubuntu8/hald/linux/device.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/device.c	2009-02-26 11:10:17.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/linux/device.c	2009-07-15 07:54:11.000000000 +0100
@@ -758,6 +758,44 @@ firewire_compute_udi (HalDevice *d)
 
 }
 
+/*--------------------------------------------------------------------------------------------------------------*/
+
+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 @@ ide_compute_udi (HalDevice *d)
 /*--------------------------------------------------------------------------------------------------------------*/
 
 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 @@ input_test_key (HalDevice *d, const char
 		} 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 @@ sound_compute_udi (HalDevice *d)
 		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 @@ static DevHandler dev_handler_bluetooth 
 	.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 @@ static DevHandler dev_handler_firewire =
 	.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 @@ static DevHandler *dev_handlers[] = {
 	&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 @@ static DevHandler *dev_handlers[] = {
 	&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 @@ hotplug_event_begin_add_dev (const gchar
 		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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/osspec.c 0.5.13-1ubuntu8/hald/linux/osspec.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/osspec.c	2009-04-06 19:26:36.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/osspec.c	2009-05-27 21:26:03.000000000 +0100
@@ -841,6 +841,17 @@ osspec_probe (void)
 	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 -pruN 0.5.12~git20090406.46dc48-2/hald/linux/probing/Makefile.am 0.5.13-1ubuntu8/hald/linux/probing/Makefile.am
--- 0.5.12~git20090406.46dc48-2/hald/linux/probing/Makefile.am	2008-10-01 20:35:40.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/probing/Makefile.am	2009-05-10 20:11:44.000000000 +0100
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
-	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @VOLUME_ID_CFLAGS@
+	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @BLKID_CFLAGS@
 
 if HALD_COMPILE_LINUX
 libexec_PROGRAMS = 			\
@@ -40,12 +40,12 @@ hald_probe_serial_SOURCES = probe-serial
 hald_probe_serial_LDADD = $(top_builddir)/libhal/libhal.la
 
 hald_probe_storage_SOURCES = probe-storage.c linux_dvd_rw_utils.c linux_dvd_rw_utils.h ../../util_helper.c ../../logger.c  
-hald_probe_storage_LDADD = @GLIB_LIBS@ @VOLUME_ID_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la 
+hald_probe_storage_LDADD = @GLIB_LIBS@ @BLKID_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la 
 
 hald_probe_pc_floppy_SOURCES = probe-pc-floppy.c ../../logger.c
 
 hald_probe_volume_SOURCES = probe-volume.c linux_dvd_rw_utils.c ../../logger.c 
-hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @VOLUME_ID_LIBS@
+hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @BLKID_LIBS@
 
 hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
 hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
diff -pruN 0.5.12~git20090406.46dc48-2/hald/linux/probing/Makefile.in 0.5.13-1ubuntu8/hald/linux/probing/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/linux/probing/Makefile.in	2009-04-08 06:37:50.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/linux/probing/Makefile.in	2009-07-15 08:03:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -144,6 +144,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -235,8 +237,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -300,7 +300,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
-	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @VOLUME_ID_CFLAGS@
+	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @BLKID_CFLAGS@
 
 hald_probe_smbios_SOURCES = probe-smbios.c ../../logger.c
 hald_probe_smbios_LDADD = $(top_builddir)/libhal/libhal.la
@@ -314,10 +314,10 @@ hald_probe_hiddev_LDADD = $(top_builddir
 hald_probe_serial_SOURCES = probe-serial.c ../../logger.c
 hald_probe_serial_LDADD = $(top_builddir)/libhal/libhal.la
 hald_probe_storage_SOURCES = probe-storage.c linux_dvd_rw_utils.c linux_dvd_rw_utils.h ../../util_helper.c ../../logger.c  
-hald_probe_storage_LDADD = @GLIB_LIBS@ @VOLUME_ID_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la 
+hald_probe_storage_LDADD = @GLIB_LIBS@ @BLKID_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la 
 hald_probe_pc_floppy_SOURCES = probe-pc-floppy.c ../../logger.c
 hald_probe_volume_SOURCES = probe-volume.c linux_dvd_rw_utils.c ../../logger.c 
-hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @VOLUME_ID_LIBS@
+hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @BLKID_LIBS@
 hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
 hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
 hald_probe_net_bluetooth_SOURCES = probe-net-bluetooth.c ../../logger.c
@@ -332,8 +332,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -500,7 +500,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/linux/probing/probe-storage.c 0.5.13-1ubuntu8/hald/linux/probing/probe-storage.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/probing/probe-storage.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/linux/probing/probe-storage.c	2009-05-10 20:11:44.000000000 +0100
@@ -44,7 +44,7 @@
 #include 
 
 #include 
-#include 
+#include 
 
 #include "libhal/libhal.h"
 #include "partutil/partutil.h"
@@ -53,19 +53,6 @@
 #include "../../logger.h"
 #include "../../util_helper.h"
 
-
-static void vid_log(int priority, const char *file, int line, const char *format, ...)
-{
-	char log_str[1024];
-	va_list args;
-
-	va_start(args, format);
-	vsnprintf(log_str, sizeof(log_str), format, args);
-	logger_forward_debug("%s:%i %s\n", file, line, log_str);
-	va_end(args);
-}
-
-
 /** Check if a filesystem on a special device file is mounted
  *
  *  @param  device_file         Special device file, e.g. /dev/cdrom
@@ -117,9 +104,6 @@ main (int argc, char *argv[])
 
 	fd = -1;
 
-	/* hook in our debug into libvolume_id */
-	volume_id_log_fn = vid_log;
-
         fprintf (stderr, "woohoo\n");
 
 	/* assume failure */
@@ -445,7 +429,7 @@ main (int argc, char *argv[])
 		close (fd);
         HAL_DEBUG (("PROBE CLOSED LOCK ON CDROM"));
 	} else {
-		struct volume_id *vid;
+		blkid_probe pr;
 		GDir *dir;
 		const gchar *partition;
 		const gchar *main_device;
@@ -515,25 +499,27 @@ main (int argc, char *argv[])
 		libhal_changeset_set_property_string (cs, "storage.partitioning_scheme", "none");
 
 		/* probe for file system */
-		vid = volume_id_open_fd (fd);
-		if (vid != NULL) {
-			if (volume_id_probe_all (vid, 0, size) == 0) {
+		pr = blkid_new_probe ();
+		if (pr != NULL) {
+			blkid_probe_set_request (pr, BLKID_PROBREQ_LABEL | BLKID_PROBREQ_UUID |
+						 BLKID_PROBREQ_TYPE | BLKID_PROBREQ_SECTYPE |
+						 BLKID_PROBREQ_USAGE | BLKID_PROBREQ_VERSION);
+			if (blkid_probe_set_device (pr, fd, 0, size) == 0 &&
+			    blkid_do_safeprobe (pr) == 0) {
 				const char *usage;
+
 				/* signal to hald that we've found something and a fakevolume
 				 * should be added - see hald/linux/blockdev.c:add_blockdev_probing_helper_done()
 				 * and hald/linux/blockdev.c:block_rescan_storage_done().
 				 */
-
-				if (volume_id_get_usage(vid, &usage) &&
-				    ( strcmp(usage, "filesystem") == 0 ||
-				      strcmp(usage, "raid") == 0 ||
-				      strcmp(usage, "other") == 0 ||
-				      strcmp(usage, "crypto") == 0))
+				if (blkid_probe_lookup_value (pr, "USAGE", &usage, NULL) == 0 &&
+				    (strcmp (usage, "filesystem") == 0 ||
+				     strcmp (usage, "raid") == 0 ||
+				     strcmp (usage, "other") == 0 ||
+				     strcmp (usage, "crypto") == 0))
 					ret = 2;
-			} else {
-				;
 			}
-			volume_id_close(vid);
+			blkid_free_probe (pr);
 		}
 		close (fd);
 	}
diff -pruN 0.5.12~git20090406.46dc48-2/hald/linux/probing/probe-volume.c 0.5.13-1ubuntu8/hald/linux/probing/probe-volume.c
--- 0.5.12~git20090406.46dc48-2/hald/linux/probing/probe-volume.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/linux/probing/probe-volume.c	2009-05-27 21:26:03.000000000 +0100
@@ -42,24 +42,13 @@
 #include 
 
 #include 
-#include 
+#include 
 
 #include "libhal/libhal.h"
 #include "partutil/partutil.h"
 #include "linux_dvd_rw_utils.h"
 #include "../../logger.h"
 
-static void vid_log(int priority, const char *file, int line, const char *format, ...)
-{
-	char log_str[1024];
-	va_list args;
-
-	va_start(args, format);
-	vsnprintf(log_str, sizeof(log_str), format, args);
-	logger_forward_debug("%s:%i %s\n", file, line, log_str);
-	va_end(args);
-}
-
 static gchar *
 strdup_valid_utf8 (const char *str)
 {
@@ -89,7 +78,7 @@ strdup_valid_utf8 (const char *str)
 
 
 static void
-set_volume_id_values (LibHalChangeSet *cs, struct volume_id *vid)
+set_blkid_values (LibHalChangeSet *cs, blkid_probe pr)
 {
 	char buf[256];
 	const char *usage;
@@ -101,28 +90,27 @@ set_volume_id_values (LibHalChangeSet *c
 
 	dbus_error_init (&error);
 
-	if (!volume_id_get_usage(vid, &usage))
+	if (blkid_probe_lookup_value(pr, "USAGE", &usage, NULL))
 		usage = "";
 	libhal_changeset_set_property_string (cs, "volume.fsusage", usage);
 	HAL_DEBUG (("volume.fsusage = '%s'", usage));
 
-	if (!volume_id_get_type(vid, &type))
+	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 (!volume_id_get_type_version(vid, &type_version))
+	if (blkid_probe_lookup_value(pr, "VERSION", &type_version, NULL))
 		type_version = "";
 	libhal_changeset_set_property_string (cs, "volume.fsversion", type_version);
 	HAL_DEBUG(("volume.fsversion = '%s'", type_version));
 
-	if (!volume_id_get_uuid(vid, &uuid))
+	if (blkid_probe_lookup_value(pr, "UUID", &uuid, NULL))
 		uuid = "";
 	libhal_changeset_set_property_string (cs, "volume.uuid", uuid);
 	HAL_DEBUG(("volume.uuid = '%s'", uuid));
 
-	if (!volume_id_get_label(vid, &label))
+	if (blkid_probe_lookup_value(pr, "LABEL", &label, NULL))
 		label = "";
 
 	if (label[0] != '\0') {
@@ -311,7 +299,7 @@ main (int argc, char *argv[])
 	LibHalContext *ctx = NULL;
 	DBusError error;
 	char *parent_udi;
-	struct volume_id *vid;
+	blkid_probe pr;
 	char *stordev_dev_file;
 	char *partition_number_str;
 	char *partition_start_str;
@@ -331,9 +319,6 @@ main (int argc, char *argv[])
 	cs = NULL;
 	disc_may_have_data = FALSE;
 
-	/* hook in our debug into libvolume_id */
-	volume_id_log_fn = vid_log;
-
 	setup_logger ();
 
 	/* assume failure */
@@ -631,23 +616,33 @@ main (int argc, char *argv[])
 		}
 
 		/* probe for file system */
-		vid = volume_id_open_fd (fd);
-		if (vid != NULL) {
-			int vid_ret;
-			HAL_INFO (("invoking volume_id_probe_all, offset=%d, size=%d", vol_probe_offset, vol_size));
-			vid_ret = volume_id_probe_all (vid, vol_probe_offset, vol_size);
-			HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
+		pr = blkid_new_probe ();
+		if (pr != NULL) {
+			int bid_ret;
+
+			blkid_probe_set_request (pr, BLKID_PROBREQ_LABEL | BLKID_PROBREQ_UUID |
+						 BLKID_PROBREQ_TYPE | BLKID_PROBREQ_SECTYPE |
+						 BLKID_PROBREQ_USAGE | BLKID_PROBREQ_VERSION);
+
+			HAL_INFO (("invoking blkid_do_safeprobe, offset=%d, size=%d", vol_probe_offset, vol_size));
+			bid_ret = blkid_probe_set_device (pr, fd, vol_probe_offset, vol_size);
+			if (bid_ret == 0) {
+				bid_ret = blkid_do_safeprobe (pr);
+				HAL_INFO (("blkid_do_safeprobe returned %d", bid_ret));
+			}
 
-			if (vid_ret != 0 && is_disc && vol_probe_offset != 0) {
+			if (bid_ret != 0 && is_disc && vol_probe_offset != 0) {
 				/* Some cd-rom drives report the offset of the session in the cd's TOC
 				 * wrong.  Fallback to probing at offset 0, just to be sure */
-				HAL_INFO (("invoking volume_id_probe_all, offset=0, size=%d", vol_size));
-				vid_ret = volume_id_probe_all (vid, 0 , vol_size);
-				HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
+				HAL_INFO (("invoking blkid_do_safeprobe, offset=0, size=%d", vol_size));
+				bid_ret = blkid_probe_set_device (pr, fd, 0, vol_size);
+				if (bid_ret == 0)
+					bid_ret = blkid_do_safeprobe (pr);
+				HAL_INFO (("blkid_do_safeprobe returned %d", bid_ret));
 			}
 
-			if (vid_ret == 0) {
-				set_volume_id_values(cs, vid);
+			if (bid_ret == 0) {
+				set_blkid_values(cs, pr);
 				if (disc_may_have_data) {
 					libhal_changeset_set_property_bool (cs, "volume.disc.is_blank", FALSE);
 					libhal_changeset_set_property_bool (cs, "volume.disc.has_data", TRUE);
@@ -663,7 +658,7 @@ main (int argc, char *argv[])
 			 *  this is good enough for now... the only discs I know of that does this
 			 *  is in fact Apple's install disc.)
 			 */
-			if (vid_ret != 0 && is_disc) {
+			if (bid_ret != 0 && is_disc) {
 				PartitionTable *p;
 				p = part_table_load_from_disk (stordev_dev_file);
 				if (p != NULL) {
@@ -681,11 +676,10 @@ main (int argc, char *argv[])
 							guint64 part_offset;
 
 							part_offset = part_table_entry_get_offset (p, i);
-							if (volume_id_probe_all (
-								    vid, vol_probe_offset + part_offset, 0) == 0) {
-
-								set_volume_id_values(cs, vid);
-							}
+							if (blkid_probe_set_device (pr, fd,
+								vol_probe_offset + part_offset, 0) == 0 &&
+							    blkid_do_safeprobe (pr) == 0)
+								set_blkid_values(cs, pr);
 
 							/* and we're done */
 							break;
@@ -699,7 +693,7 @@ main (int argc, char *argv[])
 				}
 			}
 
-			volume_id_close(vid);
+			blkid_free_probe (pr);
 		}
 
 		/* get partition type number, if we find a msdos partition table */
diff -pruN 0.5.12~git20090406.46dc48-2/hald/logger.c 0.5.13-1ubuntu8/hald/logger.c
--- 0.5.12~git20090406.46dc48-2/hald/logger.c	2007-07-03 01:25:17.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/logger.c	2009-05-10 20:11:44.000000000 +0100
@@ -222,7 +222,7 @@ logger_emit (const char *format, ...)
  *  @format:             Message format string, printf style
  *  @...:                Parameters for message, printf style
  *
- * Forward debug messages as e.g. from udev/libvolume_id.
+ * Forward debug messages
  */
 void
 logger_forward_debug (const char *format, ...)
diff -pruN 0.5.12~git20090406.46dc48-2/hald/solaris/Makefile.in 0.5.13-1ubuntu8/hald/solaris/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/solaris/Makefile.in	2009-04-08 06:37:50.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/solaris/Makefile.in	2009-07-15 08:03:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -85,6 +85,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -176,8 +178,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -257,8 +257,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -412,7 +412,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/solaris/addons/Makefile.in 0.5.13-1ubuntu8/hald/solaris/addons/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/solaris/addons/Makefile.in	2009-04-08 06:37:51.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/solaris/addons/Makefile.in	2009-07-15 08:03:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -77,6 +77,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -168,8 +170,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -245,8 +245,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -357,7 +357,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald/solaris/devinfo_misc.c 0.5.13-1ubuntu8/hald/solaris/devinfo_misc.c
--- 0.5.12~git20090406.46dc48-2/hald/solaris/devinfo_misc.c	2008-03-13 14:55:25.000000000 +0000
+++ 0.5.13-1ubuntu8/hald/solaris/devinfo_misc.c	2009-05-27 21:26:03.000000000 +0100
@@ -74,6 +74,17 @@ devinfo_computer_add(HalDevice *parent, 
         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 -pruN 0.5.12~git20090406.46dc48-2/hald/solaris/probing/Makefile.in 0.5.13-1ubuntu8/hald/solaris/probing/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald/solaris/probing/Makefile.in	2009-04-08 06:37:52.000000000 +0100
+++ 0.5.13-1ubuntu8/hald/solaris/probing/Makefile.in	2009-07-15 08:03:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -97,6 +97,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -188,8 +190,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -269,8 +269,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -488,7 +488,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/hald-runner/Makefile.am 0.5.13-1ubuntu8/hald-runner/Makefile.am
--- 0.5.12~git20090406.46dc48-2/hald-runner/Makefile.am	2007-07-04 05:25:34.000000000 +0100
+++ 0.5.13-1ubuntu8/hald-runner/Makefile.am	2009-07-15 07:52:51.000000000 +0100
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-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 -pruN 0.5.12~git20090406.46dc48-2/hald-runner/Makefile.in 0.5.13-1ubuntu8/hald-runner/Makefile.in
--- 0.5.12~git20090406.46dc48-2/hald-runner/Makefile.in	2009-04-08 06:37:47.000000000 +0100
+++ 0.5.13-1ubuntu8/hald-runner/Makefile.in	2009-07-15 08:03:11.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -167,8 +169,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -232,7 +232,7 @@ AM_CPPFLAGS = \
 	-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@
@@ -247,8 +247,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -346,7 +346,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/libhal/Makefile.in 0.5.13-1ubuntu8/libhal/Makefile.in
--- 0.5.12~git20090406.46dc48-2/libhal/Makefile.in	2009-04-08 06:37:52.000000000 +0100
+++ 0.5.13-1ubuntu8/libhal/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -89,6 +89,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -180,8 +182,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -265,8 +265,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -377,7 +377,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/libhal-storage/Makefile.in 0.5.13-1ubuntu8/libhal-storage/Makefile.in
--- 0.5.12~git20090406.46dc48-2/libhal-storage/Makefile.in	2009-04-08 06:37:52.000000000 +0100
+++ 0.5.13-1ubuntu8/libhal-storage/Makefile.in	2009-07-15 08:03:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -88,6 +88,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -179,8 +181,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -260,8 +260,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -372,7 +372,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/libhal-storage/libhal-storage.c 0.5.13-1ubuntu8/libhal-storage/libhal-storage.c
--- 0.5.12~git20090406.46dc48-2/libhal-storage/libhal-storage.c	2009-02-21 20:02:07.000000000 +0000
+++ 0.5.13-1ubuntu8/libhal-storage/libhal-storage.c	2009-04-21 10:38:52.000000000 +0100
@@ -769,7 +769,7 @@ struct LibHalVolume_s {
 	dbus_bool_t disc_is_rewritable;
 
 	unsigned int block_size;
-	unsigned int num_blocks;
+	dbus_uint64_t num_blocks;
 
 	char *desired_mount_point;
 	char *mount_filesystem;
@@ -1177,7 +1177,7 @@ libhal_volume_from_udi (LibHalContext *h
 		LIBHAL_PROP_EXTRACT_STRING ("volume.crypto_luks.clear.backing_volume", vol->crypto_backing_volume);
 
 		LIBHAL_PROP_EXTRACT_INT    ("volume.block_size",         vol->block_size);
-		LIBHAL_PROP_EXTRACT_INT    ("volume.num_blocks",         vol->num_blocks);
+		LIBHAL_PROP_EXTRACT_UINT64 ("volume.num_blocks",         vol->num_blocks);
 		LIBHAL_PROP_EXTRACT_UINT64 ("volume.size", 		 vol->volume_size); 
 		LIBHAL_PROP_EXTRACT_STRING ("volume.label",              vol->volume_label);
 		LIBHAL_PROP_EXTRACT_STRING ("volume.mount_point",        vol->mount_point);
@@ -1504,7 +1504,7 @@ libhal_volume_get_size (LibHalVolume *vo
 	if (volume->volume_size > 0)
 		return volume->volume_size;
 	else
-		return ((dbus_uint64_t)volume->block_size) * ((dbus_uint64_t)volume->num_blocks);
+		return ((dbus_uint64_t)volume->block_size) * volume->num_blocks;
 }
 
 dbus_uint64_t
diff -pruN 0.5.12~git20090406.46dc48-2/ltmain.sh 0.5.13-1ubuntu8/ltmain.sh
--- 0.5.12~git20090406.46dc48-2/ltmain.sh	2009-04-08 06:37:11.000000000 +0100
+++ 0.5.13-1ubuntu8/ltmain.sh	2009-07-15 08:02:58.000000000 +0100
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-2
+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-2"
+VERSION="2.2.6 Debian-2.2.6a-4"
 TIMESTAMP=""
 package_revision=1.3012
 
@@ -5347,19 +5347,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
diff -pruN 0.5.12~git20090406.46dc48-2/partutil/Makefile.in 0.5.13-1ubuntu8/partutil/Makefile.in
--- 0.5.12~git20090406.46dc48-2/partutil/Makefile.in	2009-04-08 06:37:52.000000000 +0100
+++ 0.5.13-1ubuntu8/partutil/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -164,8 +166,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -234,8 +234,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -319,7 +319,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/policy/Makefile.in 0.5.13-1ubuntu8/policy/Makefile.in
--- 0.5.12~git20090406.46dc48-2/policy/Makefile.in	2009-04-08 06:37:53.000000000 +0100
+++ 0.5.13-1ubuntu8/policy/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,6 +72,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -163,8 +165,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -238,8 +238,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/policy/org.freedesktop.hal.device-access.policy 0.5.13-1ubuntu8/policy/org.freedesktop.hal.device-access.policy
--- 0.5.12~git20090406.46dc48-2/policy/org.freedesktop.hal.device-access.policy	2009-01-28 13:46:51.000000000 +0000
+++ 0.5.13-1ubuntu8/policy/org.freedesktop.hal.device-access.policy	2009-05-15 17:28:34.000000000 +0100
@@ -91,6 +91,15 @@ NOTE: Please keep the actions in alpabet
     
   
 
+  
+    Directly access to Smart Card Reader security devices
+    System policy prevents access to Smart Card Reader security devices
+    
+      no
+      yes
+    
+  
+
   
     Directly access Joystick devices
     System policy prevents access to Joystick devices
diff -pruN 0.5.12~git20090406.46dc48-2/tools/Makefile.am 0.5.13-1ubuntu8/tools/Makefile.am
--- 0.5.12~git20090406.46dc48-2/tools/Makefile.am	2008-10-27 15:28:45.000000000 +0000
+++ 0.5.13-1ubuntu8/tools/Makefile.am	2009-07-15 07:52:51.000000000 +0100
@@ -17,7 +17,7 @@ AM_CPPFLAGS = \
 	-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_SOURCES = hal-system-
 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 -pruN 0.5.12~git20090406.46dc48-2/tools/Makefile.in 0.5.13-1ubuntu8/tools/Makefile.in
--- 0.5.12~git20090406.46dc48-2/tools/Makefile.in	2009-04-08 06:37:54.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -272,6 +272,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -363,8 +365,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -429,7 +429,7 @@ AM_CPPFLAGS = \
 	-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@
@@ -481,7 +481,7 @@ hal_system_setserial_LDADD = 
 @HAVE_PMU_TRUE@hal_system_power_pmu_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
 @HAVE_SONYPIC_TRUE@hal_system_sonypic_SOURCES = hal-system-sonypic.c
 @HAVE_SONYPIC_TRUE@hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
-scriptdir = $(libdir)/hal/scripts
+scriptdir = $(libexecdir)/scripts
 script_SCRIPTS = \
 	hal-luks-setup                          \
 	hal-luks-teardown                       \
@@ -515,8 +515,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -846,7 +846,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff -pruN 0.5.12~git20090406.46dc48-2/tools/freebsd/Makefile.am 0.5.13-1ubuntu8/tools/freebsd/Makefile.am
--- 0.5.12~git20090406.46dc48-2/tools/freebsd/Makefile.am	2007-07-03 01:25:17.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/freebsd/Makefile.am	2009-07-15 07:52:51.000000000 +0100
@@ -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 -pruN 0.5.12~git20090406.46dc48-2/tools/freebsd/Makefile.in 0.5.13-1ubuntu8/tools/freebsd/Makefile.in
--- 0.5.12~git20090406.46dc48-2/tools/freebsd/Makefile.in	2009-04-08 06:37:54.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/freebsd/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -148,8 +150,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -206,7 +206,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udev_prefix = @udev_prefix@
-scriptdir = $(libdir)/hal/scripts/freebsd
+scriptdir = $(libexecdir)/scripts/freebsd
 script_SCRIPTS = \
 	hal-system-power-suspend-freebsd		\
 	hal-system-power-shutdown-freebsd		\
@@ -223,8 +223,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff -pruN 0.5.12~git20090406.46dc48-2/tools/hal-storage-mount.c 0.5.13-1ubuntu8/tools/hal-storage-mount.c
--- 0.5.12~git20090406.46dc48-2/tools/hal-storage-mount.c	2008-11-10 22:37:45.000000000 +0000
+++ 0.5.13-1ubuntu8/tools/hal-storage-mount.c	2009-05-27 21:26:03.000000000 +0100
@@ -417,7 +417,7 @@ device_is_mounted (const char *device, c
 	return ret;
 }
 
-/* maps volume_id fs types to the appropriate -t mount option */
+/* maps blkid fs types to the appropriate -t mount option */
 static const char *
 map_fstype (const char *fstype)
 {
@@ -786,12 +786,13 @@ handle_mount (LibHalContext *hal_ctx, 
 		/* 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 -pruN 0.5.12~git20090406.46dc48-2/tools/hal-system-power-pmu.c 0.5.13-1ubuntu8/tools/hal-system-power-pmu.c
--- 0.5.12~git20090406.46dc48-2/tools/hal-system-power-pmu.c	2008-01-07 19:02:17.000000000 +0000
+++ 0.5.13-1ubuntu8/tools/hal-system-power-pmu.c	2009-05-12 13:25:58.000000000 +0100
@@ -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 @@ pmac_sleep (void)
 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 @@ pmac_get_lcd_brightness (int *val)
 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 -pruN 0.5.12~git20090406.46dc48-2/tools/hal-system-sonypic.c 0.5.13-1ubuntu8/tools/hal-system-sonypic.c
--- 0.5.12~git20090406.46dc48-2/tools/hal-system-sonypic.c	2007-07-03 01:25:17.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/hal-system-sonypic.c	2009-05-15 17:28:34.000000000 +0100
@@ -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 @@ error_set:
 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 @@ sonypi_set_lcd_brightness (__u8 val)
 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 -pruN 0.5.12~git20090406.46dc48-2/tools/hal_set_property.c 0.5.13-1ubuntu8/tools/hal_set_property.c
--- 0.5.12~git20090406.46dc48-2/tools/hal_set_property.c	2007-07-03 01:25:17.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/hal_set_property.c	2009-05-12 12:24:50.000000000 +0100
@@ -66,7 +66,7 @@ usage (int argc, char *argv[])
  "           (--int  | --string  | --bool  |\n"
  "            --strlist-pre  | --strlist-post  |\n"
  "            --strlist-rem  | --double  | --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 @@ usage (int argc, char *argv[])
  "        --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 @@ main (int argc, char *argv[])
 	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 @@ main (int argc, char *argv[])
 			{"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 @@ main (int argc, char *argv[])
 				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 @@ main (int argc, char *argv[])
 	
 	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 -pruN 0.5.12~git20090406.46dc48-2/tools/linux/Makefile.am 0.5.13-1ubuntu8/tools/linux/Makefile.am
--- 0.5.12~git20090406.46dc48-2/tools/linux/Makefile.am	2009-02-28 22:31:41.000000000 +0000
+++ 0.5.13-1ubuntu8/tools/linux/Makefile.am	2009-07-15 07:52:51.000000000 +0100
@@ -10,14 +10,14 @@ AM_CPPFLAGS = \
 	-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                          	\
diff -pruN 0.5.12~git20090406.46dc48-2/tools/linux/Makefile.in 0.5.13-1ubuntu8/tools/linux/Makefile.in
--- 0.5.12~git20090406.46dc48-2/tools/linux/Makefile.in	2009-04-08 06:37:54.000000000 +0100
+++ 0.5.13-1ubuntu8/tools/linux/Makefile.in	2009-07-15 08:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -71,6 +71,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 BUILD_ACPI_IBM = @BUILD_ACPI_IBM@
 BUILD_ACPI_TOSHIBA = @BUILD_ACPI_TOSHIBA@
 CC = @CC@
@@ -162,8 +164,6 @@ USE_PCI_IDS = @USE_PCI_IDS@
 USE_PNP_IDS = @USE_PNP_IDS@
 USE_USB_IDS = @USE_USB_IDS@
 VERSION = @VERSION@
-VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
-VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
 XMLLINT = @XMLLINT@
 XMLTO = @XMLTO@
 abs_builddir = @abs_builddir@
@@ -228,12 +228,12 @@ AM_CPPFLAGS = \
 	-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@
 
-scriptdir = $(libdir)/hal/scripts/linux
+scriptdir = $(libexecdir)/scripts/linux
 script_SCRIPTS = \
 	hal-luks-setup-linux                          	\
 	hal-luks-teardown-linux                       	\
@@ -259,8 +259,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \