[Pkg-utopia-commits] r236 - in packages/experimental/hal/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Mon May 1 17:56:06 UTC 2006
Author: sjoerd
Date: 2005-06-21 13:34:46 +0000 (Tue, 21 Jun 2005)
New Revision: 236
Added:
packages/experimental/hal/debian/hal.docs
packages/experimental/hal/debian/libhal-storage1.install
packages/experimental/hal/debian/libhal1.install
packages/experimental/hal/debian/libhal1.shlibs
packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.patch
packages/experimental/hal/debian/patches/property-null-values.patch
Removed:
packages/experimental/hal/debian/docs
packages/experimental/hal/debian/hal.links
packages/experimental/hal/debian/ipod-music-player.fdi
packages/experimental/hal/debian/libhal-storage0.install
packages/experimental/hal/debian/libhal0.install
packages/experimental/hal/debian/libhal0.shlibs
packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.diff
packages/experimental/hal/debian/patches/hal-fdi.patch
packages/experimental/hal/debian/patches/hal-hotplug-map.patch
packages/experimental/hal/debian/patches/harddisk-volumes.patch
packages/experimental/hal/debian/patches/hotplug_timeout.patch
packages/experimental/hal/debian/patches/ids-search.patch
packages/experimental/hal/debian/patches/no_sysdevice.patch
Modified:
packages/experimental/hal/debian/changelog
packages/experimental/hal/debian/control
packages/experimental/hal/debian/hal-device-manager.desktop
packages/experimental/hal/debian/hal.default
packages/experimental/hal/debian/hal.install
packages/experimental/hal/debian/hal.postinst
packages/experimental/hal/debian/patches/readme-remove-hacking.patch
packages/experimental/hal/debian/patches/storage-policy-debian.patch
packages/experimental/hal/debian/rules
packages/experimental/hal/debian/shlibs.local
Log:
Hal 0.5!
Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/changelog 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,3 +1,23 @@
+hal (0.5.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Don't build hal-device-manager for now as it needs python2.4 gnome
+ packages
+ * Based on Ubuntu's hal 0.5.2 by Martin Pitt.
+ * Removed no longer relevant patches:
+ + debian/patches/harddisk-volumes.patch
+ + debian/patches/ids-search.patch
+ + debian/patches/hal-fdi.patch
+ + debian/patches/hotplug_timeout.patch
+ + debian/patches/patches/no_sysdevice.patch
+ + debian/paches/hal-hotplug-map.patch
+ * debian/ipod-music-player.fdi
+ + Fixed upstream
+ * debian/hal-device-manager.desktop
+ + Updated with new translations from the Ubuntu package
+
+ -- Sjoerd Simons <sjoerd at debian.org> Tue, 21 Jun 2005 15:28:18 +0200
+
hal (0.4.8-2) unstable; urgency=low
* debian/ipod-music-player.fdi
Modified: packages/experimental/hal/debian/control
===================================================================
--- packages/experimental/hal/debian/control 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/control 2005-06-21 13:34:46 UTC (rev 236)
@@ -2,13 +2,12 @@
Section: admin
Priority: optional
Maintainer: Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, python, python2.3-dbus (>= 0.22), dbus-glib-1-dev (>= 0.22), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22)
+Build-Depends: debhelper (>= 4.2.32), cdbs, python2.4, python2.4-dbus (>= 0.34), libdbus-glib-1-dev (>= 0.34), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22)
Standards-Version: 3.6.1.0
Package: hal
Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.056-2)
-Conflicts: gnome-volume-manager (<< 0.9.10), pmount (<< 0.4.2)
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev, dbus
Suggests: hal-device-manager
Description: Hardware Abstraction Layer
HAL provides an abstract view on hardware.
@@ -19,21 +18,21 @@
It maintains a list of devices that currently exist, and can provide
information about those upon request.
-Package: hal-device-manager
-Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, python2.3-dbus (>= 0.22-3), python2.3-gnome2, python2.3-glade2, hal
-Conflicts: hal (<< 0.2.98-1)
-Description: Hardware Abstraction Layer user interface
- HAL provides an abstract view on hardware.
- .
- This abstraction layer is simply an interface that makes it possible to
- add support for new devices and new ways of connecting devices to the
- computer, without modifying every application that uses the device.
- It maintains a list of devices that currently exist, and can provide
- information about those upon request.
- .
- This package provides a user interface which shows the information HAL knows
- about the devices on the system.
+#Package: hal-device-manager
+#Architecture: all
+#Depends: ${shlibs:Depends}, ${python:Depends}, python2.4-dbus (>= 0.34), python2.4-gnome2, python2.4-glade2, hal
+#Conflicts: hal (<< 0.5)
+#Description: Hardware Abstraction Layer user interface
+# HAL provides an abstract view on hardware.
+# .
+# This abstraction layer is simply an interface that makes it possible to
+# add support for new devices and new ways of connecting devices to the
+# computer, without modifying every application that uses the device.
+# It maintains a list of devices that currently exist, and can provide
+# information about those upon request.
+# .
+# This package provides a user interface which shows the information HAL knows
+# about the devices on the system.
Package: hal-doc
Architecture: all
@@ -50,7 +49,7 @@
This Package contains the API documentation for HAL.
-Package: libhal0
+Package: libhal1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -65,7 +64,7 @@
.
This package contains shared libraries to be used by applications.
-Package: libhal-storage0
+Package: libhal-storage1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -83,7 +82,7 @@
Package: libhal-dev
Section: libdevel
Architecture: any
-Depends: libhal0 (= ${Source-Version}), dbus-1-dev
+Depends: libhal1 (= ${Source-Version}), libdbus-1-dev
Suggests: hal-doc
Description: Hardware Abstraction Layer - development files
HAL provides an abstract view on hardware.
@@ -99,7 +98,7 @@
Package: libhal-storage-dev
Section: libdevel
Architecture: any
-Depends: libhal-storage0 (= ${Source-Version}), dbus-1-dev
+Depends: libhal-storage1 (= ${Source-Version}), libdbus-1-dev
Suggests: hal-doc
Description: Hardware Abstraction Layer - development files
HAL provides an abstract view on hardware.
@@ -111,5 +110,5 @@
information about those upon request.
.
This package contains files that are needed to build applications that use
- libhal-storage0.
+ libhal-storage1.
Deleted: packages/experimental/hal/debian/docs
===================================================================
--- packages/experimental/hal/debian/docs 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/docs 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +0,0 @@
-build-tree/*/doc/TODO
Modified: packages/experimental/hal/debian/hal-device-manager.desktop
===================================================================
--- packages/experimental/hal/debian/hal-device-manager.desktop 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal-device-manager.desktop 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,12 +1,18 @@
[Desktop Entry]
Encoding=UTF-8
Name=Device Manager
+Name[da]=Enhedshåndtering
Name[de]=Gerätemanager
+Name[fi]=Laitehallinta
+Name[it]=Gestore periferiche
Comment=HAL Device Manager
+Comment[da]=HAL - enhedshåndtering
Comment[de]=HAL Gerätemanager
+Comment[fi]=HAL-laitehallinta
+Comment[it]=Gestore delle periferiche HAL
Exec=hal-device-manager
Icon=hwbrowser
StartupNotify=true
Terminal=false
Type=Application
-Categories=GNOME;Application;System;
+Categories=GNOME;Application;Settings;System;
Modified: packages/experimental/hal/debian/hal.default
===================================================================
--- packages/experimental/hal/debian/hal.default 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal.default 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,8 +1,8 @@
-# This will run the hal daemon as user root
-#DAEMON_OPTS=
-
# This will run the hal daemon as normal user 'hal' with some additional
# privileges; This will not execute callout scripts as root (so fstab-sync
# won't work) and makes hal unable to do filesystem type autodetection for
-# non-removable devices
-DAEMON_OPTS=--drop-privileges
+# non-removable devices.
+DAEMON_OPTS=
+
+# This will run the hal daemon as user root
+#DAEMON_OPTS=--retain-privileges
Added: packages/experimental/hal/debian/hal.docs
===================================================================
--- packages/experimental/hal/debian/hal.docs 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal.docs 2005-06-21 13:34:46 UTC (rev 236)
@@ -0,0 +1 @@
+build-tree/*/doc/TODO
Modified: packages/experimental/hal/debian/hal.install
===================================================================
--- packages/experimental/hal/debian/hal.install 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal.install 2005-06-21 13:34:46 UTC (rev 236)
@@ -5,5 +5,4 @@
debian/tmp/usr/sbin/
debian/tmp/usr/lib/hal/
debian/tmp/usr/share/hal/fdi
-debian/preferences.fdi etc/hal/fdi
-debian/ipod-music-player.fdi usr/share/hal/fdi/20freedesktop/
+debian/preferences.fdi etc/hal/fdi/policy
Deleted: packages/experimental/hal/debian/hal.links
===================================================================
--- packages/experimental/hal/debian/hal.links 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal.links 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +0,0 @@
-/etc/udev/hal.rules etc/udev/rules.d/050_hal-plugdev.rules
Modified: packages/experimental/hal/debian/hal.postinst
===================================================================
--- packages/experimental/hal/debian/hal.postinst 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/hal.postinst 2005-06-21 13:34:46 UTC (rev 236)
@@ -23,33 +23,14 @@
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
-UDEVSEND="/sbin/udevsend"
-
-do_udev() {
- # Synthesize events on block devices, so we know the permissions are setup
- # the right way
- SYSFS="/sys"
- for i in /sys/block/* ; do
- # for each device
- ACTION=add DEVPATH=${i#${SYSFS}} ${UDEVSEND} block &
-
- for j in $i/* ; do
- if [ -f $j/dev ]; then
- ACTION=add DEVPATH=${j#${SYSFS}} ${UDEVSEND} block &
- fi
- done
- done
-}
-
case "$1" in
configure)
if ! getent passwd hal >/dev/null; then
adduser --quiet --system --home /var/run/hal \
--gecos "Hardware abstraction layer" --group hal
- # be sure that hal has access to cdrom and floppy devices.
- adduser --quiet hal floppy
- adduser --quiet hal cdrom
fi
+ adduser --quiet hal floppy
+ adduser --quiet hal cdrom
# be sure the run dir is owned by the hal user
chown hal:hal /var/run/hal 2>/dev/null || true
@@ -58,9 +39,6 @@
mv /etc/init.d/hal /etc/dbus-1/event.d/
update-rc.d hal remove
fi
- if [ -x ${UDEVSEND} ] ; then
- do_udev;
- fi
if [ -x /etc/init.d/dbus-1 ]; then
invoke-rc.d dbus-1 restart || true
Deleted: packages/experimental/hal/debian/ipod-music-player.fdi
===================================================================
--- packages/experimental/hal/debian/ipod-music-player.fdi 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/ipod-music-player.fdi 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <device>
-
- <!-- Apple iPod - TODO: use USB ids to determine exact output formats -->
- <match key="info.category" string="storage">
- <match key="storage.vendor" contains="Apple">
- <match key="storage.model" contains="iPod"> <append key="info.capabilities"
- type="string">portable_audio_player</append>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.type" type="string">ipod</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-mp3 audio/aac</append>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
Deleted: packages/experimental/hal/debian/libhal-storage0.install
===================================================================
--- packages/experimental/hal/debian/libhal-storage0.install 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/libhal-storage0.install 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libhal-storage.so.*
Copied: packages/experimental/hal/debian/libhal-storage1.install (from rev 235, packages/experimental/hal/debian/libhal-storage0.install)
Deleted: packages/experimental/hal/debian/libhal0.install
===================================================================
--- packages/experimental/hal/debian/libhal0.install 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/libhal0.install 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libhal.so.*
Deleted: packages/experimental/hal/debian/libhal0.shlibs
===================================================================
--- packages/experimental/hal/debian/libhal0.shlibs 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/libhal0.shlibs 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +0,0 @@
-libhal 0 libhal0 (>= 0.4.0)
Copied: packages/experimental/hal/debian/libhal1.install (from rev 235, packages/experimental/hal/debian/libhal0.install)
Copied: packages/experimental/hal/debian/libhal1.shlibs (from rev 235, packages/experimental/hal/debian/libhal0.shlibs)
===================================================================
--- packages/experimental/hal/debian/libhal0.shlibs 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/libhal1.shlibs 2005-06-21 13:34:46 UTC (rev 236)
@@ -0,0 +1 @@
+libhal 1 libhal1 (>= 0.5)
Deleted: packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.diff
===================================================================
--- packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.diff 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.diff 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,11 +0,0 @@
-diff -u hal-0.4.7.orig/hal.conf hal-0.4.7/hal.conf
---- hal-0.4.7.orig/hal.conf.in 2005-01-25 03:46:38.000000000 +0100
-+++ hal-0.4.7/hal.conf.in 2005-03-07 13:25:33.532788600 +0100
-@@ -25,5 +25,7 @@
- receive_sender="org.freedesktop.Hal"/>
- </policy>
-
-+ <limit name="max_match_rules_per_connection">512</limit>
-+
- </busconfig>
-
Copied: packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.patch (from rev 235, packages/experimental/hal/debian/patches/hal-dbus_max_match_rules_per_connection.diff)
Deleted: packages/experimental/hal/debian/patches/hal-fdi.patch
===================================================================
--- packages/experimental/hal/debian/patches/hal-fdi.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/hal-fdi.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,19 +0,0 @@
-Index: hald/device_info.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/device_info.c,v
-retrieving revision 1.16
-diff -u -r1.16 device_info.c
---- hal/hald/device_info.c 14 Oct 2004 18:37:28 -0000 1.16
-+++ hal/hald/device_info.c 28 Oct 2004 18:57:31 -0000
-@@ -1176,7 +1176,10 @@
- di_search_and_merge (HalDevice *d)
- {
-
-- return scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
-+ dbus_bool_t ret;
-+
-+ ret = scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
-+ return scan_fdi_files (PACKAGE_SYSCONF_DIR "/hal/fdi", d) || ret;
- }
-
- /** @} */
Deleted: packages/experimental/hal/debian/patches/hal-hotplug-map.patch
===================================================================
--- packages/experimental/hal/debian/patches/hal-hotplug-map.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/hal-hotplug-map.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,73 +0,0 @@
-Index: tools/linux/hal_hotplug_map.c
-===================================================================
-RCS file: /cvs/hal/hal/tools/linux/hal_hotplug_map.c,v
-retrieving revision 1.3
-diff -u -r1.3 hal_hotplug_map.c
---- hal/tools/linux/hal_hotplug_map.c 27 Sep 2004 14:52:11 -0000 1.3
-+++ hal/tools/linux/hal_hotplug_map.c 6 Nov 2004 18:48:59 -0000
-@@ -3,6 +3,9 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#include <dirent.h>
-+#include <sys/types.h>
-+
- #define DBUS_API_SUBJECT_TO_CHANGE
- #include "libhal/libhal.h"
-
-@@ -21,6 +24,45 @@
- /* @todo FIXME HACK: it's a hack to hardcode this */
- static const char *usbmapfiles[] = {"/etc/hotplug/usb.usermap", "/etc/hotplug/usb/libsane.usermap", "/etc/hotplug/usb/libgphoto2.usermap", NULL};
-
-+#define BUFSIZE 256
-+static int
-+check_usb_masstorage() {
-+ char *sysfspath = getenv("HAL_PROP_LINUX_SYSFS_PATH");
-+ DIR *sysfsdir;
-+ struct dirent *direntry;
-+ FILE *f;
-+ char buf[BUFSIZE];
-+ char path[PATH_MAX];
-+
-+ if (sysfspath == NULL) {
-+ return FALSE;
-+ }
-+ sysfsdir = opendir(sysfspath);
-+ if (sysfsdir == NULL) {
-+ return FALSE;
-+ }
-+ while ((direntry = readdir(sysfsdir)) != NULL) {
-+ if (direntry->d_type == DT_DIR) {
-+ snprintf(path, PATH_MAX, "%s/%s/bInterfaceClass",
-+ sysfspath, direntry->d_name);
-+ f = fopen(path, "r");
-+ if (f == NULL)
-+ continue;
-+ if (fgets(buf, BUFSIZE, f) == NULL) {
-+ fclose(f);
-+ continue;
-+ }
-+ fclose(f);
-+ if (atoi(buf) == 8) {
-+ /* usb mass storage endpoint */
-+ dbg("Found USB Mass Storage endpoint!\n");
-+ return TRUE;
-+ }
-+ }
-+ }
-+ return FALSE;
-+}
-+
- static int
- handle_usb_found (const char *module)
- {
-@@ -35,7 +77,8 @@
- if (hal_context == NULL)
- return FALSE;
-
-- if (strcmp (module, "usbcam") == 0 || strcmp(module, "libgphoto2") == 0) {
-+ if ((strcmp (module, "usbcam") == 0 || strcmp(module, "libgphoto2") == 0)
-+ && !check_usb_masstorage()) {
- hal_device_add_capability (hal_context, udi, "camera");
- hal_device_set_property_string (hal_context, udi, "info.category", "camera");
- hal_device_set_property_string (hal_context, udi, "camera.access_method", "user");
Deleted: packages/experimental/hal/debian/patches/harddisk-volumes.patch
===================================================================
--- packages/experimental/hal/debian/patches/harddisk-volumes.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/harddisk-volumes.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,44 +0,0 @@
-diff -ruN hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi 2005-03-17 12:53:44.847773000 +0100
-+++ hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi 2005-03-17 12:57:03.976501360 +0100
-@@ -15,6 +15,17 @@
- </match>
- </device>
-
-+ <!-- non-root hald cannot read harddrive partitions; workaround for correct fsusage -->
-+ <device>
-+ <match key="info.category" string="volume">
-+ <match key="block.is_volume" bool="true">
-+ <match key="volume.fsusage" string="">
-+ <merge key="volume.fsusage" type="string">filesystem</merge>
-+ </match>
-+ </match>
-+ </match>
-+ </device>
-+
- <device>
- <!-- Whitelist bus types of storage devices we care about -->
- <match key="info.category" string="storage">
-diff -ruN hal-0.4.7-old/libhal-storage/libhal-storage.c hal-0.4.7/libhal-storage/libhal-storage.c
---- hal-0.4.7-old/libhal-storage/libhal-storage.c 2005-01-25 03:37:02.000000000 +0100
-+++ hal-0.4.7/libhal-storage/libhal-storage.c 2005-03-17 12:54:08.864122488 +0100
-@@ -592,10 +595,6 @@
- if (mount_point == NULL)
- mount_point = target_mount_point;
-
-- /* bail out if we don't know the filesystem */
-- if (fstype == NULL)
-- goto out;
--
- /* blacklist fhs2.3 top level mount points */
- if (mount_point != NULL) {
- for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) {
-@@ -605,7 +604,7 @@
- }
-
- /* blacklist partitions with name 'bootstrap' of type HFS (Apple uses that) */
-- if (label != NULL && strcmp (label, "bootstrap") == 0 && strcmp (fstype, "hfs") == 0)
-+ if (label != NULL && fstype != NULL && strcmp (label, "bootstrap") == 0 && strcmp (fstype, "hfs") == 0)
- goto out;
-
- /* only the real lucky mount points will make it this far :-) */
Deleted: packages/experimental/hal/debian/patches/hotplug_timeout.patch
===================================================================
--- packages/experimental/hal/debian/patches/hotplug_timeout.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/hotplug_timeout.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,27 +0,0 @@
-Index: hald/linux/osspec.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/Attic/osspec.c,v
-retrieving revision 1.52.2.5
-diff -u -r1.52.2.5 osspec.c
---- hal/hald/linux/osspec.c 21 Jan 2005 15:46:55 -0000 1.52.2.5
-+++ hal/hald/linux/osspec.c 18 Mar 2005 15:57:46 -0000
-@@ -1496,6 +1496,9 @@
- GList *i;
- struct hald_helper_msg *msg;
-
-+ if (hotplug_counter > 0 ) {
-+ return;
-+ }
- now = time (NULL);
-
- /* See if there was a last hotplug event */
-@@ -1521,9 +1524,6 @@
- last_hotplug_seqnum + 1, new_min_seqnum));
- last_hotplug_seqnum = new_min_seqnum - 1;
- last_hotplug_time_stamp = 0;
--
--
--
- /* process that event now */
- hald_helper_hotplug_process_queue ();
- }
Deleted: packages/experimental/hal/debian/patches/ids-search.patch
===================================================================
--- packages/experimental/hal/debian/patches/ids-search.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/ids-search.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,1195 +0,0 @@
-diff -ruN hal-0.4.8-old/configure hal-0.4.8/configure
---- hal-0.4.8-old/configure 2005-05-17 16:48:33.000000000 +0200
-+++ hal-0.4.8/configure 2005-05-23 19:29:54.000000000 +0200
-@@ -1172,7 +1172,7 @@
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -2626,8 +2626,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2685,8 +2684,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2802,8 +2800,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2857,8 +2854,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2903,8 +2899,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2948,8 +2943,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3136,8 +3130,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3191,8 +3184,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3591,8 +3583,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3650,8 +3641,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3767,8 +3757,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3822,8 +3811,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3868,8 +3856,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3913,8 +3900,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4429,8 +4415,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4488,8 +4473,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4605,8 +4589,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4660,8 +4643,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4706,8 +4688,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4751,8 +4732,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5186,8 +5166,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5911,7 +5890,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5914 "configure"' > conftest.$ac_ext
-+ echo '#line 5893 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -6031,8 +6010,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6111,8 +6089,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6179,8 +6156,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6440,8 +6416,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6499,8 +6474,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6571,8 +6545,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6616,8 +6589,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7082,7 +7054,7 @@
-
-
- # Provide some information about the compiler.
--echo "$as_me:7085:" \
-+echo "$as_me:7057:" \
- "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -7128,8 +7100,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7178,8 +7149,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8116,11 +8086,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8089: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8123: \$? = $ac_status" >&5
-+ echo "$as_me:8093: \$? = $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
-@@ -8349,11 +8319,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8322: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8356: \$? = $ac_status" >&5
-+ echo "$as_me:8326: \$? = $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
-@@ -8409,11 +8379,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8382: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8416: \$? = $ac_status" >&5
-+ echo "$as_me:8386: \$? = $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
-@@ -8800,8 +8770,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8861,8 +8830,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -9743,7 +9711,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 9746 "configure"' > conftest.$ac_ext
-+ echo '#line 9714 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -10074,8 +10042,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10178,8 +10145,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10244,8 +10210,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10338,8 +10303,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10404,8 +10368,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10471,8 +10434,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10538,8 +10500,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10614,7 +10575,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10617 "configure"
-+#line 10578 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10712,7 +10673,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 10715 "configure"
-+#line 10676 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11784,8 +11745,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11846,8 +11806,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -12891,11 +12850,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12894: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12853: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:12898: \$? = $ac_status" >&5
-+ echo "$as_me:12857: \$? = $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
-@@ -12951,11 +12910,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12954: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12913: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:12958: \$? = $ac_status" >&5
-+ echo "$as_me:12917: \$? = $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
-@@ -13462,7 +13421,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 13465 "configure"' > conftest.$ac_ext
-+ echo '#line 13424 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -13793,8 +13752,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13897,8 +13855,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -13963,8 +13920,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -14057,8 +14013,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -14123,8 +14078,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -14190,8 +14144,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -14257,8 +14210,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -14333,7 +14285,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 14336 "configure"
-+#line 14288 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -14431,7 +14383,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 14434 "configure"
-+#line 14386 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -15258,11 +15210,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15261: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15213: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15265: \$? = $ac_status" >&5
-+ echo "$as_me:15217: \$? = $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
-@@ -15318,11 +15270,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15321: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15273: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15325: \$? = $ac_status" >&5
-+ echo "$as_me:15277: \$? = $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
-@@ -15699,8 +15651,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -15750,8 +15701,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16632,7 +16582,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 16635 "configure"' > conftest.$ac_ext
-+ echo '#line 16585 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -17373,11 +17323,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17376: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17326: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17380: \$? = $ac_status" >&5
-+ echo "$as_me:17330: \$? = $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
-@@ -17606,11 +17556,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17609: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17559: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17613: \$? = $ac_status" >&5
-+ echo "$as_me:17563: \$? = $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
-@@ -17666,11 +17616,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17669: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17619: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:17673: \$? = $ac_status" >&5
-+ echo "$as_me:17623: \$? = $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
-@@ -18057,8 +18007,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -18118,8 +18067,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19000,7 +18948,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19003 "configure"' > conftest.$ac_ext
-+ echo '#line 18951 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -19331,8 +19279,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19435,8 +19382,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19501,8 +19447,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19595,8 +19540,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19661,8 +19605,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19728,8 +19671,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19795,8 +19737,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19871,7 +19812,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 19874 "configure"
-+#line 19815 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -19969,7 +19910,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 19972 "configure"
-+#line 19913 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -21206,8 +21147,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21236,8 +21176,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21307,8 +21246,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21360,8 +21298,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21432,8 +21369,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21485,8 +21421,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21705,8 +21640,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21864,8 +21798,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22135,8 +22068,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22403,8 +22335,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22557,8 +22488,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22819,8 +22749,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23235,8 +23164,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23493,8 +23421,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23639,8 +23566,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23711,8 +23637,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23856,8 +23781,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23953,8 +23877,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24032,8 +23955,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24097,8 +24019,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24173,8 +24094,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24286,8 +24206,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24453,8 +24372,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24587,8 +24505,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24673,8 +24590,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25915,11 +25831,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -25958,6 +25869,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-diff -ruN hal-0.4.8-old/hald/linux/pci_bus_device.c hal-0.4.8/hald/linux/pci_bus_device.c
---- hal-0.4.8-old/hald/linux/pci_bus_device.c 2005-01-24 22:28:32.000000000 +0100
-+++ hal-0.4.8/hald/linux/pci_bus_device.c 2005-05-23 19:29:15.000000000 +0200
-@@ -283,7 +283,6 @@
-
- fp = fopen (path, "r");
- if (fp == NULL) {
-- HAL_ERROR (("couldn't open PCI database at %s,", path));
- return FALSE;
- }
-
-@@ -369,11 +368,24 @@
- static void
- pci_device_init (BusDeviceHandler *self)
- {
-+ dbus_bool_t ret = FALSE;
-+ int i;
-+ char *locations[] = { "/usr/share/hwdata/pci.ids",
-+ "/usr/share/misc/pci.ids",
-+ "/usr/share/pci.ids",
-+ "/var/lib/misc/pci.ids",
-+ NULL
-+ };
- /* get all drivers under /sys/bus/pci/drivers */
- drivers_collect ("pci");
-
- /* Load /usr/share/hwdata/pci.ids */
-- pci_ids_load (HWDATA_DIR "/pci.ids");
-+ for (i=0 ; locations[i] != NULL && !ret ; i++) {
-+ ret = pci_ids_load (locations[i]);
-+ }
-+ if (!ret) {
-+ HAL_ERROR (("couldn't open PCI database"));
-+ }
- }
-
- /** Shutdown function for PCI handling
-diff -ruN hal-0.4.8-old/hald/linux/usb_bus_device.c hal-0.4.8/hald/linux/usb_bus_device.c
---- hal-0.4.8-old/hald/linux/usb_bus_device.c 2005-01-24 22:28:33.000000000 +0100
-+++ hal-0.4.8/hald/linux/usb_bus_device.c 2005-05-23 19:29:15.000000000 +0200
-@@ -549,15 +549,26 @@
- static void
- usb_device_init ()
- {
-+ dbus_bool_t ret = FALSE;
-+ int i;
-+ char *locations[] = { "/usr/share/hwdata/usb.ids",
-+ "/usr/share/misc/usb.ids",
-+ "/usr/share/usb.ids",
-+ "/var/lib/misc/usb.ids",
-+ NULL
-+ };
-
- /* get all drivers under /sys/bus/usb/drivers */
- drivers_collect ("usb");
-
- /* Load /usr/share/hwdata/usb.ids */
-- usb_ids_load (HWDATA_DIR "/usb.ids");
--
-+ for (i=0; locations[i] != NULL && !ret ; i++) {
-+ ret = usb_ids_load (locations[i]);
-+ }
-+ if (!ret) {
-+ HAL_ERROR (("couldn't open USB database"));
-+ }
- /* Parse /proc/bus/usb/devices */
--
- usb_proc_parse ();
- }
-
Deleted: packages/experimental/hal/debian/patches/no_sysdevice.patch
===================================================================
--- packages/experimental/hal/debian/patches/no_sysdevice.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/no_sysdevice.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,18 +0,0 @@
-diff -ruN hal-0.4.7-old/hald/linux/class_device.c hal-0.4.7/hald/linux/class_device.c
---- hal-0.4.7-old/hald/linux/class_device.c 2004-12-01 04:39:01.000000000 +0100
-+++ hal-0.4.7/hald/linux/class_device.c 2005-02-15 10:10:17.060885680 +0100
-@@ -447,9 +447,12 @@
- sysfs_path = hal_device_property_get_string (d, ".udev.sysfs_path");
- assert (sysfs_path != NULL);
- class_device = sysfs_open_class_device_path (sysfs_path);
-- if (class_device == NULL)
-- DIE (("Coulnd't get sysfs class device object for path %s",
-+ if (class_device == NULL) {
-+ HAL_WARNING (("Coulnd't get sysfs class device object for path %s",
- sysfs_path));
-+ hal_device_store_remove (hald_get_tdl (), d);
-+ return;
-+ }
- self->pre_process (self, d, sysfs_path, class_device);
- sysfs_close_class_device (class_device);
-
Added: packages/experimental/hal/debian/patches/property-null-values.patch
===================================================================
--- packages/experimental/hal/debian/patches/property-null-values.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/property-null-values.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -0,0 +1,21 @@
+diff -ruN hal-0.5.2-old/hald/property.c hal-0.5.2/hald/property.c
+--- hal-0.5.2-old/hald/property.c 2005-02-28 05:53:15.000000000 +0100
++++ hal-0.5.2/hald/property.c 2005-05-24 10:00:17.000000000 +0200
+@@ -81,7 +81,7 @@
+
+ prop->type = HAL_PROPERTY_TYPE_STRING;
+ prop->key = g_strdup (key);
+- prop->str_value = g_strdup (value);
++ prop->str_value = g_strdup (value ? value : "");
+
+ while (!g_utf8_validate (prop->str_value, -1,
+ (const char **) &endchar)) {
+@@ -91,7 +91,7 @@
+
+ if (!validated) {
+ HAL_WARNING (("Key '%s' has invalid UTF-8 string '%s'",
+- key, value));
++ key, prop->str_value));
+ }
+
+ return prop;
Modified: packages/experimental/hal/debian/patches/readme-remove-hacking.patch
===================================================================
--- packages/experimental/hal/debian/patches/readme-remove-hacking.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/readme-remove-hacking.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,9 +1,10 @@
---- hal-0.2.95.orig/README
-+++ hal-0.2.95/README
-@@ -1,8 +1,6 @@
-
+diff -ruN hal-0.5.0-old/README hal-0.5.0/README
+--- hal-0.5.0-old/README 2004-12-14 03:47:58.000000000 +0100
++++ hal-0.5.0/README 2005-04-13 12:32:18.448771192 +0200
+@@ -2,8 +2,6 @@
HAL is a hardware abstraction layer
+
-See also the file HACKING for notes of interest to developers working on HAL.
-
See http://www.freedesktop.org/Software/hal for lots of documentation,
Modified: packages/experimental/hal/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/experimental/hal/debian/patches/storage-policy-debian.patch 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/patches/storage-policy-debian.patch 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,6 +1,6 @@
-diff -ruN hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi 2005-06-10 15:36:22.000000000 +0200
-+++ hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi 2005-06-10 15:47:58.000000000 +0200
+diff -ruN hal-0.5.2-old/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi
+--- hal-0.5.2-old/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-09 16:32:08.000000000 +0200
++++ hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi 2005-06-21 15:24:24.000000000 +0200
@@ -6,11 +6,11 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -17,15 +17,27 @@
<merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
</match>
</device>
-@@ -56,6 +56,7 @@
+@@ -44,6 +44,19 @@
+ </match>
+ </match>
+
++ <!-- Use UTF-8 charset and the quiet option for vfat -->
++ <match key="volume.fstype" string="vfat">
++ <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</m
++ <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
++ </match>
++ <!-- cdrom filesystems should be mounted with the utf8 option -->
++ <match key="volume.fstype" string="iso9660">
++ <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
++ </match>
++ <match key="volume.fstype" string="udf">
++ <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
++ </match>
++
+ <!-- Handle drives with non-partitioned media -->
<match key="storage.no_partitions_hint" bool="true">
<!-- optical drives -->
- <match key="storage.drive_type" string="cdrom">
-+ <merge key="storage.policy.mount_option.utf8" type="bool">true</merge>
- <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
- <merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
- <match key="storage.cdrom.cdr" bool="true">
-@@ -116,6 +117,9 @@
+@@ -96,6 +109,9 @@
<match key="block.is_volume" bool="true">
<match key="volume.fsusage" string="filesystem">
<!-- skip for drives with the no partitions hint (they are handled above) -->
@@ -35,46 +47,23 @@
<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
<merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -164,6 +168,9 @@
-
- <!-- Use noatime and sync options for all hotpluggable or removable
- volumes smaller than 2GB -->
-+
-+ <!-- Mounting with sync wears out flash disk too much, thus disable it by
-+ default
+@@ -131,15 +147,15 @@
+ </match>
+ </match>
+
+- <!-- Use noatime and sync options for all hotpluggable or removable
+- volumes smaller than 2GB -->
++ <!-- Use noatime option for all hotpluggable or removable volumes
++ smaller than 2GB; disable sync since it wears out flash devices -->
<match key="volume.size" compare_lt="2147483648">
<match key="@block.storage_device:storage.hotpluggable" bool="true">
- <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
-@@ -174,12 +181,30 @@
+- <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
++ <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
<merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
</match>
+ <match key="@block.storage_device:storage.removable" bool="true">
+- <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
++ <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
+ <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
+ </match>
</match>
-+ -->
-
-- <!-- Use UTF-8 charset for vfat -->
-+ <!-- Use UTF-8 charset and the quiet option for vfat -->
- <match key="volume.fstype" string="vfat">
- <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</merge>
-+ <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
- </match>
--
-+ <match key="volume.fstype" string="iso9660">
-+ <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
-+ </match>
-+ <match key="volume.fstype" string="udf">
-+ <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
-+ </match>
-+
-+ <match key="volume.size" compare_ge="2147483648">
-+ <match key="@block.storage_device:storage.hotpluggable" bool="true">
-+ <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
-+ <merge key="volume.policy.mount_option.noatime" type="bool">false</merge>
-+ </match>
-+ <match key="@block.storage_device:storage.removable" bool="true">
-+ <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
-+ <merge key="volume.policy.mount_option.noatime" type="bool">false</merge>
-+ </match>
-+ </match>
- <!-- whitelist of partition table id's, if from a msdos partition table -->
- <match key="volume.partition.msdos_part_table_type" exists="true">
- <!-- Default to no mount and punch holes -->
Modified: packages/experimental/hal/debian/rules
===================================================================
--- packages/experimental/hal/debian/rules 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/rules 2005-06-21 13:34:46 UTC (rev 236)
@@ -1,20 +1,20 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR=hal-0.4.8
+DEB_TAR_SRCDIR=hal-0.5.2
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_PYTHON_COMPILE_VERSION = 2.3
+DEB_PYTHON_COMPILE_VERSION = 2.4
DEB_CONFIGURE_EXTRA_FLAGS := --with-hal-user=hal \
--with-hal-group=hal \
--enable-hotplug-map \
--with-pid-file=/var/run/hal/hald.pid \
--enable-pcmcia-support \
- --with-stab-file=/var/run/stab \
- --enable-fstab-sync
+ --enable-fstab-sync \
+ --with-hwdata=/var/lib/misc
binary-predeb/hal-device-manager::
dh_python -phal-device-manager
@@ -29,15 +29,10 @@
install -m 755 -D debian/hal-unmount.dev \
$(DEB_DESTDIR)/etc/dev.d/block/hal-unmount.dev
install -m 755 -D debian/hal.udev.device-removable.sh \
- $(DEB_DESTDIR)/etc/udev/scripts/device-removable.sh
+ $(DEB_DESTDIR)/etc/udev/scripts/device-removable.sh
install -m 644 -D debian/hal.udev.rules \
- $(DEB_DESTDIR)/etc/udev/hal.rules
-
- # /etc/hal/fdi is the preferred configuration location in debian
- rmdir $(DEB_DESTDIR)/usr/share/hal/fdi/95userpolicy
+ $(DEB_DESTDIR)/etc/udev/hal.rules
- # sony_dsc.fdi only causes troubles
- rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/20freedesktop/sony_dsc.fdi
# remove the fstab-sync symlink
rm -f $(DEB_DESTDIR)/etc/hal/device.d/50-fstab-sync.hal
Modified: packages/experimental/hal/debian/shlibs.local
===================================================================
--- packages/experimental/hal/debian/shlibs.local 2005-06-21 09:49:22 UTC (rev 235)
+++ packages/experimental/hal/debian/shlibs.local 2005-06-21 13:34:46 UTC (rev 236)
@@ -1 +1 @@
-libhal 0 libhal0 (>= 0.4.0)
+libhal 1 libhal1 (>= 0.5)
More information about the Pkg-utopia-commits
mailing list