5 files changed, 16 insertions, 87 deletions
diff --git a/Build/tools/Tpm.pm b/Build/tools/Tpm.pm
index 4743558177e..353c0570917 100644
--- a/Build/tools/Tpm.pm
+++ b/Build/tools/Tpm.pm
@@ -373,7 +373,7 @@ sub fresh {
   my $parser = new XML::DOM::Parser;
   chomp (my $user = `whoami`);  # for Creator field.
   my $doc = $parser->parse("\
-<!DOCTYPE rdf:RDF SYSTEM \"../../Tools/tpm.dtd\">\
+<!DOCTYPE rdf:RDF SYSTEM \"../../support/tpm.dtd\">\
 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:TPM=\"http://texlive.dante.de/\">\
   <rdf:Description about=\"http://texlive.dante.de/texlive/tlcore/${name}.zip\">\
     <TPM:Name>${name}</TPM:Name>\
@@ -383,12 +383,12 @@ sub fresh {
     <TPM:Creator>$user</TPM:Creator>\
     <TPM:Author></TPM:Author>\
     <TPM:Title>The ${name} package.</TPM:Title>\
-    <TPM:Size>864</TPM:Size>\
+    <TPM:Size>314</TPM:Size>\
     <TPM:Description></TPM:Description>\
     <TPM:Build>\
       <TPM:RunPatterns>${texmf}/tpm/${name}.tpm</TPM:RunPatterns>\
     </TPM:Build>\
-    <TPM:RunFiles size=\"679\">${texmf}/tpm/${name}.tpm</TPM:RunFiles>\
+    <TPM:RunFiles size=\"270\">${texmf}/tpm/${name}.tpm</TPM:RunFiles>\
     <TPM:Provides>${type}/${name}</TPM:Provides>\
   </rdf:Description>\
 </rdf:RDF>\
@@ -402,7 +402,7 @@ sub toRDF {
   my $parser = new XML::DOM::Parser;
 
   $doc = $parser->parse("<!DOCTYPE rdf:RDF\n\
-  SYSTEM \"../../Tools/tpm.dtd\">\n\
+  SYSTEM \"../../support/tpm.dtd\">\n\
 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns\#\"\n\
  xmlns:TPM=\"http://texlive.dante.de/\">\n</rdf:RDF>\n");
 
diff --git a/Build/tools/tpm.dtd b/Build/tools/tpm.dtd
deleted file mode 100644
index 955831795c4..00000000000
--- a/Build/tools/tpm.dtd
+++ /dev/null
@@ -1,74 +0,0 @@
-<!ELEMENT rdf:RDF (rdf:Description) >
-<!ATTLIST rdf:RDF 
-     xmlns:rdf CDATA #REQUIRED
-     xmlns:TPM CDATA #REQUIRED>
-<!ELEMENT rdf:Description
- (TPM:Name, TPM:Type, TPM:Date, TPM:Version, TPM:Creator, 
- TPM:Title, TPM:Description, TPM:Author, TPM:Size, TPM:Flags?,
- TPM:Build,
- TPM:BinFiles*,TPM:RunFiles?,TPM:DocFiles?,TPM:SourceFiles?,
- TPM:RemoteFiles?,
- TPM:Requires?, TPM:RequiredBy?, TPM:Installation?,TPM:Provides?)>
-   <!ATTLIST rdf:Description about CDATA #REQUIRED >
-<!ELEMENT TPM:Name (#PCDATA)>
-<!ELEMENT TPM:Flags EMPTY>
-<!ATTLIST TPM:Flags 
- selectable CDATA #IMPLIED
- default CDATA #IMPLIED
- treeroot CDATA #IMPLIED
->
-<!ELEMENT TPM:Type (#PCDATA)>
-<!ELEMENT TPM:Date (#PCDATA)>
-<!ELEMENT TPM:Version (#PCDATA)>
-<!ELEMENT TPM:Creator (#PCDATA)>
-<!ELEMENT TPM:Author (#PCDATA)>
-<!ELEMENT TPM:Requires (TPM:Documentation*,TPM:Package*,TPM:TLCore*,TPM:Collection*,TPM:Support*)>
-<!ELEMENT TPM:RequiredBy (#PCDATA)>
-<!ELEMENT TPM:Title (#PCDATA)>
-<!ELEMENT TPM:Size (#PCDATA)>
-<!ELEMENT TPM:Description (#PCDATA)>
-<!ATTLIST TPM:Description
-     xmlns:TPM CDATA #IMPLIED>
-<!ELEMENT TPM:Build
- (TPM:BinPatterns?,TPM:RunPatterns?,TPM:DocPatterns?,
-  TPM:SourcePatterns?,TPM:RemotePatterns?)>
-<!ELEMENT TPM:BinPatterns (#PCDATA)>
-<!ELEMENT TPM:RunPatterns (#PCDATA)>
-<!ELEMENT TPM:DocPatterns (#PCDATA)>
-<!ELEMENT TPM:SourcePatterns (#PCDATA)>
-<!ELEMENT TPM:RemotePatterns (#PCDATA)>
-<!ELEMENT TPM:BinFiles (#PCDATA)>
-<!ELEMENT TPM:RunFiles (#PCDATA)>
-<!ELEMENT TPM:DocFiles (#PCDATA)>
-<!ELEMENT TPM:SourceFiles (#PCDATA)>
-<!ELEMENT TPM:RemoteFiles (#PCDATA)>
-<!ATTLIST TPM:BinFiles arch CDATA #REQUIRED>
-<!ATTLIST TPM:BinFiles size CDATA #REQUIRED>
-<!ATTLIST TPM:DocFiles size CDATA #REQUIRED>
-<!ATTLIST TPM:SourceFiles size CDATA #REQUIRED>
-<!ATTLIST TPM:RunFiles size CDATA #REQUIRED>
-<!ATTLIST TPM:RemoteFiles size CDATA #REQUIRED>
-<!ATTLIST TPM:BinFiles xmlns:TPM CDATA #IMPLIED>
-<!ATTLIST TPM:RunFiles xmlns:TPM CDATA #IMPLIED>
-<!ATTLIST TPM:DocFiles xmlns:TPM CDATA #IMPLIED>
-<!ATTLIST TPM:SourceFiles    xmlns:TPM CDATA #IMPLIED>
-<!ATTLIST TPM:RemoteFiles    xmlns:TPM CDATA #IMPLIED>
-<!ELEMENT TPM:TLCore EMPTY>
- <!ATTLIST TPM:TLCore name CDATA #REQUIRED>
-<!ELEMENT TPM:Package EMPTY>
- <!ATTLIST TPM:Package name CDATA #REQUIRED>
-<!ELEMENT TPM:Documentation EMPTY>
- <!ATTLIST TPM:Documentation name CDATA #REQUIRED>
-<!ELEMENT TPM:Collection EMPTY>
- <!ATTLIST TPM:Collection name CDATA #REQUIRED>
-<!ELEMENT TPM:Support EMPTY>
- <!ATTLIST TPM:Support name CDATA #REQUIRED>
-<!ELEMENT TPM:Installation (TPM:Execute)*>
-<!ELEMENT TPM:Execute (#PCDATA)>
-<!ATTLIST TPM:Execute function CDATA #REQUIRED
- mode CDATA #IMPLIED
- parameter CDATA #REQUIRED>
-<!ELEMENT TPM:Provides (#PCDATA)>
-
-
-
diff --git a/Build/tools/tpmfromcat.xsl b/Build/tools/tpmfromcat.xsl
index 4276721c9c2..8e044a6ed18 100644
--- a/Build/tools/tpmfromcat.xsl
+++ b/Build/tools/tpmfromcat.xsl
@@ -1,3 +1,6 @@
+<!-- $Id$
+     Written by Sebastian Rahtz.  Public domain. -->
+
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -9,7 +12,7 @@
 <xsl:output 
    method="xml"
    indent="yes"
-   doctype-system="../../Tools/tpm.dtd"
+   doctype-system="../../support/tpm.dtd"
   />
 
 <xsl:param name="sarovar"/>
diff --git a/Build/tools/updatetpm.xsl b/Build/tools/tpmupdate.xsl
index 0afad1990a1..0afad1990a1 100644
--- a/Build/tools/updatetpm.xsl
+++ b/Build/tools/tpmupdate.xsl
diff --git a/Build/tools/update-lists b/Build/tools/update-lists
index 69368d75693..8a4b5afae43 100755
--- a/Build/tools/update-lists
+++ b/Build/tools/update-lists
@@ -4,13 +4,10 @@
 # 
 # Update the texmf/lists/* files from all the tpm's.
 
-mydir=`cd \`dirname $0\` && /bin/pwd`
+tools=`cd \`dirname $0\` && /bin/pwd`
 W=`cd \`dirname $0\`/../../Master && /bin/pwd`
 cd $W || exit 1
 
-Date=`date +%Y/%m/%d`
-Who=`whoami`
-
 if test "x$1" = x-n; then
   chicken=true
 else
@@ -20,19 +17,22 @@ fi
 $chicken || rm -f texmf/lists/*
 
 echo "$0: doing packages from $W"
-for i in texmf-dist/tpm/*.tpm texmf/tpm/hyphen*tpm texmf/tpm/lib-*.tpm texmf/tpm/bin-*.tpm \
+for i in texmf-dist/tpm/*.tpm \
+         texmf/tpm/hyphen*tpm \
+         texmf/tpm/lib-*.tpm \
+         texmf/tpm/bin-*.tpm \
          texmf-doc/tpm/* ; do
- xsltproc --stringparam ROOT $W $mydir/tpm2list.xsl $i 
+ xsltproc --stringparam ROOT $W $tools/tpm2list.xsl $i 
 done
 
 echo "$0: doing collections..."
 for i in texmf/tpm/collection*.tpm; do
- xsltproc --stringparam ROOT $W $mydir/collection2list.xsl $i
+ xsltproc --stringparam ROOT $W $tools/collection2list.xsl $i
 done
 
 echo "$0: doing schemes..."
 for i in texmf/tpm/scheme*.tpm; do
- xsltproc --stringparam ROOT $W $mydir/scheme2list.xsl $i
+ xsltproc --stringparam ROOT $W $tools/scheme2list.xsl $i
 done
 
 echo "$0: regenerated lists."