]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Sat, 9 Mar 2013 12:10:57 +0000 (13:10 +0100)
committerFrank Brehm <frank@brehm-online.com>
Sat, 9 Mar 2013 12:10:57 +0000 (13:10 +0100)
37 files changed:
conf.d/postgresql-9.2
config-archive/etc/aiccu.conf [new file with mode: 0644]
config-archive/etc/aiccu.conf.dist.new [new file with mode: 0644]
cups/printers.conf
cups/subscriptions.conf
eselect/postgresql/slots/9.2/base
eselect/postgresql/slots/9.2/docs
eselect/postgresql/slots/9.2/server
gconf/gconf.xml.defaults/%gconf-tree.xml
gconf/schemas/gstreamer-0.10.schemas [new file with mode: 0644]
hotplug/usb/libsane.usermap
init.d/aiccu
init.d/postgresql-9.2
init.d/udev
mercurial/hgrc.d/cacerts.rc [new file with mode: 0644]
pam.d/postgresql [deleted file]
pam.d/postgresql-9.2 [new file with mode: 0644]
portage/package.keywords
security/namespace.conf
security/namespace.init
security/pam_env.conf
security/time.conf
speech-dispatcher/clients/emacs.conf [new file with mode: 0644]
speech-dispatcher/clients/gnome-speech.conf [new file with mode: 0644]
speech-dispatcher/modules/cicero.conf [new file with mode: 0644]
speech-dispatcher/modules/dtk-generic.conf [new file with mode: 0644]
speech-dispatcher/modules/epos-generic.conf [new file with mode: 0644]
speech-dispatcher/modules/espeak-generic.conf [new file with mode: 0644]
speech-dispatcher/modules/espeak-mbrola-generic.conf [new file with mode: 0644]
speech-dispatcher/modules/espeak.conf [new file with mode: 0644]
speech-dispatcher/modules/festival.conf [new file with mode: 0644]
speech-dispatcher/modules/flite.conf [new file with mode: 0644]
speech-dispatcher/modules/ibmtts.conf [new file with mode: 0644]
speech-dispatcher/modules/ivona.conf [new file with mode: 0644]
speech-dispatcher/modules/llia_phon-generic.conf [new file with mode: 0644]
speech-dispatcher/modules/swift-generic.conf [new file with mode: 0644]
speech-dispatcher/speechd.conf [new file with mode: 0644]

index 2902e212b0c601bee752fb2d597968ce2f1128da..ba14421f30f705bd198efb7ebdd3b284861dee70 100644 (file)
@@ -55,4 +55,4 @@ DATA_DIR="/var/lib/postgresql/9.2/data"
 
 # Additional options to pass to initdb.
 # See `man initdb' for available options.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
+PG_INITDB_OPTS="--encoding=UTF8"
diff --git a/config-archive/etc/aiccu.conf b/config-archive/etc/aiccu.conf
new file mode 100644 (file)
index 0000000..4bed53b
--- /dev/null
@@ -0,0 +1,83 @@
+# AICCU Configuration
+
+# Login information (defaults: none)
+#username <your nichandle/username>
+#password <your password>
+username FBT6-SIXXS
+password EMsiWgsus
+
+# Protocol and server to use for setting up the tunnel (defaults: none)
+#protocol <tic|tsp|l2tp>
+protocol tic
+#server <server to use>
+server tic.sixxs.net
+
+# Interface names to use (default: aiccu)
+# ipv6_interface is the name of the interface that will be used as a tunnel interface.
+# On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels
+# or tunX (eg tun0) for AYIYA tunnels.
+ipv6_interface sixxs
+
+# The tunnel_id to use (default: none)
+# (only required when there are multiple tunnels in the list)
+#tunnel_id Txxxx
+tunnel_id T50297
+
+# Be verbose? (default: false)
+verbose false
+
+# Daemonize? (default: true)
+# Set to false if you want to see any output
+# When true output goes to syslog
+#
+# WARNING: never run AICCU from DaemonTools or a similar automated
+# 'restart' tool/script. When AICCU does not start, it has a reason
+# not to start which it gives on either the stdout or in the (sys)log
+# file. The TIC server *will* automatically disable accounts which
+# are detected to run in this mode.
+#
+daemonize true
+
+# Automatic Login and Tunnel activation?
+automatic true
+
+# Require TLS?
+# When set to true, if TLS is not supported on the server
+# the TIC transaction will fail.
+# When set to false, it will try a starttls, when that is
+# not supported it will continue.
+# In any case if AICCU is build with TLS support it will
+# try to do a 'starttls' to the TIC server to see if that
+# is supported.
+requiretls false
+
+# PID File
+#pidfile /var/run/aiccu.pid
+
+# Add a default route (default: true)
+#defaultroute true
+
+# Script to run after setting up the interfaces (default: none)
+#setupscript /usr/local/etc/aiccu-subnets.sh
+
+# Make heartbeats (default true)
+# In general you don't want to turn this off
+# Of course only applies to AYIYA and heartbeat tunnels not to static ones
+#makebeats true
+
+# Don't configure anything (default: false)
+#noconfigure true
+
+# Behind NAT (default: false)
+# Notify the user that a NAT-kind network is detected
+#behindnat true
+
+# Local IPv4 Override (default: none)
+# Overrides the IPv4 parameter received from TIC
+# This allows one to configure a NAT into "DMZ" mode and then
+# forwarding the proto-41 packets to an internal host.
+# 
+# This is only needed for static proto-41 tunnels!
+# AYIYA and heartbeat tunnels don't require this.
+#local_ipv4_override
+
diff --git a/config-archive/etc/aiccu.conf.dist.new b/config-archive/etc/aiccu.conf.dist.new
new file mode 100644 (file)
index 0000000..71e8c6c
--- /dev/null
@@ -0,0 +1,78 @@
+# AICCU Configuration
+
+# Login information (defaults: none)
+#username <your nichandle/username>
+#password <your password>
+
+# Protocol and server to use for setting up the tunnel (defaults: none)
+#protocol <tic|tsp|l2tp>
+#server <server to use>
+
+# Interface names to use (default: aiccu)
+# ipv6_interface is the name of the interface that will be used as a tunnel interface.
+# On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels
+# or tunX (eg tun0) for AYIYA tunnels.
+ipv6_interface sixxs
+
+# The tunnel_id to use (default: none)
+# (only required when there are multiple tunnels in the list)
+#tunnel_id Txxxx
+
+# Be verbose? (default: false)
+verbose false
+
+# Daemonize? (default: true)
+# Set to false if you want to see any output
+# When true output goes to syslog
+#
+# WARNING: never run AICCU from DaemonTools or a similar automated
+# 'restart' tool/script. When AICCU does not start, it has a reason
+# not to start which it gives on either the stdout or in the (sys)log
+# file. The TIC server *will* automatically disable accounts which
+# are detected to run in this mode.
+#
+daemonize true
+
+# Automatic Login and Tunnel activation?
+automatic true
+
+# Require TLS?
+# When set to true, if TLS is not supported on the server
+# the TIC transaction will fail.
+# When set to false, it will try a starttls, when that is
+# not supported it will continue.
+# In any case if AICCU is build with TLS support it will
+# try to do a 'starttls' to the TIC server to see if that
+# is supported.
+requiretls false
+
+# PID File
+#pidfile /var/run/aiccu.pid
+
+# Add a default route (default: true)
+#defaultroute true
+
+# Script to run after setting up the interfaces (default: none)
+#setupscript /usr/local/etc/aiccu-subnets.sh
+
+# Make heartbeats (default true)
+# In general you don't want to turn this off
+# Of course only applies to AYIYA and heartbeat tunnels not to static ones
+#makebeats true
+
+# Don't configure anything (default: false)
+#noconfigure true
+
+# Behind NAT (default: false)
+# Notify the user that a NAT-kind network is detected
+#behindnat true
+
+# Local IPv4 Override (default: none)
+# Overrides the IPv4 parameter received from TIC
+# This allows one to configure a NAT into "DMZ" mode and then
+# forwarding the proto-41 packets to an internal host.
+# 
+# This is only needed for static proto-41 tunnels!
+# AYIYA and heartbeat tunnels don't require this.
+#local_ipv4_override
+
index bebc587771ec9559808441855793c582dcff9797..bfd9e7722ee4c1ae00b33d87145f207c713f6097 100644 (file)
@@ -1,10 +1,9 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-02-16 13:37
+# Written by cupsd on 2013-03-08 07:31
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Kyocera_FS-1020D>
 UUID urn:uuid:4fe502f0-362b-3fa2-519f-648848519e5e
-Info 
-Location 
+Info Kyocera_FS-1020D
 MakeModel Kyocera Mita FS-1020D
 DeviceURI lpd://10.12.11.32/lp
 State Idle
