hal: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Wed Feb 28 18:57:51 PST 2007
NEWS | 2
configure.in | 2
fdi/preprobe/10freedesktop/Makefile.am | 2
fdi/preprobe/10osvendor/.gitignore | 4 -
fdi/preprobe/10osvendor/10-ide-drives.fdi | 93 ------------------------------
fdi/preprobe/Makefile.am | 2
6 files changed, 4 insertions(+), 101 deletions(-)
New commits:
diff-tree 565868fe6c360abea4f9b8f855f8c86bc02ff44c (from dae1cb8c47cdf915177a7a4206739dd5105bf0e1)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed Feb 28 21:57:47 2007 -0500
move preprobe fdi files to hal-info
diff --git a/NEWS b/NEWS
index 51b3d1e..6fd2204 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Requirements for HAL 0.5.9 ""
- dbus >= 0.60 (with glib bindings)
- glib >= 2.6.0
- expat >= 1.95.8
- - hal-info >= git version as of 20070221
+ - hal-info >= git version as of 20070228
- libusb >= 0 0.1.10a (optional)
- pciutils >= 2.2.3 (optional
- dmidecode >= 2.7 (optional)
diff --git a/configure.in b/configure.in
index 72859db..e6b00bb 100644
--- a/configure.in
+++ b/configure.in
@@ -810,7 +810,7 @@ partutil/Makefile
privileges/Makefile
fdi/Makefile
fdi/preprobe/Makefile
-fdi/preprobe/10osvendor/Makefile
+fdi/preprobe/10freedesktop/Makefile
fdi/preprobe/20thirdparty/Makefile
fdi/preprobe/30user/Makefile
fdi/policy/Makefile
diff --git a/fdi/preprobe/10freedesktop/Makefile.am b/fdi/preprobe/10freedesktop/Makefile.am
new file mode 100644
index 0000000..09e9d5e
--- /dev/null
+++ b/fdi/preprobe/10freedesktop/Makefile.am
@@ -0,0 +1,20 @@
+
+fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
+
+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;
diff --git a/fdi/preprobe/10osvendor/.gitignore b/fdi/preprobe/10osvendor/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/preprobe/10osvendor/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
deleted file mode 100644
index 0749499..0000000
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ /dev/null
@@ -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 --git a/fdi/preprobe/10osvendor/Makefile.am b/fdi/preprobe/10osvendor/Makefile.am
deleted file mode 100644
index 388884c..0000000
--- a/fdi/preprobe/10osvendor/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
-
-dist_fdi_DATA = 10-ide-drives.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 --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
index 92ae627..40ff1e5 100644
--- a/fdi/preprobe/Makefile.am
+++ b/fdi/preprobe/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = 10osvendor 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty 30user
More information about the hal-commit
mailing list