hal: Branch 'master'
Kay Sievers
kay at kemper.freedesktop.org
Mon Aug 14 17:12:46 PDT 2006
doc/conf/match-USB-camera.fdi | 2 +-
doc/conf/match-USB-mp3-player.fdi | 2 +-
doc/conf/match-cardreader.fdi | 2 +-
doc/conf/storage-non-fixed.fdi | 2 +-
doc/conf/storage-policy-examples.fdi | 2 +-
doc/conf/storage-skip-all.fdi | 2 +-
doc/spec/hal-spec-examples.xml | 3 +--
doc/spec/hal-spec-fdi-files.xml | 3 +--
doc/spec/hal-spec-introduction.xml | 3 +--
doc/spec/hal-spec-properties.xml | 3 +--
doc/spec/hal-spec.xml.in | 3 +--
fdi/fdi.dtd | 1 -
fdi/information/10freedesktop/10-camera-ptp.fdi | 2 +-
fdi/information/10freedesktop/10-cd-dvd-burner.fdi | 2 +-
fdi/information/10freedesktop/10-usb-music-players.fdi | 2 +-
fdi/information/10freedesktop/10-usb-pda.fdi | 2 +-
fdi/information/10freedesktop/10-usb-zip-drives.fdi | 2 +-
fdi/information/10freedesktop/10-wireless-mice.fdi | 2 +-
fdi/policy/10osvendor/10-keyboard-policy.fdi | 2 +-
fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi | 2 +-
fdi/policy/10osvendor/10-power-mgmt-policy.fdi | 2 +-
fdi/policy/10osvendor/10-toshiba-buttons.fdi | 2 +-
fdi/policy/10osvendor/15-storage-luks.fdi | 2 +-
fdi/policy/10osvendor/20-storage-methods.fdi | 2 +-
fdi/preprobe/10osvendor/10-ide-drives.fdi | 2 +-
tools/gen-libgphoto-hal-fdi | 2 +-
26 files changed, 25 insertions(+), 31 deletions(-)
New commits:
diff-tree aa84d37830b9fdf140db88d88edab548f6159f33 (from 7e2746db50ffdebc75958d6e2b87e88d983a92b4)
Author: Kay Sievers <kay.sievers at suse.de>
Date: Tue Aug 15 02:11:38 2006 +0200
ISO-8859-1 -> UTF-8
diff --git a/doc/conf/match-USB-camera.fdi b/doc/conf/match-USB-camera.fdi
index dac0cce..a3f6508 100644
--- a/doc/conf/match-USB-camera.fdi
+++ b/doc/conf/match-USB-camera.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Example: This device information file matches a Sony digital still
camera by matching on the USB vendor and product identifers. -->
diff --git a/doc/conf/match-USB-mp3-player.fdi b/doc/conf/match-USB-mp3-player.fdi
index 88afef9..5797d73 100644
--- a/doc/conf/match-USB-mp3-player.fdi
+++ b/doc/conf/match-USB-mp3-player.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Example: This device information file matches an USB Mass Storage based MP3 player
by the matching on the USB vendor and product identifiers. -->
diff --git a/doc/conf/match-cardreader.fdi b/doc/conf/match-cardreader.fdi
index 6b88ebf..9ae7b2e 100644
--- a/doc/conf/match-cardreader.fdi
+++ b/doc/conf/match-cardreader.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Example: This device information file matches a memory card reader with
multiple storage ports that can be active at the same time. -->
diff --git a/doc/conf/storage-non-fixed.fdi b/doc/conf/storage-non-fixed.fdi
index 2e7bc89..5c312f7 100644
--- a/doc/conf/storage-non-fixed.fdi
+++ b/doc/conf/storage-non-fixed.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!-- This .fdi files makes sure no fixed storage device gets tagged as
mountable except if it's a floppy or optical drive -->
diff --git a/doc/conf/storage-policy-examples.fdi b/doc/conf/storage-policy-examples.fdi
index 1f220e6..cbf482c 100644
--- a/doc/conf/storage-policy-examples.fdi
+++ b/doc/conf/storage-policy-examples.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/doc/conf/storage-skip-all.fdi b/doc/conf/storage-skip-all.fdi
index 5037f5b..f8b3300 100644
--- a/doc/conf/storage-skip-all.fdi
+++ b/doc/conf/storage-skip-all.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!-- This .fdi files will tag all storage devices as non mountable -->
<deviceinfo version="0.2">
diff --git a/doc/spec/hal-spec-examples.xml b/doc/spec/hal-spec-examples.xml
index 7f0e58d..4849fba 100644
--- a/doc/spec/hal-spec-examples.xml
+++ b/doc/spec/hal-spec-examples.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<chapter id="examples">
diff --git a/doc/spec/hal-spec-fdi-files.xml b/doc/spec/hal-spec-fdi-files.xml
index f0fc23d..ba4f1af 100644
--- a/doc/spec/hal-spec-fdi-files.xml
+++ b/doc/spec/hal-spec-fdi-files.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<chapter id="spec-device-info">
diff --git a/doc/spec/hal-spec-introduction.xml b/doc/spec/hal-spec-introduction.xml
index cce0258..c8f514c 100644
--- a/doc/spec/hal-spec-introduction.xml
+++ b/doc/spec/hal-spec-introduction.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<chapter id="introduction">
diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 89d3efd..264d736 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<chapter id="device-properties">
diff --git a/doc/spec/hal-spec.xml.in b/doc/spec/hal-spec.xml.in
index 3dcf602..822cc95 100644
--- a/doc/spec/hal-spec.xml.in
+++ b/doc/spec/hal-spec.xml.in
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<book id="index">
diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index bb3e3e1..360d917 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -1,5 +1,4 @@
<!-- Document Type for FreeDesktop.org Device Information Files -->
-<!-- CVSID: $Id$ -->
<!-- <deviceinfo> is the top-level element of an fdi file. -->
<!ELEMENT deviceinfo (device*) >
diff --git a/fdi/information/10freedesktop/10-camera-ptp.fdi b/fdi/information/10freedesktop/10-camera-ptp.fdi
index 81e2756..9879725 100644
--- a/fdi/information/10freedesktop/10-camera-ptp.fdi
+++ b/fdi/information/10freedesktop/10-camera-ptp.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
diff --git a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
index 4b09741..0cb920f 100644
--- a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+++ b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 633a7c0..129c352 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 677ec18..1133f5e 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/information/10freedesktop/10-usb-zip-drives.fdi b/fdi/information/10freedesktop/10-usb-zip-drives.fdi
index c532b3f..bf2f64c 100644
--- a/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+++ b/fdi/information/10freedesktop/10-usb-zip-drives.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
diff --git a/fdi/information/10freedesktop/10-wireless-mice.fdi b/fdi/information/10freedesktop/10-wireless-mice.fdi
index 6fff173..4a7f3ed 100644
--- a/fdi/information/10freedesktop/10-wireless-mice.fdi
+++ b/fdi/information/10freedesktop/10-wireless-mice.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
<match key="info.bus" string="usb_device">
diff --git a/fdi/policy/10osvendor/10-keyboard-policy.fdi b/fdi/policy/10osvendor/10-keyboard-policy.fdi
index fd5a2ec..4bae7c6 100644
--- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index 5030bae..f59fbdd 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
index 3c292fd..2c2705a 100644
--- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/policy/10osvendor/10-toshiba-buttons.fdi b/fdi/policy/10osvendor/10-toshiba-buttons.fdi
index 9ea6035..b2e83d7 100644
--- a/fdi/policy/10osvendor/10-toshiba-buttons.fdi
+++ b/fdi/policy/10osvendor/10-toshiba-buttons.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/fdi/policy/10osvendor/15-storage-luks.fdi b/fdi/policy/10osvendor/15-storage-luks.fdi
index b6e91d6..2746446 100644
--- a/fdi/policy/10osvendor/15-storage-luks.fdi
+++ b/fdi/policy/10osvendor/15-storage-luks.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 0983ece..f67c7b0 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
index 7cb74ee..61fa1ff 100644
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
diff --git a/tools/gen-libgphoto-hal-fdi b/tools/gen-libgphoto-hal-fdi
index f932f56..d26ff88 100755
--- a/tools/gen-libgphoto-hal-fdi
+++ b/tools/gen-libgphoto-hal-fdi
@@ -7,7 +7,7 @@
# tweaked by David Zeuthen <david at fubar.dk>.
cat <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
<!--
To get back the original script which generated this file, use:
cat libgphoto2.fdi | uudecode | gunzip >gen-libgphoto-hal-fdi
More information about the hal-commit
mailing list