index 426f8fe4be5bc4cbda0a113bde246f44514bb9d7..0d2ad8afc2a62b16719aba1762aed3e3f46a104e 100644 (file)
@@ -1,3 +1,11 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-02-20 20:47
-NextSubscriptionId 141
+# Written by cupsd on 2013-03-09 12:53
+NextSubscriptionId 142
+<Subscription 141>
+Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
+Owner frank
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1362916077
+NextEventId 11
+</Subscription>
index 3adf4669bbf7d2b706e43d96eab95cb6682bbb2a..b5f9c3007df48010f73de2d87736fe2c04ce96e7 100644 (file)
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.2.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.2.3-r1"
index 087d50a8b28c3f3f9ad5fd0f4ccb40fdca717fc2..f9796e6acb5abe6d96084164293b5bf046a686bd 100644 (file)
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.2.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.2.3"
index bb3016341f51fe67c3fd0c276caa50abde071759..58b54795e17a64fec861f3386775bd289fdcb06a 100644 (file)
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.3-r1"
index 8b1638cb9ce91006c9c91a711718a5634b513f33..f3b9333cc35ad55f9ff1286cdcb1811a02a36529 100644 (file)
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1335179349" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
                                <dir name="image@x-sony-arw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
                                </dir>
                                <dir name="image@x-sony-sr2">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
                                </dir>
                                <dir name="image@x-sony-srf">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
                                </dir>
                                <dir name="image@x-sigma-x3f">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
                                </dir>
                                <dir name="image@x-pentax-pef">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-raw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
                                </dir>
                                <dir name="image@x-olympus-orf">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nef">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
                                </dir>
                                <dir name="image@x-minolta-mrw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
                                </dir>
                                <dir name="image@x-kodak-kdc">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
                                </dir>
                                <dir name="image@x-kodak-k25">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
                                </dir>
                                <dir name="image@x-kodak-dcr">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
                                </dir>
                                <dir name="image@x-fuji-raf">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
                                </dir>
                                <dir name="image@x-canon-cr2">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
                                </dir>
                                <dir name="image@x-canon-crw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
                                </dir>
                                <dir name="image@x-adobe-dng">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
                                </dir>
                                <dir name="image@x-dcraw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
                                </dir>
                                <dir name="application@x-ufraw">
-                                       <entry name="command" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
-                                       <entry name="enable" mtime="1334141126" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
+                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
+                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
                                </dir>
                                <dir name="application@x-cbt">
                                        <entry name="command" mtime="1342526498" schema="/schemas/desktop/gnome/thumbnailers/application@x-cbt/command"/>
@@ -17816,254 +17816,290 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="image@x-sony-arw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-sr2">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-srf">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sigma-x3f">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-pentax-pef">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-raw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-olympus-orf">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nef">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-minolta-mrw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-kdc">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-k25">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-dcr">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-fuji-raf">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-cr2">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-crw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-adobe-dng">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-dcraw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="application@x-ufraw">
-                                               <entry name="command" mtime="1334141126" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1334141126" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19948,13 +19984,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -19962,7 +19996,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19970,13 +20003,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -19984,7 +20015,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19992,13 +20022,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20006,7 +20034,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20014,13 +20041,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20028,7 +20053,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20036,13 +20060,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20050,7 +20072,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20058,13 +20079,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20072,7 +20091,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20080,13 +20098,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20094,7 +20110,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20102,13 +20117,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20116,7 +20129,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20124,13 +20136,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1359455568" type="schema" stype="bool" owner="totem">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1359455568" type="schema" stype="string" owner="totem">
@@ -20138,7 +20148,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>totem &quot;%s&quot;</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20607,6 +20616,96 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                <dir name="system">
                        <dir name="gstreamer">
                                <dir name="0.10">
+                                       <dir name="default">
+                                               <entry name="visualization" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="default GStreamer visualization plugin">
+                                                               <default type="string">
+                                                                       <stringvalue>goom</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can put visualization plugins in a pipeline to transform audio stream in video frames. Default is goom but more visualization plugins will be ported soon. The visualization plugin can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="videosrc" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="default GStreamer video source">
+                                                               <default type="string">
+                                                                       <stringvalue>v4l2src</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can record video from any number of input elements.  Some possible choices are v4lsrc and videotestsrc. The video source can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="audiosrc_description" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="description for default GStreamer audiosrc">
+                                                               <default type="string">
+                                                                       <stringvalue>Default</stringvalue>
+                                                               </default>
+                                                               <longdesc>Describes the selected input element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="audiosrc" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="default GStreamer audio source">
+                                                               <default type="string">
+                                                                       <stringvalue>alsasrc</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can record audio using any number of input elements.  Some possible choices are osssrc, esdsrc and alsasrc.  The audio source can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="videosink" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="default GStreamer videosink">
+                                                               <default type="string">
+                                                                       <stringvalue>autovideosink</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can play video using any number of output elements.  Some possible choices are xvimagesink, ximagesink, sdlvideosink and aasink.  The videosink can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="chataudiosink_description" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="description for GStreamer audiosink for Audio/Video Conferencing">
+                                                               <default type="string">
+                                                                       <stringvalue>Default</stringvalue>
+                                                               </default>
+                                                               <longdesc>Describes the selected output element for Audio/Video Conferencing.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="chataudiosink" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="GStreamer audiosink for Audio/Video Conferencing">
+                                                               <default type="string">
+                                                                       <stringvalue>autoaudiosink</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="musicaudiosink_description" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="description for GStreamer audiosink for Music and Movies">
+                                                               <default type="string">
+                                                                       <stringvalue>Default</stringvalue>
+                                                               </default>
+                                                               <longdesc>Describes the selected output element for Music and Movies.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="musicaudiosink" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="GStreamer audiosink for Music and Movies">
+                                                               <default type="string">
+                                                                       <stringvalue>autoaudiosink</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="audiosink_description" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="description for default GStreamer audiosink">
+                                                               <default type="string">
+                                                                       <stringvalue>Default</stringvalue>
+                                                               </default>
+                                                               <longdesc>Describes the selected output element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="audiosink" mtime="1361612709" type="schema" stype="string" owner="gstreamer">
+                                                       <local_schema locale="C" short_desc="default GStreamer audiosink">
+                                                               <default type="string">
+                                                                       <stringvalue>autoaudiosink</stringvalue>
+                                                               </default>
+                                                               <longdesc>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="audio">
                                                <dir name="profiles">
                                                        <entry name="active" mtime="1326795820" type="schema" stype="bool" owner="gnome-media">
@@ -21467,6 +21566,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        <dir name="system">
                <dir name="gstreamer">
                        <dir name="0.10">
+                               <dir name="default">
+                                       <entry name="visualization" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/visualization"/>
+                                       <entry name="videosrc" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/videosrc"/>
+                                       <entry name="audiosrc_description" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/audiosrc_description"/>
+                                       <entry name="audiosrc" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/audiosrc"/>
+                                       <entry name="videosink" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/videosink"/>
+                                       <entry name="chataudiosink_description" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/chataudiosink_description"/>
+                                       <entry name="chataudiosink" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/chataudiosink"/>
+                                       <entry name="musicaudiosink_description" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/musicaudiosink_description"/>
+                                       <entry name="musicaudiosink" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/musicaudiosink"/>
+                                       <entry name="audiosink_description" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/audiosink_description"/>
+                                       <entry name="audiosink" mtime="1361612709" schema="/schemas/system/gstreamer/0.10/default/audiosink"/>
+                               </dir>
                                <dir name="audio">
                                        <dir name="profiles">
                                                <dir name="aac">
diff --git a/gconf/schemas/gstreamer-0.10.schemas b/gconf/schemas/gstreamer-0.10.schemas
new file mode 100644 (file)
index 0000000..d889571
--- /dev/null
@@ -0,0 +1,191 @@
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosink</key>
+      <applyto>/system/gstreamer/0.10/default/audiosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autoaudiosink</default>
+      <locale name="C">
+        <short>default GStreamer audiosink</short>
+        <long>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/audiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for default GStreamer audiosink</short>
+        <long>Describes the selected output element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/musicaudiosink</key>
+      <applyto>/system/gstreamer/0.10/default/musicaudiosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autoaudiosink</default>
+      <locale name="C">
+        <short>GStreamer audiosink for Music and Movies</short>
+        <long>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/musicaudiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/musicaudiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for GStreamer audiosink for Music and Movies</short>
+        <long>Describes the selected output element for Music and Movies.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/chataudiosink</key>
+      <applyto>/system/gstreamer/0.10/default/chataudiosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autoaudiosink</default>
+      <locale name="C">
+        <short>GStreamer audiosink for Audio/Video Conferencing</short>
+        <long>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/chataudiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/chataudiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for GStreamer audiosink for Audio/Video Conferencing</short>
+        <long>Describes the selected output element for Audio/Video Conferencing.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/audiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for default GStreamer audiosink</short>
+        <long>Describes the selected output element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/musicaudiosink</key>
+      <applyto>/system/gstreamer/0.10/default/musicaudiosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autoaudiosink</default>
+      <locale name="C">
+        <short>GStreamer audiosink for Music and Movies</short>
+        <long>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/musicaudiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/musicaudiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for GStreamer audiosink for Music and Movies</short>
+        <long>Describes the selected output element for Music and Movies.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/chataudiosink</key>
+      <applyto>/system/gstreamer/0.10/default/chataudiosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autoaudiosink</default>
+      <locale name="C">
+        <short>GStreamer audiosink for Audio/Video Conferencing</short>
+        <long>GStreamer can play audio using any number of output elements.  Some possible choices are osssink, esdsink and alsasink.  The audiosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/chataudiosink_description</key>
+      <applyto>/system/gstreamer/0.10/default/chataudiosink_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for GStreamer audiosink for Audio/Video Conferencing</short>
+        <long>Describes the selected output element for Audio/Video Conferencing.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/videosink</key>
+      <applyto>/system/gstreamer/0.10/default/videosink</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>autovideosink</default>
+      <locale name="C">
+        <short>default GStreamer videosink</short>
+        <long>GStreamer can play video using any number of output elements.  Some possible choices are xvimagesink, ximagesink, sdlvideosink and aasink.  The videosink can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosrc</key>
+      <applyto>/system/gstreamer/0.10/default/audiosrc</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>alsasrc</default>
+      <locale name="C">
+        <short>default GStreamer audio source</short>
+        <long>GStreamer can record audio using any number of input elements.  Some possible choices are osssrc, esdsrc and alsasrc.  The audio source can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosrc_description</key>
+      <applyto>/system/gstreamer/0.10/default/audiosrc_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for default GStreamer audiosrc</short>
+        <long>Describes the selected input element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/audiosrc_description</key>
+      <applyto>/system/gstreamer/0.10/default/audiosrc_description</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>Default</default>
+      <locale name="C">
+        <short>description for default GStreamer audiosrc</short>
+        <long>Describes the selected input element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/videosrc</key>
+      <applyto>/system/gstreamer/0.10/default/videosrc</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>v4l2src</default>
+      <locale name="C">
+        <short>default GStreamer video source</short>
+        <long>GStreamer can record video from any number of input elements.  Some possible choices are v4lsrc and videotestsrc. The video source can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/default/visualization</key>
+      <applyto>/system/gstreamer/0.10/default/visualization</applyto>
+      <owner>gstreamer</owner>
+      <type>string</type>
+      <default>goom</default>
+      <locale name="C">
+        <short>default GStreamer visualization plugin</short>
+        <long>GStreamer can put visualization plugins in a pipeline to transform audio stream in video frames. Default is goom but more visualization plugins will be ported soon. The visualization plugin can be a partial pipeline instead of just one element.</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
index cd0e0578b191747d80defbebaea3b8075158e42a..8c7736bd04caf50280427ffcb4110e4f49ceed42 100644 (file)
@@ -1,5 +1,5 @@
 # This file was automatically created based on description files (*.desc)
