hal: Branch 'master'

[David Zeuthen]

 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(-)

New commits:
diff-tree 312459e63b1e515b35ecf4800e609b38928c138f (from b1ba285086ed84e8861f1047e6bc629b9b964f76)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 20:09:28 2007 -0400

    move creation of /etc/hal/fdi/* to the main hal package

diff --git a/configure.in b/configure.in
index 9bebcc6..f9eb4e9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-AC_INIT(hal-info, 20070326, david at fubar.dk)
+AC_INIT(hal-info, 20070327, david at fubar.dk)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
@@ -25,11 +25,9 @@ fdi/Makefile
 fdi/information/Makefile
 fdi/information/10freedesktop/Makefile
 fdi/information/20thirdparty/Makefile
-fdi/information/30user/Makefile
 fdi/preprobe/Makefile
 fdi/preprobe/10freedesktop/Makefile
 fdi/preprobe/20thirdparty/Makefile
-fdi/preprobe/30user/Makefile
 ])
 
 dnl ==========================================================================
diff --git a/fdi/information/30user/.gitignore b/fdi/information/30user/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/30user/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/30user/Makefile.am b/fdi/information/30user/Makefile.am
deleted file mode 100644
index b33f605..0000000
--- a/fdi/information/30user/Makefile.am
+++ /dev/null
@@ -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 --git a/fdi/information/Makefile.am b/fdi/information/Makefile.am
index 40ff1e5..74273d3 100644
--- a/fdi/information/Makefile.am
+++ b/fdi/information/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty
 
diff --git a/fdi/preprobe/30user/Makefile.am b/fdi/preprobe/30user/Makefile.am
deleted file mode 100644
index da04d3e..0000000
--- a/fdi/preprobe/30user/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/preprobe
-
-dist_fdi_DATA =
-
-
-
diff --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
index 40ff1e5..74273d3 100644
--- a/fdi/preprobe/Makefile.am
+++ b/fdi/preprobe/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty