Hello community,
here is the log from the commit of package hal
checked in at Fri Apr 6 00:20:35 CEST 2007.
--------
--- hal/hal.changes 2007-03-26 22:29:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-04-02 14:32:24.525810000 +0200
@@ -1,0 +2,21 @@
+Mon Apr 2 12:55:22 CEST 2007 - dkukawka@suse.de
+
+- updated to actual HAL/hal-info git
+- removed patches:
+ - parted.patch
+ - hal-fix-hal_device_manager_about_dialog.diff
+ - hal-fix-eject_path.diff
+ - hal-fix-configure-dell.diff
+ - hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
+ - hal-add-cdrom_capabilities.diff
+ - hal-fix-power-privileges.diff
+ - hal-revert-git-multisession.diff
+ - hal-pci.diff
+- updated patch:
+ - hal-add_soundcard_fix_device_file_handling_v2.diff
+- fixed bugs:
+ - b.n.c #258800
+ - b.n.c #255934
+ - b.n.c #256270 (now fixed upstream via configure parameter)
+
+-------------------------------------------------------------------
Old:
----
hal-0.5.8_git20070326.tar.bz2
hal-add-cdrom_capabilities.diff
hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
hal-add_soundcard_fix_device_file_handling.diff
hal-fix-configure-dell.diff
hal-fix-eject_path.diff
hal-fix-hal_device_manager_about_dialog.diff
hal-fix-power-privileges.diff
hal-info-20070326.tar.bz2
hal-pci.diff
hal-revert-git-multisession.diff
parted.patch
New:
----
hal-0.5.8_git200704021230.tar.bz2
hal-add_soundcard_fix_device_file_handling_v2.diff
hal-info-200704021230.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.p12255/_old 2007-04-06 00:18:48.000000000 +0200
+++ /var/tmp/diff_new_pack.p12255/_new 2007-04-06 00:18:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.8_git20070326)
+# spec file for package hal (Version 0.5.8_git200704021230)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,7 +22,7 @@
%define dbus_release 1
License: Other uncritical OpenSource License
Group: System/Daemons
-Version: 0.5.8_git20070326
+Version: 0.5.8_git200704021230
Release: 1
Autoreqprov: on
Summary: Daemon for Collecting Hardware Information
@@ -32,28 +32,19 @@
Patch2: %{name}-allow_uid_for_ntfs.diff
Patch3: %{name}-fix-storage-policy-fixed-drives.diff
# SUSE specific temporary patches
-Patch10: hal-revert-git-multisession.diff
-Patch11: hal-add-standby-support.diff
-Patch12: parted.patch
+Patch10: hal-add-standby-support.diff
#
# submitted (or planed to do in next time) upstream patches
Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff
-Patch101: hal-fix-power-privileges.diff
-Patch102: hal-pci.diff
-Patch103: hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
-Patch104: hal-add-cdrom_capabilities.diff
-Patch105: hal-add_soundcard_fix_device_file_handling.diff
-Patch106: hal-cleanup_acpi-addon_DBusError_handling.diff
-Patch107: hal-fix-hal_device_manager_about_dialog.diff
-Patch108: hal-fix-eject_path.diff
-Patch109: hal-fix-configure-dell.diff
+Patch101: hal-add_soundcard_fix_device_file_handling_v2.diff
+Patch102: hal-cleanup_acpi-addon_DBusError_handling.diff
#
# need to backport
Patch400: hal-performance_pci.ids_v5.diff
#Patch300: hal-temp.diff
# Sources:
Source0: %{name}-%{version}.tar.bz2
-Source1: hal-info-20070326.tar.bz2
+Source1: hal-info-200704021230.tar.bz2
Source2: rc.hal
Source3: 90-hal.rules
Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
@@ -147,19 +138,10 @@
%patch1 -p0
%patch2 -p1
%patch3 -p0
-%patch10 -p1
-%patch11 -p0
-%patch12 -p1
+%patch10 -p0
%patch100 -p1
%patch101 -p1
%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
#%patch300 -p1
popd
#%patch400 -p1
@@ -184,8 +166,11 @@
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
--with-doc-dir=%{_datadir}/doc/packages/hal \
+ --with-eject=/bin/eject \
--enable-acpi-acpid \
--disable-acpi-proc \
+ --enable-acpi-ibm \
+ --enable-acpi-toshiba \
--enable-gtk-doc \
--enable-parted \
--enable-policy-kit \
@@ -262,11 +247,15 @@
%{_bindir}/hal-*-property
%{_bindir}/hal-device
%{_bindir}/hal-find-by-capability
+%{_bindir}/hal*lock*
+%{_bindir}/hal-disable-polling
%{_datadir}/hal/fdi/*
-%{_libexecdir}/hal/*
%{_datadir}/locale/*/LC_MESSAGES/hal.mo
%{_datadir}/doc/packages/hal/*
%{_libdir}/*hal*.so.*
+%{_libexecdir}/hal/*
+%{_mandir}/man1/*
+%{_mandir}/man8/*
%{_sbindir}/hal*
%{_sbindir}/rchal
%attr(-,haldaemon,haldaemon) %{_localstatedir}/run/hal
@@ -289,6 +278,24 @@
%{_bindir}/hal-device-manager
%changelog
+* Mon Apr 02 2007 - dkukawka@suse.de
+- updated to actual HAL/hal-info git
+- removed patches:
+ - parted.patch
+ - hal-fix-hal_device_manager_about_dialog.diff
+ - hal-fix-eject_path.diff
+ - hal-fix-configure-dell.diff
+ - hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
+ - hal-add-cdrom_capabilities.diff
+ - hal-fix-power-privileges.diff
+ - hal-revert-git-multisession.diff
+ - hal-pci.diff
+- updated patch:
+ - hal-add_soundcard_fix_device_file_handling_v2.diff
+- fixed bugs:
+ - b.n.c #258800
+ - b.n.c #255934
+ - b.n.c #256270 (now fixed upstream via configure parameter)
* Mon Mar 26 2007 - dkukawka@suse.de
- updated to actual HAL/hal-info git (== 0.5.9rc2)
- updated libsmbios dependencies
++++++ hal-0.5.8_git20070326.tar.bz2 -> hal-0.5.8_git200704021230.tar.bz2 ++++++
++++ 35014 lines of diff (skipped)
++++++ hal-add_soundcard_fix_device_file_handling_v2.diff ++++++
--- a/hald/linux/device.c 2007-04-02 13:03:29.000000000 +0200
+++ b/hald/linux/device.c 2007-04-02 13:12:01.000000000 +0200
@@ -234,7 +234,7 @@
int eventdev_num;
HalDevice *d = NULL;
- if (device_file == NULL)
+ if (device_file == NULL || device_file[0] == '\0')
goto out;
/* only care about evdev input devices */
@@ -657,7 +657,7 @@
d = NULL;
- if (parent_dev == NULL || parent_path == NULL || device_file == NULL) {
+ if (parent_dev == NULL || parent_path == NULL || device_file == NULL || device_file[0] == '\0') {
goto out;
}
@@ -880,14 +880,30 @@
d = NULL;
- if (device_file == NULL)
- goto out;
+ HAL_INFO (("sound_add: sysfs_path=%s device_file=%s parent_dev=0x%08x parent_path=%s", sysfs_path, device_file, parent_dev, parent_path));
d = hal_device_new ();
hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
device = hal_util_get_last_element(sysfs_path);
- if (parent_dev == NULL || parent_path == NULL) {
+ if (device_file[0] == '\0' && parent_dev == NULL && parent_path == NULL) {
+ goto out;
+ } else if (device_file[0] == '\0' && parent_dev != NULL && parent_path != NULL) {
+ HAL_INFO(("sound_add: handle sound card %s", sysfs_path));
+ /* handle card devices */
+ hal_device_property_set_string (d, "info.category", "sound");
+ hal_device_add_capability (d, "sound");
+ hal_device_property_set_string (d, "sound.originating_device", hal_device_get_udi (parent_dev));
+ hal_device_property_set_string (d, "sound.physical_device", hal_device_get_udi (parent_dev));
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+
+ if (sscanf (device, "card%d", &cardnum) == 1) {
+ hal_device_property_set_int (d, "sound.card", cardnum);
+ asound_card_id_set (cardnum, d, "sound.card_id");
+ snprintf (buf, sizeof (buf), "%s Sound Card", hal_device_property_get_string (d, "sound.card_id"));
+ hal_device_property_set_string (d, "info.product", buf);
+ }
+ } else if (parent_dev == NULL || parent_path == NULL) {
/* handle global ALSA and OSS devices, these devices are for all ALSA/OSS Sound devices
so we append them to /org/freedesktop/Hal/devices/computer */
hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
@@ -1117,7 +1133,13 @@
{
gchar udi[256];
- if (hal_device_has_property(d, "alsa.card")) {
+ if (hal_device_has_property(d, "sound.card")) {
+ /* don't include card number as it may not be persistent across reboots */
+ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
+ "%s_sound_card_%i",
+ hal_device_property_get_string (d, "info.parent"),
+ hal_device_property_get_string (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 */
hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
"%s_alsa_%s_%i",
@@ -1165,7 +1187,7 @@
d = NULL;
- if (parent_dev == NULL || parent_path == NULL || device_file == NULL) {
+ if (parent_dev == NULL || parent_path == NULL || device_file == NULL || device_file[0] == '\0') {
goto out;
}
@@ -2302,7 +2324,7 @@
HalDevice *d = NULL;
gchar buf[64];
- if (device_file == NULL)
+ if (device_file == NULL || device_file[0] == '\0')
goto out;
d = hal_device_new ();
++++++ hal-info-20070326.tar.bz2 -> hal-info-200704021230.tar.bz2 ++++++
++++ 1970 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/ChangeLog new/hal-info-200704021230/ChangeLog
--- old/hal-info-20070326/ChangeLog 2007-03-26 12:54:43.000000000 +0200
+++ new/hal-info-200704021230/ChangeLog 2007-04-02 12:52:10.000000000 +0200
@@ -1,3 +1,87 @@
+commit f3a06388f3c0a0ebbd609fd2700d1a583ac5a216
+Author: David Zeuthen
+Date: Sun Apr 1 15:09:36 2007 -0400
+
+ add contains_not to fdi.dtd
+
+ In the future, hal-info should be using a hal-fdi-file-validate tool
+ provided by HAL.
+
+ fdi/fdi.dtd | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4de10cdf43b28c9361830ab1456a7297dabefc0c
+Author: David Zeuthen
+Date: Sun Apr 1 04:58:37 2007 -0400
+
+ update version to 20070328
+
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fda3ec662beb94a67f7aef7b0a97ef3c650cc657
+Author: Danny Kukawka
+Date: Wed Mar 28 23:49:52 2007 +0200
+
+ fix detection of Motorola RAZR v3 series as USB music player
+
+ Fixed detection of Motorola RAZR v3 series as USB music player. Set
+ portable_audio_player.type only for V3i to ipod, all other devices
+ with the same USB product ID don't have this capability. All other
+ devices get portable_audio_player.type == generic.
+
+ This fix fd.o bug #10161.
+
+ .../10freedesktop/10-usb-music-players.fdi | 19
+ +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
+
+commit 82c808cacfbe4a04194b28e2bcaf0474173b1c93
+Author: Danny Kukawka
+Date: Tue Mar 27 16:53:08 2007 +0200
+
+ added T.sonic 610 (Transcend) USB MP3-Player
+
+ Added adopted patch from David Olivier
+ from
+ fd.o bug 10419 for T.sonic 610 (Transcend) MP3-Player to
+ 10-usb-music-players.fdi
+
+ .../10freedesktop/10-usb-music-players.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit a3d88893a5086926711c98df101a0a6981c2f46a
+Author: David Zeuthen
+Date: Mon Mar 26 20:21:55 2007 -0400
+
+ rename fdi/preprobe/10freedesktop to fdi/preprobe/10osvendor
+
+ configure.in | 2 +-
+ fdi/preprobe/10freedesktop/10-ide-drives.fdi | 93
+ --------------------
+ .../10freedesktop/20-broken-usb-sticks.fdi | 20 ----
+ fdi/preprobe/10freedesktop/Makefile.am | 20 ----
+ fdi/preprobe/10osvendor/10-ide-drives.fdi | 93
+ ++++++++++++++++++++
+ fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi | 20 ++++
+ fdi/preprobe/10osvendor/Makefile.am | 20 ++++
+ fdi/preprobe/Makefile.am | 2 +-
+ 8 files changed, 135 insertions(+), 135 deletions(-)
+
+commit 312459e63b1e515b35ecf4800e609b38928c138f
+Author: David Zeuthen
+Date: Mon Mar 26 20:09:28 2007 -0400
+
+ move creation of /etc/hal/fdi/* to the main hal package
+
+ configure.in | 4 +---
+ fdi/information/30user/.gitignore | 4 ----
+ fdi/information/30user/Makefile.am | 23 -----------------------
+ fdi/information/Makefile.am | 2 +-
+ fdi/preprobe/30user/Makefile.am | 7 -------
+ fdi/preprobe/Makefile.am | 2 +-
+ 6 files changed, 3 insertions(+), 39 deletions(-)
+
commit b1ba285086ed84e8861f1047e6bc629b9b964f76
Author: David Zeuthen
Date: Mon Mar 26 00:50:06 2007 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/configure.in new/hal-info-200704021230/configure.in
--- old/hal-info-20070326/configure.in 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/configure.in 2007-04-02 12:51:28.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070326, david@fubar.dk)
+AC_INIT(hal-info, 200704021230, dkukawka@suse.de)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -25,11 +25,9 @@
fdi/information/Makefile
fdi/information/10freedesktop/Makefile
fdi/information/20thirdparty/Makefile
-fdi/information/30user/Makefile
fdi/preprobe/Makefile
-fdi/preprobe/10freedesktop/Makefile
+fdi/preprobe/10osvendor/Makefile
fdi/preprobe/20thirdparty/Makefile
-fdi/preprobe/30user/Makefile
])
dnl ==========================================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/fdi.dtd new/hal-info-200704021230/fdi/fdi.dtd
--- old/hal-info-20070326/fdi/fdi.dtd 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/fdi.dtd 2007-04-02 12:50:56.000000000 +0200
@@ -20,6 +20,7 @@
is_absolute_path (false|true) #IMPLIED
contains CDATA #IMPLIED
contains_ncase CDATA #IMPLIED
+ contains_not CDATA #IMPLIED
prefix CDATA #IMPLIED
prefix_ncase CDATA #IMPLIED
suffix CDATA #IMPLIED
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-200704021230/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20070326/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-04-02 12:50:56.000000000 +0200
@@ -3,6 +3,17 @@
<deviceinfo version="0.2">
<device>
+ <!-- some specual device handling -->
+ <match key="info.subsystem" string="usb">
+ <!-- copy information to identify the v3i Motorola -->
+ <match key="@info.parent:usb_device.product" contains="Motorola Phone (V3i)">
+ <match key="usb.product" string="USB Mass Storage Interface">
+ <merge key="info.product" type="copy_property">@info.parent:usb_device.product</merge>
+ <prepend key="info.product" type="string">USB Mass Storage Interface at </prepend>
+ </match>
+ </match>
+ </match>
+
<match key="info.category" string="storage">
<!-- Apple iPod - TODO: use USB ids to determine exact output formats -->
<match key="storage.vendor" contains="Apple">
@@ -308,6 +319,13 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
+ <!--Transcend (T.Sonic 610) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x82e0">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
<!-- TrekStor i.Beat jump MP3 Player -->
<match key="@storage.originating_device:usb.product_id" int="0x835d">
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -650,10 +668,14 @@
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
<!-- Motorola iTunes enabled phone -->
<match key="@storage.originating_device:usb.product_id" int="0x4810">
- <merge key="storage.model" type="string">V360</merge>
+ <merge key="storage.model" type="string">V3 series</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <match key="@storage.physical_device:info.product" contains="Motorola Phone (V3i)">
+ <merge key="storage.model" type="string">Motorola Phone (V3i)</merge>
+ <merge key="portable_audio_player.type" type="string">ipod</merge>
+ </match>
<merge key="storage.vendor" type="string">Motorola</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.type" type="string">ipod</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">mobile/audio/</append>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/information/30user/Makefile.am new/hal-info-200704021230/fdi/information/30user/Makefile.am
--- old/hal-info-20070326/fdi/information/30user/Makefile.am 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/information/30user/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/information
-
-dist_fdi_DATA =
-
-check:
- for f in $(dist_fdi_DATA); do \
- echo -n "Validate XML in $$f : "; \
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
- if test -s xmllint.error; \
- then \
- echo failed; \
- cat xmllint.error; \
- rm -f xmllint.error; \
- exit 1; \
- else \
- echo ok; \
- rm -f xmllint.error; \
- fi; \
- done;
-
-clean-local :
- rm -f *~
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/information/Makefile.am new/hal-info-200704021230/fdi/information/Makefile.am
--- old/hal-info-20070326/fdi/information/Makefile.am 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/information/Makefile.am 2007-04-02 12:50:56.000000000 +0200
@@ -1,3 +1,3 @@
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10freedesktop/10-ide-drives.fdi new/hal-info-200704021230/fdi/preprobe/10freedesktop/10-ide-drives.fdi
--- old/hal-info-20070326/fdi/preprobe/10freedesktop/10-ide-drives.fdi 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/preprobe/10freedesktop/10-ide-drives.fdi 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
- <device>
- <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="disk">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="floppy">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- <match key="storage.bus" string="scsi">
- <match key="storage.drive_type" string="disk">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
- </match>
-
-
- </device>
-</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi new/hal-info-200704021230/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
--- old/hal-info-20070326/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
- <device>
-
- <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
- Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
- <match key="storage.bus" string="usb">
- <match key="storage.drive_type" string="cdrom">
- <match key="storage.lun" int="1">
- <match key="storage.vendor" string="SanDisk">
- <match key="storage.model" string="U3 Cruzer Micro">
- <merge key="info.ignore" type="bool">true</merge>
- </match>
- </match>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10freedesktop/Makefile.am new/hal-info-200704021230/fdi/preprobe/10freedesktop/Makefile.am
--- old/hal-info-20070326/fdi/preprobe/10freedesktop/Makefile.am 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/preprobe/10freedesktop/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
-
-dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
-
-check:
- for f in $(dist_fdi_DATA); do \
- echo -n "Validate XML in $$f : "; \
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
- if test -s xmllint.error; \
- then \
- echo failed; \
- cat xmllint.error; \
- rm -f xmllint.error; \
- exit 1; \
- else \
- echo ok; \
- rm -f xmllint.error; \
- fi; \
- done;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10osvendor/10-ide-drives.fdi new/hal-info-200704021230/fdi/preprobe/10osvendor/10-ide-drives.fdi
--- old/hal-info-20070326/fdi/preprobe/10osvendor/10-ide-drives.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-200704021230/fdi/preprobe/10osvendor/10-ide-drives.fdi 2007-04-02 12:50:56.000000000 +0200
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+ <device>
+ <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
+ <match key="storage.bus" string="ide">
+ <match key="storage.drive_type" string="disk">
+ <!-- IOMEGA Zip Drive -->
+ <match key="storage.model" contains_ncase="ZIP">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+ </match>
+ </match>
+
+ <match key="storage.bus" string="ide">
+ <match key="storage.drive_type" string="floppy">
+ <!-- IOMEGA Zip Drive -->
+ <match key="storage.model" contains_ncase="ZIP">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+ </match>
+ </match>
+
+ <match key="storage.bus" string="scsi">
+ <match key="storage.drive_type" string="disk">
+ <!-- IOMEGA Zip Drive -->
+ <match key="storage.model" contains_ncase="ZIP">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+
+
+ </device>
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi new/hal-info-200704021230/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
--- old/hal-info-20070326/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-200704021230/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi 2007-04-02 12:50:56.000000000 +0200
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
+ Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
+ <match key="storage.bus" string="usb">
+ <match key="storage.drive_type" string="cdrom">
+ <match key="storage.lun" int="1">
+ <match key="storage.vendor" string="SanDisk">
+ <match key="storage.model" string="U3 Cruzer Micro">
+ <merge key="info.ignore" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/10osvendor/Makefile.am new/hal-info-200704021230/fdi/preprobe/10osvendor/Makefile.am
--- old/hal-info-20070326/fdi/preprobe/10osvendor/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-200704021230/fdi/preprobe/10osvendor/Makefile.am 2007-04-02 12:50:56.000000000 +0200
@@ -0,0 +1,20 @@
+
+fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
+
+dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
+
+check:
+ for f in $(dist_fdi_DATA); do \
+ echo -n "Validate XML in $$f : "; \
+ xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
+ if test -s xmllint.error; \
+ then \
+ echo failed; \
+ cat xmllint.error; \
+ rm -f xmllint.error; \
+ exit 1; \
+ else \
+ echo ok; \
+ rm -f xmllint.error; \
+ fi; \
+ done;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/30user/Makefile.am new/hal-info-200704021230/fdi/preprobe/30user/Makefile.am
--- old/hal-info-20070326/fdi/preprobe/30user/Makefile.am 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/preprobe/30user/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/preprobe
-
-dist_fdi_DATA =
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070326/fdi/preprobe/Makefile.am new/hal-info-200704021230/fdi/preprobe/Makefile.am
--- old/hal-info-20070326/fdi/preprobe/Makefile.am 2007-03-26 12:53:44.000000000 +0200
+++ new/hal-info-200704021230/fdi/preprobe/Makefile.am 2007-04-02 12:50:56.000000000 +0200
@@ -1,3 +1,3 @@
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10osvendor 20thirdparty
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org