-# by sane-desc 3.5 from sane-backends 1.0.23 on Tue Jan 29 10:16:56 2013
+# by sane-desc 3.5 from sane-backends 1.0.23 on Sat Feb 23 11:05:21 2013
 #
 # The entries below are used to detect a USB device and change owner
 # and permissions on the "device node" used by libusb.
index cdaf2ed7d9d94f34fff33e7db75e604ba90b5a4d..9e0aa2d5db979f6fd51bd863a9eafc805bcdcc04 100755 (executable)
@@ -2,7 +2,7 @@
 
 depend() {
        need net
-       after ntp-client
+       after ntp-client ntpd
 }
 
 checkconfig() {
index f8d3eb67432a22c22e10c8a33368b7b2d95e172d..1785c735163698bae54b3171b64eaece0f0ac980 100755 (executable)
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,8 @@ extra_started_commands="reload"
 get_config() {
     [ -f ${PGDATA%/}/postgresql.conf ] || return 1
 
-    eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
+    eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf \
+        | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
 }
 
 depend() {
@@ -16,7 +17,7 @@ depend() {
     provide postgresql
 
     if [ "$(get_config log_destination)" = "syslog" ]; then
-        need logger
+        use logger
     fi
 }
 
index 6b690447968f2d62249bfc1e61aed72386011c67..af0a40eeca7cae500ccbb10a0b0cba8d78fa2688 100755 (executable)
@@ -12,7 +12,6 @@ udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
-kv_min="${kv_min:-2.6.34}"
 
 depend()
 {
@@ -26,53 +25,21 @@ depend()
        keyword -vserver -lxc
 }
 
-KV_to_int()
-{
-       [ -z $1 ] && return 1
-
-       local x=${1%%[!0-9.]*} y= z=
-       local KV_MAJOR=${x%%.*}
-       y=${x#*.}
-       [ "$x" = "$y" ] && y=0.0
-       local KV_MINOR=${y%%.*}
-       z=${y#*.}
-       [ "$y" = "$z" ] && z=0
-       local KV_MICRO=${z%%.*}
-       local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
-
-       # We make version 2.2.0 the minimum version we will handle as
-       # a sanity check ... if its less, we fail ...
-       [ "${KV_int}" -lt 131584 ] && return 1
-       
-       echo "${KV_int}"
-}
-
-_RC_GET_KV_CACHE=""
-get_KV()
-{
-       if [ -z "${_RC_GET_KV_CACHE}" ] ; then
-               _RC_GET_KV_CACHE="$(uname -r)"
-       fi
-       echo "$(KV_to_int "${_RC_GET_KV_CACHE}")"
-       return $?
-}
-
-# FIXME
-# Instead of this script testing kernel version, udev itself should
-# Maybe something like udevd --test || exit $?
-check_kernel()
+disable_oldnet_hotplug()
 {
-       if [ $(get_KV) -lt $(KV_to_int ${kv_min}) ]; then
-               eerror "Your kernel is too old to work with this version of udev."
-               eerror "Current udev only supports Linux kernel ${kv_min} and newer."
-               return 1
+       if is_service_enabled network; then
+               # disable network hotplugging
+               local d="/run/udev/rules.d"
+               mkdir -p "${d}"
+               local f="${d}/90-network.rules"
+               echo "# This file disables network hotplug events calling" >> "${f}"
+               echo "# old-style openrc net scripts" >> "${f}"
+               echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
        fi
-       return 0
 }
 
 start_pre()
 {
-       check_kernel || return 1
        if [ -e /proc/sys/kernel/hotplug ]; then
                echo "" >/proc/sys/kernel/hotplug
        fi
@@ -92,7 +59,7 @@ start_pre()
 
        bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
        for f in ${bins}; do
-               if [ -x "$f" ] && ! [ -L "$f" ]; then
+               if [ -x "$f" -a ! -L "$f" ]; then
                        command="$f"
                fi
        done
@@ -100,6 +67,10 @@ start_pre()
                eerror "Unable to find udev executable."
                return 1
        fi
+
+       # Need to do this before starting udev so it will load the rules.
+       disable_oldnet_hotplug
+
        return 0
 }
 
@@ -114,17 +85,6 @@ is_service_enabled()
        return 1
 }
 
-disable_oldnet_hotplug()
-{
-       if is_service_enabled network; then
-               # disable network hotplugging
-               local f="/run/udev/rules.d/90-network.rules"
-               echo "# This file disables network hotplug events calling" >> "${f}"
-               echo "# old-style openrc net scripts" >> "${f}"
-               echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
-       fi
-}
-
 start_udevmonitor()
 {
        yesno "${udev_monitor}" || return 0
@@ -186,7 +146,6 @@ display_hotplugged_services()
 
 start_post()
 {
-       disable_oldnet_hotplug
        start_udevmonitor
        populate_dev
        stop_udevmonitor
@@ -196,9 +155,17 @@ start_post()
 
 stop()
 {
+       local rc=0
        ebegin "Stopping ${name:-$RC_SVCNAME}"
        udevadm control --exit
-       eend $? "Failed to stop $RC_SVCNAME"
+       rc=$?
+       if [ $rc -ne 0 ]; then
+               eend $rc "Failed to stop $RC_SVCNAME using udevadm"
+               ebegin "Trying with start-stop-daemon"
+               start-stop-daemon --stop --exec /sbin/udevd
+               rc=$?
+       fi
+       eend $rc "Failed to stop $RC_SVCNAME"
 }
 
 reload()
diff --git a/mercurial/hgrc.d/cacerts.rc b/mercurial/hgrc.d/cacerts.rc
new file mode 100644 (file)
index 0000000..240261c
--- /dev/null
@@ -0,0 +1,2 @@
+[web]
+cacerts = /etc/ssl/certs/ca-certificates.crt
diff --git a/pam.d/postgresql b/pam.d/postgresql
deleted file mode 100644 (file)
index b94d487..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# File autogenerated by pamd_mimic in pam eclass
-
-
-auth   include         system-auth
-account        include         system-auth
-session        include         system-auth
diff --git a/pam.d/postgresql-9.2 b/pam.d/postgresql-9.2
new file mode 100644 (file)
index 0000000..b94d487
--- /dev/null
@@ -0,0 +1,6 @@
+# File autogenerated by pamd_mimic in pam eclass
+
+
+auth   include         system-auth
+account        include         system-auth
+session        include         system-auth
index fed2bb1baff9c40923931b6b1bbfe5d87fd76621..1411fde1812cd8443726ace68a03c1dc8b408cbf 100644 (file)
@@ -44,6 +44,8 @@ dev-python/fbrehm-libs
 
 dev-vcs/rcs-fast-export                **
 
+#~gnome-base/gnome-3.6.2
+
 mail-client/thunderbird
 
 ~media-video/lxdvdrip-1.76
index f973225f9eebcdbaf97378f31b8185830e0edd1f..b611a0f218163a7c684421ab05928b358cf3e505 100644 (file)
@@ -5,8 +5,8 @@
 # Uncommenting the following three lines will polyinstantiate
 # /tmp, /var/tmp and user's home directories. /tmp and /var/tmp will
 # be polyinstantiated based on the MLS level part of the security context as well as user
-# name, Polyinstantion will not be performed for user root and adm for directories 
-# /tmp and /var/tmp, whereas home directories will be polyinstantiated for all users. 
+# name, Polyinstantion will not be performed for user root and adm for directories
+# /tmp and /var/tmp, whereas home directories will be polyinstantiated for all users.
 # The user name and context is appended to the instance prefix.
 #
 # Note that instance directories do not have to reside inside the
index 9898bf3a851477e5b582f00d279fcd7e12daf7d0..9ab58062fa378575f75f5a8c27293c9724361b69 100755 (executable)
@@ -1,5 +1,5 @@
 #!/bin/sh -p
-# It receives polydir path as $1, the instance path as $2, 
+# It receives polydir path as $1, the instance path as $2,
 # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
 # and user name in $4.
 #
index d0ba35c2a13caa799a857dd46bdb91750812a83a..30e9d00894eb2fb2fe45986af7687a7107e5b5af 100644 (file)
@@ -1,7 +1,7 @@
 #
-# This is the configuration file for pam_env, a PAM module to load in 
-# a configurable list of environment variables for a 
-# 
+# This is the configuration file for pam_env, a PAM module to load in
+# a configurable list of environment variables for a
+#
 # The original idea for this came from Andrew G. Morgan ...
 #<quote>
 #   Mmm. Perhaps you might like to write a pam_env module that reads a
 # administrators rather than set by logging in, how to treat them both
 # in the same config file?
 #
-# Here is my idea: 
+# Here is my idea:
 #
 # Each line starts with the variable name, there are then two possible
-# options for each variable DEFAULT and OVERRIDE. 
+# options for each variable DEFAULT and OVERRIDE.
 # DEFAULT allows and administrator to set the value of the
 # variable  to some default value, if none is supplied then the empty
 # string is assumed. The OVERRIDE option tells pam_env that it should
 # enter in its value (overriding the default value) if there is one
 # to use. OVERRIDE is not used, "" is assumed and no override will be
-# done. 
+# done.
 #
 # VARIABLE   [DEFAULT=[value]]  [OVERRIDE=[value]]
 #
@@ -42,7 +42,7 @@
 # values can be delimited with "", escaped " not supported.
 # Note that many environment variables that you would like to use
 # may not be set by the time the module is called.
-# For example, HOME is used below several times, but 
+# For example, HOME is used below several times, but
 # many PAM applications don't make it available by the time you need it.
 #
 #
@@ -52,7 +52,7 @@
 # to "localhost" rather than not being set at all
 #REMOTEHOST    DEFAULT=localhost OVERRIDE=@{PAM_RHOST}
 #
-# Set the DISPLAY variable if it seems reasonable 
+# Set the DISPLAY variable if it seems reasonable
 #DISPLAY               DEFAULT=${REMOTEHOST}:0.0 OVERRIDE=${DISPLAY}
 #
 #
index c7b7989c1a594c069df9555ece78f1c0266379db..68d2dadcd3cd269e54de86daaa21651ebf3cfc91 100644 (file)
@@ -1,4 +1,4 @@
-# this is an example configuration file for the pam_time module. Its syntax 
+# this is an example configuration file for the pam_time module. Its syntax
 # was initially based heavily on that of the shadow package (shadow-960129).
 #
 # the syntax of the lines is as follows:
diff --git a/speech-dispatcher/clients/emacs.conf b/speech-dispatcher/clients/emacs.conf
new file mode 100644 (file)
index 0000000..846c681
--- /dev/null
@@ -0,0 +1,7 @@
+# Local configuration for emacs
+
+BeginClient "emacs:*"
+# Example:
+#        DefaultPunctuationMode "some"
+EndClient
+
diff --git a/speech-dispatcher/clients/gnome-speech.conf b/speech-dispatcher/clients/gnome-speech.conf
new file mode 100644 (file)
index 0000000..c570685
--- /dev/null
@@ -0,0 +1,6 @@
+# Local configuration for Gnome Speech
+
+BeginClient "*:gnomespeech:*"
+#      DefaultLanguage "en"
+EndClient
+
diff --git a/speech-dispatcher/modules/cicero.conf b/speech-dispatcher/modules/cicero.conf
new file mode 100644 (file)
index 0000000..a372408
--- /dev/null
@@ -0,0 +1,30 @@
+
+# -- CICERO EXECUTABLE AND LOG --
+
+# CiceroExecutable indicates path to the cicero executable (the file called
+# tts_brltty_es.py in the original distribution of the 0.7 version).  You can
+# create a symbolic link # ln -s your-path/tts_brltty_es.py /usr/bin/cicero or
+# probably better in /usr/local/bin/cicero and modify the bellow option
+# accordingly.
+
+#CiceroExecutable "/usr/bin/cicero"
+
+# CiceroExecutableLog is the path where logging information of the
+# original Cicero synthesizer (CiceroExecutable) should be stored.
+# This should not be confused with the logging of this module/driver
+# specified in speechd.conf.
+
+#CiceroExecutableLog "/var/log/speech-dispatcher/cicero-executable.log"
+
+# -- AUDIO OUTPUT --
+
+# Cicero does its own audio output which can't
+# be influenced from this place. Please see Cicero
+# documentation
+
+# -- DEBUGING AND LOGING --
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+
+#Debug 0
\ No newline at end of file
diff --git a/speech-dispatcher/modules/dtk-generic.conf b/speech-dispatcher/modules/dtk-generic.conf
new file mode 100644 (file)
index 0000000..f485e93
--- /dev/null
@@ -0,0 +1,84 @@
+# DECTalk software output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no C code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Note that this is not an optimal solution, but
+# it's reported to work.
+#
+# Please note that DECTalk software is currently *not* Free Software.
+# You might want to look at Festival instead.
+
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANG, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+# NOTE1:
+# Users of previous versions of this configuration file need to rename their
+# DECTalk command-line program back to `say', since speech dispatcher no
+# longer installs a program with this name. Thus, the reason for
+# renaming the client in the first place is gone.
+# NOTE2:
+# DECTalk software version 4.61 is known to occasionally stop reading,
+# due to a buffering problem with the `say' program. So far, the only way
+# I know of to fix this is to upgrade from DECTalk 4.61 to DECTalk 5.
+GenericExecuteSynth \
+"echo \"[:n$VOICE][:ra $RATE][:dv ap $PITCH]\" >$TMPDIR/dtk-speak.txt \
+&& echo \'$DATA\' | fmt >>$TMPDIR/dtk-speak.txt && say -fi $TMPDIR/dtk-speak.txt"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+# We need to strip `[' and `]', as these are DECTalk's
+# command characters.
+GenericStripPunctChars  "[]"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here.
+# NOTE:
+# There is a multilingual version of DECTalk software, however I
+# do not have it. Thus, only the US English voices are defined here.
+# If you know about the other languages, please let us know on
+# <speechd@freebsoft.org>
+
+AddVoice       "en"    "MALE1"         "p"
+AddVoice       "en"    "MALE2"         "h"
+AddVoice       "en"    "MALE3"         "d"
+AddVoice       "en"    "FEMALE1"       "b"
+AddVoice       "en"    "FEMALE2"       "u"
+AddVoice       "en"    "FEMALE3"       "w"
+AddVoice       "en"    "CHILD_MALE"    "k"
+
+# These parameters set _rate_ and _pitch_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#      (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+# NOTE:
+# Because DECTalk cannot accept float values, we must force them to be
+# integers.
+
+GenericRateForceInteger 1
+GenericPitchForceInteger 1
+
+GenericRateAdd 338
+GenericPitchAdd        225
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply 262
+GenericPitchMultiply 175 
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+
+# Debug 0
+
diff --git a/speech-dispatcher/modules/epos-generic.conf b/speech-dispatcher/modules/epos-generic.conf
new file mode 100644 (file)
index 0000000..8c327e3
--- /dev/null
@@ -0,0 +1,80 @@
+# Epos output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no C code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis.
+#
+# WARNING: You will need to either rename the command epos-say in 
+# GenericExecuteString to what's the name of this utility on your
+# system (it might be "say"), or (better) create a link epos-say
+# somewhere in your path to the epos's say client.
+
+
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+
+GenericExecuteSynth \
+"epos-say -o --language $LANGUAGE --voice $VOICE --init_f $PITCH --init_t $RATE \
+\'$DATA\' | sed -e /unknown*/d >$TMPDIR/epos-said.wav && play $TMPDIR/epos-said.wav >/dev/null"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+
+# GenericStripPunctChars  "~@#$%^&*+=|\\/<>[]_`"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here.
+
+AddVoice        "cs"   "male1"      "kadlec"
+AddVoice        "sk"   "male1"      "bob"
+
+# If the language you need to pass in $LANG is different
+# from the standard ISO language code, you can specify
+# which string to use instead. If you wish to use
+# other than ISO charset for the specified language,
+# you can add it's name (as accepted by iconv) as a
+# third parameter in doublequotes.
+
+GenericLanguage        "cs" "czech"
+GenericLanguage "sk" "slovak"
+
+
+# These parameters set _rate_ and _pitch_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#      (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+GenericRateAdd 100
+GenericPitchAdd        100
+#GenericVolumeAdd 100
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply -85
+GenericPitchMultiply 100
+#GenericVolumeMultiply 50
+
+# If the client program can't handle floats, you will have to
+# use these two options to force integers as the parameters
+# 1 means force integers, 0 means do nothing (write floats).
+
+#GenericRateForceInteger 0
+#GenericPitchForceInteger 0
+#GenericVolumeForceInteger 0
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+# Debug 0
diff --git a/speech-dispatcher/modules/espeak-generic.conf b/speech-dispatcher/modules/espeak-generic.conf
new file mode 100644 (file)
index 0000000..d76c03a
--- /dev/null
@@ -0,0 +1,123 @@
+# Espeak output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no C code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Use this config file with the sd_generic output module.
+#
+# IMPORTANT: The audio output method relies on ALSA Player (aplay)
+# being installed. If this is not the case, consider installing it
+# or replace the aplay command in the GenericExecuteString below
+# with play or similar.
+#
+# GenericExecuteString to what's the name of this utility on your
+# system (it might be "speak")
+
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+GenericExecuteSynth \
+"echo \'$DATA\' | espeak -w $TMPDIR/espeak.wav -v $VOICE -s $RATE -a $VOLUME -p $PITCH $PUNCT --stdin && $PLAY_COMMAND $TMPDIR/espeak.wav"
+
+# The following three items control punctuation levels None, Some, and All.
+# Each of these values will be substituted into the $PUNCT variable depending
+# on the value passed to speech dispatcher from applications.
+# Note that if an empty string is specified, then $PUNCT will be blank 
+# which is a default situation for espeak.
+GenericPunctNone ""
+GenericPunctSome "--punct=\"()[]{};:\""
+GenericPunctAll "--punct"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+
+# GenericStripPunctChars  ""
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here. This list will likely not be
+# up-to-date, please check eSpeak documentation and add the voices
+# you want to use. Or better use the native espeak module ('espeak'
+# not 'espeak-generic')
+
+AddVoice        "en"    "MALE1"                "en"
+AddVoice       "en"    "MALE2"         "en-b"
+AddVoice       "en"    "MALE3"         "en-d"
+AddVoice       "en"    "FEMALE1"       "en-f"
+AddVoice       "en"    "FEMALE2"       "en-fb"
+AddVoice       "en"    "FEMALE3"       "en-fd"
+AddVoice       "en"    "CHILD_MALE"    "en-c"
+AddVoice       "en"    "CHILD_FEMALE"  "en-fc"
+AddVoice        "af"    "MALE1"                "af"
+AddVoice        "de"    "MALE1"                "de"
+AddVoice        "eo"    "MALE1"                "eo"
+AddVoice        "es"    "MALE1"                "es"
+AddVoice        "fi"    "MALE1"                "fi"
+AddVoice        "fr"    "MALE1"                "fr"
+AddVoice        "it"    "MALE1"                "it"
+AddVoice        "pt"    "MALE1"                "pt"
+AddVoice        "ro"    "MALE1"                "ro"
+
+# Experimental voices
+AddVoice        "cs"    "MALE1"                "cs"
+AddVoice        "cy"    "MALE1"                "cy"
+AddVoice        "el"    "MALE1"                "el"
+AddVoice        "nl"    "MALE1"                "nl"
+AddVoice        "no"    "MALE1"                "no"
+AddVoice        "hi"    "MALE1"                "hi"
+AddVoice        "pl"    "MALE1"                "pl"
+AddVoice        "ru"    "MALE1"                "ru"
+AddVoice        "sv"    "MALE1"                "sv"
+AddVoice        "vi"    "MALE1"                "vi"
+
+
+# These parameters set _rate_, _pitch_, and _volume_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#       (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.10):
+#
+#           SSIP Range  SSIP Default    ESpeak Range    ESpeak Default
+#           ----------- ------------    ------------    --------------
+# Rate      -100 to 100     0           80 to 320       160
+# Pitch     -100 to 100     0            0 to 99         50
+# Volume    -100 to 100     0            0 to 20         10
+#
+# The SSIP defaults are actually controlled via DefaultRate, DefaultPitch, and
+# DefaultVolume in the speechd.conf file.
+
+GenericRateAdd          160
+GenericPitchAdd         50
+GenericVolumeAdd        10
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply     160
+GenericPitchMultiply    50
+GenericVolumeMultiply   10
+
+# If the client program can't handle floats, you will have to
+# use these two options to force integers as the parameters
+# 1 means force integers, 0 means do nothing (write floats).
+
+GenericRateForceInteger     1
+GenericPitchForceInteger    1
+GenericVolumeForceInteger   1
+
+# Note that SSIP rates < -50 are spoken at -50.
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+Debug 0
diff --git a/speech-dispatcher/modules/espeak-mbrola-generic.conf b/speech-dispatcher/modules/espeak-mbrola-generic.conf
new file mode 100644 (file)
index 0000000..e83d6b5
--- /dev/null
@@ -0,0 +1,158 @@
+# Espeak mbrola output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Use this config file with the sd_generic output module.
+#
+# IMPORTANT: The audio output method relies on an audio playback
+# utility (play, aplay, paplay for OSS, ALSA or Pulse)
+# being installed. If this is not the case, consider installing it
+# or replace the $PLAY_COMMAND string in the GenericExecuteString below
+# with play, paplay or similar.
+#
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+GenericExecuteSynth \
+"echo \'$DATA\' | espeak -v mb-$VOICE $PUNCT -s $RATE -a $VOLUME | mbrola -v $VOLUME -e /usr/share/mbrola/$VOICE/$VOICE - -.au | $PLAY_COMMAND
+
+# The following three items control punctuation levels None, Some, and All.
+# Each of these values will be substituted into the $PUNCT variable depending
+# on the value passed to speech dispatcher from applications.
+# Note that if an empty string is specified, then $PUNCT will be blank 
+# which is a default situation for espeak.
+GenericPunctNone " "
+GenericPunctSome "--punct=\"()[]{};:\""
+GenericPunctAll "--punct"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+# GenericStripPunctChars  ""
+
+# If the language you need to pass in $LANG is different
+# from the standard ISO language code, you can specify
+# which string to use instead. If you wish to use
+# other than ISO charset for the specified language,
+# you can add it's name (as accepted by iconv) as a
+# third parameter in doublequotes.
+
+
+GenericLanguage                  "af" "af" "utf-8"
+GenericLanguage                  "cs" "cs" "utf-8"
+GenericLanguage                  "de" "de" "utf-8"
+GenericLanguage                  "el" "el" "utf-8"
+GenericLanguage                  "en" "en" "utf-8"
+GenericLanguage                  "es" "es" "utf-8"
+GenericLanguage                  "fr" "fr" "utf-8"
+GenericLanguage                  "hr" "hr" "utf-8"
+GenericLanguage                  "hu" "hu" "utf-8"
+GenericLanguage                  "it" "it" "utf-8"
+GenericLanguage                  "la" "la" "utf-8"
+GenericLanguage                  "nl" "nl" "utf-8"
+GenericLanguage                  "pl" "pl" "utf-8"
+GenericLanguage                  "pt" "pt" "utf-8"
+GenericLanguage                  "ro" "ro" "utf-8"
+GenericLanguage                  "sv" "sv" "utf-8"
+GenericLanguage                  "sw" "sw" "utf-8"
+GenericLanguage                  "gr" "gr" "utf-8"
+GenericLanguage                  "cr" "cr" "utf-8"
+GenericLanguage                  "hu" "hu" "utf-8"
+GenericLanguage                  "id" "id" "utf-8"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here. This list will likely not be
+# up-to-date, please check eSpeak documentation and add the voices
+# you want to use. Or better use the native espeak module ('espeak'
+# not 'espeak-generic')
+
+AddVoice        "en"    "MALE1"                "en1"
+AddVoice        "en"    "MALE2"                "us2"
+AddVoice        "en"    "MALE3"                "us3"
+AddVoice        "en"    "FEMALE1"      "us1"
+
+AddVoice        "de"    "MALE1"         "de4"
+AddVoice        "de"    "MALE2"         "de6"
+AddVoice        "de"    "FEMALE1"       "de5"
+AddVoice        "de"    "FEMALE2"       "de7"
+
+AddVoice        "fr"    "MALE1"       "fr1"
+AddVoice        "fr"    "FEMALE1"     "fr4"
+
+AddVoice        "it"    "MALE1"                "it3"
+AddVoice        "it"    "FEMALE1"      "it4"
+
+AddVoice        "es"    "MALE1"                "es1"
+AddVoice        "es"    "MALE2"                "es2"
+
+AddVoice        "sw"    "MALE1"         "sw1"
+AddVoice        "sw"    "FEMALE1"      "sw2"
+
+AddVoice        "gr"    "MALE1"        "gr1"
+AddVoice        "gr"    "MALE2"        "gr2"
+
+AddVoice        "pt"    "MALE1"        "br1"
+AddVoice        "pt"    "MALE2"        "br3"
+AddVoice        "pt"    "FEMALE1"       "pt1"
+
+AddVoice        "cs"    "MALE1"                "cz2"
+AddVoice        "pl"    "FEMALE1"       "pl1"
+AddVoice        "ro"    "MALE1"                "ro1"
+AddVoice        "af"    "MALE1"        "af1"
+AddVoice        "cr"    "MALE1"        "cr1"
+AddVoice        "hu"    "MALE1"        "hu1"
+AddVoice        "la"    "MALE1"        "la1"
+AddVoice        "id"    "MALE1"        "id1"
+AddVoice        "nl"    "MALE1"        "nl2"
+
+# These parameters set _rate_, _pitch_, and _volume_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#       (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.10):
+#
+#           SSIP Range  SSIP Default    ESpeak/MBROLA Range ESpeak Default
+#           ----------- ------------    ------------         --------------
+# Rate      -100 to 100     0           80 to 320       160
+# Pitch     -100 to 100     0            0 to 99         50
+# Volume    -100 to 100     0            0 to 2          --
+#
+# The SSIP defaults are actually controlled via DefaultRate, DefaultPitch, and
+# DefaultVolume in the speechd.conf file.
+
+GenericRateAdd          160
+GenericPitchAdd         50
+GenericVolumeAdd        1
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply     160
+GenericPitchMultiply    50
+GenericVolumeMultiply   1
+
+# If the client program can't handle floats, you will have to
+# use these two options to force integers as the parameters
+# 1 means force integers, 0 means do nothing (write floats).
+
+GenericRateForceInteger     1
+GenericPitchForceInteger    1
+GenericVolumeForceInteger   0
+
+# Note that SSIP rates < -50 are spoken at -50.
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+Debug 0
diff --git a/speech-dispatcher/modules/espeak.conf b/speech-dispatcher/modules/espeak.conf
new file mode 100644 (file)
index 0000000..5379cc0
--- /dev/null
@@ -0,0 +1,34 @@
+
+# -- SOUND ICONS --
+
+# Espeak  does not currently support playing sound icons
+# (audio files that are played by name when an application requests
+# a sound icon).  If you have installed the free(b)soft sound-icons
+# package, this is the directory where will they be found.  If not
+# blank, the espeak Output Module will play them if it finds a
+# file whose name matches the sound icon name.  If blank, or no
+# matching file is found, the name of the sound icon will be spoken.
+
+EspeakSoundIconFolder "/usr/share/sounds/sound-icons/"
+
+# Volume at which sound icons are played.
+
+EspeakSoundIconVolume 0
+
+# -- Punctuation --
+
+# Characters to be spoken when punctuation setting is "some"
+# Encoding is UTF-8.
+EspeakPunctuationList "@+_"
+EspeakCapitalPitchRise 0
+
+# -- Internal parameters --
+
+# Number of ms of audio returned by the espeak callback function.
+EspeakAudioChunkSize 3000
+
+# Maximum number of samples to buffer in playback queue.
+EspeakAudioQueueMaxSize 441000
+
+# Debugging
+Debug 0
diff --git a/speech-dispatcher/modules/festival.conf b/speech-dispatcher/modules/festival.conf
new file mode 100644 (file)
index 0000000..9efc942
--- /dev/null
@@ -0,0 +1,76 @@
+
+# -- FESTIVAL SERVER SETTINGS --
+
+# Address where the Festival server runs (you have to
+# have a Festival server running, please see documentation).
+
+#FestivalServerHost  "localhost"
+#FestivalServerPort   1314
+
+
+# -- CACHING --
+
+# Festival output module supports a caching mechanism for
+# repeated events like characters, keys and sound icons
+# that saves the wavefiles retrieved from the synthesizer
+# and uses them next time an identical request is issued.
+# This way, the synthesis is much more responsive when
+# you type in keys, you spell some word by going over it
+# with cursor keys, sound icons are faster and so on.
+# If you wish to enable this caching mechanism, turn
+# FestivalCacheOn to 1, or switch it off by 0.
+
+# FestivalCacheOn 1
+
+# How large should the memmory assigned to output module for
+# cache should be. Festival will never overcome this limit.
+# If there are more messages to save, the ones that are least
+# accessed will be removed from the cache. So if you set this
+# parameter too low, the module will often have to synthesize
+# your request (which takes time) instead of just retrieving
+# it from the cache, but you will save system resources. If you
+# set it higher, it might make the module more responsive.
+# The value is given in kilobytes, default is 10 megabytes.
+
+# FestivalCacheMaxKBytes 10240
+
+# Normally, the cache pool is common for all voices, rates and
+# pitches. This means that when for example the key 'r' gets cached,
+# you change the voice and request the key 'r' again, it will be
+# retrieved from the cache and you will hear the old 'r' instead of a
+# new one. By default, it only switches between languages.  In most
+# cases, this isn't a problem for characters, keys and sound icons and
+# it saves system resources. But if you want to keep separate caches
+# for different voices (and even rates and pitches), please set the
+# corresponding parameters to 1. (0 means don't distinguish).
+
+# FestivalCacheDistinguishVoices 0
+# FestivalCacheDistinguishRate 0
+# FestivalCacheDistinguishPitch 0
+
+# -- FESTIVAL PERFORMANCE --
+
+# Switching FestivalReopenSocket to 1 will make the module close the
+# connection to Festival each time the currently synthesized wavefile
+# is no longer needed to finish and new text is waiting. This may improve
+# Festival responsivity on slower machines, but might cause a more network
+# trafic. Currently, the option is set to 0 by default, because there
+# is a network problem in Festival socket communication layer that introduces
+# unnecessary delays that affect the performance heavily in this mode.
+# Unless your Festival is patched against this bug, switching this on
+# is not recommended.
+
+# FestivalReopenSocket 0
+
+
+# -- DEBUGING --
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+Debug 0
+
+# If FestivalDebugSaveOutput is set to 1, it writes the produced sound tracks
+# to /tmp/debug-festival-*.snd before it says them. You can later browse them
+# for debugging purposes. They are numbered in order starting from 0.
+
+# FestivalDebugSaveOutput 0
diff --git a/speech-dispatcher/modules/flite.conf b/speech-dispatcher/modules/flite.conf
new file mode 100644 (file)
index 0000000..be20924
--- /dev/null
@@ -0,0 +1,15 @@
+
+# See Festival commands comments for information
+FliteMaxChunkLength    500
+FliteDelimiters        ".?!;"
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+
+# Debug 0
+
+
+# DebugFile specifies the file where the debugging information
+# should be stored (note that the log is overwritten each time
+# the module starts)
+# DebugFile "/tmp/debug-flite"
diff --git a/speech-dispatcher/modules/ibmtts.conf b/speech-dispatcher/modules/ibmtts.conf
new file mode 100644 (file)
index 0000000..8555107
--- /dev/null
@@ -0,0 +1,144 @@
+
+# -- SSML Support --
+
+# Some version of IBM TTS support SSML. If IbmttsUseSSML
+# is set to 1, SSML will be used and advanced features like
+# index marking will be working. If set to 0, all SSML is
+# deleted from the message prior to sending it to IBM TTS.
+# By default, SSML support is switched on.
+
+# IbmttsUseSSML 1
+
+# -- Abbreviation dictionaries --
+
+# Enable the abbreviation dictionaries.
+#
+
+IbmttsUseAbbreviation 1
+
+# -- SOUND ICONS --
+
+# IBM TTS Synthesizer does not currently support sound icons
+# (audio files that are played by name when an application requests
+# a sound icon).  If you have installed the free(b)soft sound-icons
+# package, this is the directory where will they be found.  If not
+# blank, the IBM TTS Output Module will play them if it finds a
+# file whose name matches the sound icon name.  If blank, or no
+# matching file is found, the name of the sound icon will be spoken.
+
+#IbmttsSoundIconFolder "/usr/share/sounds/sound-icons/"
+
+# -- DEBUG --
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored.
+
+# TODO: Change this to 0 and comment out for final release.
+
+Debug 0
+
+# DebugFile specifies the file where the debugging information
+# should be stored (note that the log is overwritten each time
+# the module starts)
+
+# DebugFile "/tmp/debug-ibmtts"
+
+# -- VOICE PARAMETERS --
+
+# This table provides a mechanism for fine-tuning the voices used for synthesis.
+# The dialect is chosen by the table above, then adjusted according to these parameters.
+# The columns are:
+#   Voice Name   - See the Speech Dispatcher manual for standard voice names.  Use lowercase names.
+#   M/F          - Gender.   0 = male. 1 = female.
+#   Br           - Breathiness.  0 to 100. 0 is usually used for males, 40 or 50 for females.
+#   Hd Sz        - Head Size.  0 to 100.
+#   Pitch Bas    - Pitch Baseline.  0 to 100.
+#   Pitch Flc    - Pitch Fluctuation.  0 to 100.
+#   Rough        - Roughness.  0 to 100
+#   Speed        - Rate.  0 to 100.
+
+# Volume is controlled via speechd.conf or SSIP commands.
+
+# Application RATE or PITCH commands are relative to the settings here.
+# For example, if Pitch Bas is 80 below, a PITCH command of -50 would set the
+# pitch baseline to halfway between 80 and 0, or 40.
+
+# All columns must be provided.
+
+#                                             Hd  -Pitch-
+#                      Voice Name     M/F Br  Sz  Bas Flc Rough Speed
+#                      -------------- --- --- --- --- --- ---   ---
+#IbmttsVoiceParameters "male1"          0   0  50  65  30   0    50
+#IbmttsVoiceParameters "male2"          0   0  86  56  47   0    50
+#IbmttsVoiceParameters "male3"          0   0  50  69  34   0    70
+#IbmttsVoiceParameters "male3"          0  20  30  61  44  18    50
+#IbmttsVoiceParameters "female1"        1  50  50  81  30   0    50
+#IbmttsVoiceParameters "female2"        1  40  56  89  35   0    70
+#IbmttsVoiceParameters "female3"        1  40  45  68  30   3    50
+IbmttsVoiceParameters  "child_male"     0   0  35  85  35   0    50
+#IbmttsVoiceParameters "child_female"   1   0  22  93  35   0    50
+
+# The table above shows the default mapping.
+# It shows the default settings in the IBM TTS Engine, as follows:
+#
+# SD Voice Name     IBM TTS Voice
+# -------------     -------------
+# male1             Adult Male 1
+# male2             Adult Male 2
+# male3             Adult Male 3
+# male3             Elderly Male (uncomment the 2nd "male3" line if you want to use this)
+# female1           Adult Female 1
+# female2           Adult Female 2
+# female3           Elderly Female (notice there is no Adult Female 3)
+# child_male        none provided (that is why it is uncommented, by default)
+# child_female      Child
+
+# -- KEY NAME SUBSTITUTIONS --
+
+# Maps Speech Dispatcher key names used in SSIP KEY commands to speakable words.
+# The string in the "SD Key" column occurring anywhere in a KEY command
+# is replaced with the string in "Spoken".  The substitutions occur in the
+# order listed.  "Lang" determines which language the substitution applies
+# to.
+
+#                     Lang  SD Key      Spoken
+#                     ----  ----------- -----------
+IbmttsKeySubstitution "en"  "kp--"      "keypad minus "
+IbmttsKeySubstitution "en"  "kp-"       "keypad "
+IbmttsKeySubstitution "en"  "_"         " "
+IbmttsKeySubstitution "en"  "#"         "pound "
+IbmttsKeySubstitution "en"  "&"         "ampersand "
+IbmttsKeySubstitution "en"  "!"         "exclamation mark "
+IbmttsKeySubstitution "en"  "¦"         "pipe "
+IbmttsKeySubstitution "en"  "¤"         "currency "
+IbmttsKeySubstitution "en"  "Ø"         "capital phi "
+IbmttsKeySubstitution "en"  "ø"         "phi "
+IbmttsKeySubstitution "en"  "ÿ"         "yummel "
+IbmttsKeySubstitution "en"  "­"         "dash "
+IbmttsKeySubstitution "en"  "A"         "capital A "
+IbmttsKeySubstitution "en"  "B"         "capital B "
+IbmttsKeySubstitution "en"  "C"         "capital C "
+IbmttsKeySubstitution "en"  "D"         "capital D "
+IbmttsKeySubstitution "en"  "E"         "capital E "
+IbmttsKeySubstitution "en"  "F"         "capital F "
+IbmttsKeySubstitution "en"  "G"         "capital G "
+IbmttsKeySubstitution "en"  "H"         "capital H "
+IbmttsKeySubstitution "en"  "I"         "capital I "
+IbmttsKeySubstitution "en"  "J"         "capital J "
+IbmttsKeySubstitution "en"  "K"         "capital K "
+IbmttsKeySubstitution "en"  "L"         "capital L "
+IbmttsKeySubstitution "en"  "M"         "capital M "
+IbmttsKeySubstitution "en"  "N"         "capital N "
+IbmttsKeySubstitution "en"  "O"         "capital O "
+IbmttsKeySubstitution "en"  "P"         "capital P "
+IbmttsKeySubstitution "en"  "Q"         "capital Q "
+IbmttsKeySubstitution "en"  "R"         "capital R "
+IbmttsKeySubstitution "en"  "S"         "capital S "
+IbmttsKeySubstitution "en"  "T"         "capital T "
+IbmttsKeySubstitution "en"  "U"         "capital U "
+IbmttsKeySubstitution "en"  "V"         "capital V "
+IbmttsKeySubstitution "en"  "W"         "capital W "
+IbmttsKeySubstitution "en"  "X"         "capital X "
+IbmttsKeySubstitution "en"  "Y"         "capital Y "
+IbmttsKeySubstitution "en"  "Z"         "capital Z "
+
diff --git a/speech-dispatcher/modules/ivona.conf b/speech-dispatcher/modules/ivona.conf
new file mode 100644 (file)
index 0000000..372fc53
--- /dev/null
@@ -0,0 +1,39 @@
+
+
+# Host and port - default values 
+#IvonaServerHost "127.0.0.1"
+#IvonaServerPort 9123
+
+#Sample Frequency
+#IvonaSampleFreq 16000
+
+# Debug level - see Festival module configuration
+Debug 0
+
+
+# DebugFile specifies the file where the debugging information
+# should be stored (note that the log is overwritten each time
+# the module starts)
+# DebugFile "/tmp/debug-ivona"
+
+# IvonaMinCapLet overrides DefaultCapLetRecognition.  Set to:
+# 1 for "icon" - play icon even if default is "none"
+# 2 for "spell" - spell "capital" even if default is "none" or "icon"
+
+IvonaMinCapLet 1
+
+IvonaSoundIconPath "/usr/share/sounds/sound-icons-0.1/"
+
+#Ivona Speaker (depends on Ivona version)
+#Jacek or Ewa for pl, Jennifer for en, Carmen for ro
+
+IvonaSpeakerName "Jacek"
+IvonaSpeakerLanguage "pl"
+
+#Delimiters for message splitting
+#Do not change if not sure!
+#IvonaDelimiters ".;:,!?"
+
+#Punctuation for "some"
+#IvonaPunctuationSome "()"
+
diff --git a/speech-dispatcher/modules/llia_phon-generic.conf b/speech-dispatcher/modules/llia_phon-generic.conf
new file mode 100644 (file)
index 0000000..3301637
--- /dev/null
@@ -0,0 +1,66 @@
+# llia_phon output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no C code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis.
+#
+
+# WARNING: This is only a preliminary version and needs some more
+# work to be really useful. We plan to finish it as soon as llia_phon
+# is fixed in it's CVS.
+
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+
+GenericExecuteSynth \
+"echo \'$DATA\' > $TMPDIR/llia_phon.txt && llia_phon | mbrola --f $PITCH --t $RATE \
+-e -I LIAPHON/data/noarch/initfile.lia (directory with the voice) $VOICE \
+$TMPDIR/llia_phon.txt -.au | $PLAY_COMMAND -t au - >/dev/null"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here.
+
+AddVoice        "fr"   "male1"      "phoneme-file"
+AddVoice        "fr"   "male2"      "phoneme-file"
+
+# These parameters set _rate_ and _pitch_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#      (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+GenericRateAdd 100
+GenericPitchAdd        100
+#GenericVolumeAdd 100
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply -85
+GenericPitchMultiply 100
+#GenericVolumeMultiply 50
+
+# If the client program can't handle floats, you will have to
+# use these two options to force integers as the parameters
+# 1 means force integers, 0 means do nothing (write floats).
+
+#GenericRateForceInteger 0
+#GenericPitchForceInteger 0
+#GenericVolumeForceInteger 0
+
+# Debug turns debugging on or off
+# Debug 0
+
+# DebugFile specifies the file where the debugging information
+# should be stored (note that the log is overwritten each time
+# the module starts)
+# DebugFile "/tmp/debug-llia-phon-generic"
diff --git a/speech-dispatcher/modules/swift-generic.conf b/speech-dispatcher/modules/swift-generic.conf
new file mode 100644 (file)
index 0000000..1623559
--- /dev/null
@@ -0,0 +1,65 @@
+# Swift software output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no C code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Note that this is not an optimal solution, but
+# it's reported to work.
+#Use this config file with the sd_generic output module.
+#
+# IMPORTANT: The audio output method relies on an audio playback
+# utility (play, aplay, paplay for OSS, ALSA or Pulse)
+# being installed. If this is not the case, consider installing it
+# or replace the $PLAY_COMMAND string in the GenericExecuteString below
+# with play, paplay or similar.
+#
+# Please note that Swift software is currently *not* Free Software.
+#It can be purchased at www.cepstral.com.
+
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+GenericExecuteSynth \
+ "echo \'$DATA\' >/tmp/swift-speak.txt && /opt/swift/bin/swift -p speech/rate=$RATE,speech/pitch/shift=$PITCH,tts/content-type=text/plain,tts/text-encoding=utf-8,config/default-voice=$VOICE -f /tmp/swift-speak.txt -o /tmp/swift-speak.wav&& $PLAY_COMMAND /tmp/swift-speak.wav" 
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+# command characters.
+GenericStripPunctChars  "[]"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here.
+
+AddVoice       "en"    "MALE1"         "David"
+AddVoice       "en"    "FEMALE1"       "Diane"
+AddVoice       "en"    "FEMALE2"       "Linda"
+AddVoice       "en"    "FEMALE3"       "Callie"
+
+# These parameters set _rate_ and _pitch_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#      (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+GenericRateForceInteger 1
+
+GenericRateAdd 238
+GenericPitchAdd 1
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply 262
+GenericPitchMultiply 1
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+# Debug 0
diff --git a/speech-dispatcher/speechd.conf b/speech-dispatcher/speechd.conf
new file mode 100644 (file)
index 0000000..9f3cb9a
--- /dev/null
@@ -0,0 +1,264 @@
+
+# Global configuration for Speech Dispatcher
+# ==========================================
+
+# -----SYSTEM OPTIONS-----
+
+# CommunicationMethod specifies the method to be used by Speech Dispatcher to communicate with
+# its clients. Two basic methods are "unix_socket" and "inet_socket".
+#
+# unix_socket -- communication over Unix sockets represented by a file in the
+# filesystem (see SocketPath bellow). This method works only locally, but is
+# prefered for standard session setup, where every user runs his own instance of Speech
+# Dispatcher to get voice feedback on his own computer.
+#
+# inet_socket -- alternatively, you can start Speech Dispatcher on
+# a TCP port and connect to it via hostname/port. This allows for a more
+# flexible setup, where you can use Speech Dispatcher over network
+# from different machines. See also the Port and LocalhostAccessOnly
+# configuration variables.
+#
+# CommunicationMethod "unix_socket"
+
+# SocketPath is either "default" or a full path to the filesystem
+# where the driving Unix socket file should be created in case the
+# CommunicationMethod is set to "unix_socket". The default is
+# ~/.speech-dispatcher/speechd.sock where ~ is the given users home directory.
+# Do not change this unless you have a reason and know what you are doing.
+
+# SocketPath "default"
+
+# The Port on which Speech Dispatcher should be available to clients if the "inet_socket"
+# communication method is used.
+
+# Port 6560
+
+# By default, if "inet_socket" communication method is used, the specified port is opened only
+# for connections comming from localhost. If LocalhostAccessOnly is set to 0 it disables this
+# access controll. It means that the port will be accessible from all computers on the
+# network. If you turn off this option, please make sure you set up some system rules on what
+# computers are and are not allowed to access the Speech Dispatcher port.
+
+# LocalhostAccessOnly 1
+
+# -----LOGGING CONFIGURATION-----
+
+# The LogLevel is a number between 0 and 5 that specifies
+# how much of the logging information should be printed
+# out on the screen or in the logfile (see LogFile)
+# 0 means nothing, 5 means everything (not recommended).
+
+LogLevel  3
+
+# The LogDir specifies where Speech Dispatcher writes its logging messages
+# (status information, error messages, etc.).  Specify "stdout" for
+# standard console output or a directory path. 'default' means that
+# the logs are written to the default destination (e.g. a preconfigured
+# system directory or the home directory if .speech-dispatcher is present)
+# DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
+# want to influence it.
+
+LogDir  "default"
+#LogDir  "/var/log/speech-dispatcher/"
+#LogDir  "stdout"
+
+# The CustomLogFile allows logging all messages of the given kind,
+# regardless their priority, to the given destination.
+
+#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
+
+# ----- VOICE PARAMETERS -----
+
+# The DefaultRate controls how fast the synthesizer is going to speak.
+# The value must be between -100 (slowest) and +100 (fastest), default
+# is 0.
+
+# DefaultRate  0
+
+# The DefaultPitch controls the pitch of the synthesized voice.  The
+# value must be between -100 (lowest) and +100 (highest), default is
+# 0.
+
+# DefaultPitch  0
+
+# The DefaultVolume constrols the default volume of the voice.  It is
+# a value between -100 (softly) and +100 (loudly).  Currently, +100
+# maps to the default volume of the synthesizer.
+
+DefaultVolume 100
+
+# The DefaultVoiceType controls which voice type should be used by
+# default.  Voice types are symbolic names which map to particular
+# voices provided by the synthesizer according to the output module
+# configuratuion.  Please see the synthesizer-specific configuration
+# in etc/speechd/modules/ to see which voices are assigned to
+# different symbolic names.  The following symbolic names are
+# currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
+# CHILD_MALE, CHILD_FEMALE
+
+# DefaultVoiceType  "MALE1"
+
+# The Default language with which to speak
+
+# DefaultLanguage "en"
+
+
+# ----- MESSAGE DISPATCHING CONTROLL -----
+
+# The DefaultClientName specifies the name of a client who didn't
+# introduce himself at the beginning of an SSIP session.
+
+# DefaultClientName  "unknown:unknown:unknown"
+
+# The Default Priority. Use with caution, normally this shouldn't be
+# changed globally (at this place)
+
+# DefaultPriority  "text"
+
+# The DefaultPauseContext specifies by how many index marks a speech
+# cursor should return when resuming after a pause. This is roughly
+# equivalent to the number of sentences before the place of the
+# execution of pause that will be repeated.
+
+# DefaultPauseContext 0
+
+# -----SPELLING/PUNCTUATION/CAPITAL LETTERS  CONFIGURATION-----
+
+# The DefaultPunctuationMode sets the way dots, comas, exclamation
+# marks, question marks etc. are interpreted.  none: they are ignored
+# some: some of them are sent to synthesis (see
+# DefaultPunctuationSome) all: all punctuation marks are sent to
+# synthesis
+
+# DefaultPunctuationMode "none"
+
+# The DefaultCapLetRecognition: if set to "spell", capital letters
+# should be spelled (e.g. "capital b"), if set to "icon",
+# capital letters are indicated by inserting a special sound
+# before them but they should be read normally, it set to "none"
+# capital letters are not recognized (by default)
+
+# DefaultCapLetRecognition  "none"
+
+# The DefaultSpelling: if set to On, all messages will be spelled
+# unless set otherwise (this is usually not something you want to do.)
+
+# DefaultSpelling  Off
+
+# ----- AUDIO CONFIGURATION -----------
+
+# -- AUDIO OUTPUT --
+
+# Chooses between the possible sound output systems:
+#       "pulse" - PulseAudio
+#       "alsa"  - Advanced Linux Sound System
+#       "oss"   - Open Sound System
+#       "nas"   - Network Audio System
+#       "libao" - A cross platform audio library
+# Pulse audio is the default and recommended sound server. OSS and ALSA
+# are only provided for compatibility with architectures that do not
+# include Pulse Audio. NAS provides network transparency, but is not
+# very well tested. libao is a cross platform library with plugins for
+# different sound systems and provides alternative output for Pulse Audio
+# and ALSA as well as for other backends.
+
+# AudioOutputMethod "pulse"
+
+# -- Pulse Audio parameters --
+
+# Pulse audio server name or "default" for the default pulse server
+
+#AudioPulseServer "default"
+
+#AudioPulseMinLength 100
+
+# -- ALSA parameters --
+
+# Audio device for ALSA output
+
+#AudioALSADevice "default"
+
+# -- OSS parameters --
+
+# Audio device for OSS output
+
+#AudioOSSDevice "/dev/dsp"
+
+# -- NAS parameters --
+
+# Route to the Network Audio System server when NAS
+# was chosen for the audio output. Note that NAS
+# server doesn't need to run on your machine,
+# you can use it also over network (for instance
+# when working on remote machines).
+
+#AudioNASServer "tcp/localhost:5450"
+
+
+
+# -----OUTPUT MODULES CONFIGURATION-----
+
+# Each AddModule line loads an output module.
+#  Syntax: AddModule "name" "binary" "configuration" "logfile"
+#  - name is the name under which you can acces this module
+#  - binary is the path to the binary executable of this module,
+#    either relative (to lib/speech-dispatcher-modules/) or absolute
+#  - configuration is the path to the config file of this module,
+#    either relative (to etc/speechd/modules/) or absolute
+
+AddModule "espeak"       "sd_espeak"   "espeak.conf"
+AddModule "festival"     "sd_festival"  "festival.conf"
+#AddModule "flite"        "sd_flite"     "flite.conf"
+#AddModule "ivona"      "sd_ivona"    "ivona.conf"
+#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+#AddModule "espeak-mbrola-generic" "sd_generic" "espeak-mbrola-generic.conf"
+#AddModule "swift-generic" "sd_generic" "swift-generic.conf"
+#AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
+#AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
+#AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
+#AddModule "cicero"        "sd_cicero"     "cicero.conf"
+
+# DO NOT REMOVE the following line unless you have
+# a specific reason -- this is the fallback output module
+# that is only used when no other modules are in use
+AddModule "dummy"         "sd_dummy"      ""
+
+# The output module testing doesn't actually connect to anything. It
+# outputs the requested commands to standard output and reads
+# responses from stdandard input. This way, Speech Dispatcher's
+# communication with output modules can be tested easily.
+
+# AddModule "testing"
+
+# The DefaultModule selects which output module is the default.  You
+# must use one of the names of the modules loaded with AddModule.
+
+DefaultModule espeak
+
+# The LanguageDefaultModule selects which output modules are prefered
+# for specified languages.
+
+#LanguageDefaultModule "en"  "espeak"
+#LanguageDefaultModule "cs"  "festival"
+#LanguageDefaultModule "es"  "festival"
+
+# -----CLIENT SPECIFIC CONFIGURATION-----
+
+# Here you can include the files with client-specific configuration
+# for different types of clients. They must contain one or more sections with
+# this structure:
+#     BeginClient "emacs:*"
+#          DefaultPunctuationMode "some"
+#          ...and/or some other settings
+#     EndClient
+# The parameter of BeginClient tells Speech Dispatcher to which clients
+# it should apply this settings (it does glob-style matching, you can use
+# * to match any number of characters and ? to match one character)
+
+# There are some sample client settings
+
+Include "clients/*.conf"
+
+# The DisableAutoSpawn option will disable the autospawn mechanism.
+# Thus the server will not start automatically on requests from the clients
+# DisableAutoSpawn