From 7be54344ccd27622b158b7659e80b1038af240b5 Mon Sep 17 00:00:00 2001
From: Sylvain Le Gall <sylvain.le-gall@polytechnique.org>
Date: Tue, 28 Oct 2003 00:01:17 +0000
Subject: [PATCH] Made it compile ;-> Sylvain LE GALL

---
 Makefile                   |  5 +++--
 chapter-liblocal.xml       |  6 +++---
 chapter-ocaml.xml          | 22 +++++++++++-----------
 ocaml_packaging_policy.xml | 25 +++++++++++++++----------
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 95c137bb..1ad1903c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 %.html: %.xml
-	xsltproc --nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
-	$^ > $@
+	xsltproc --nonet --output $@ \
+	/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
+	$^ 
 
 all: ocaml_packaging_policy.html 
 
diff --git a/chapter-liblocal.xml b/chapter-liblocal.xml
index 0fe2b9b5..0e7d4621 100644
--- a/chapter-liblocal.xml
+++ b/chapter-liblocal.xml
@@ -12,7 +12,7 @@
       <listitem>/usr/local/bin</listitem>
       <listitem>/usr/local/sbin</listitem>
      </varlistentry>
-     <varlistentry>
+     <!--varlistentry>
       <term>bytecoded library ( <filename>*.cma</filename> )</term>
       <listitem>/usr/local/lib/ocaml/&ocaml-version;/
       <listitem>native executable</listitem>
@@ -23,8 +23,8 @@
       <listitem>native object ( <filename>*.cmx</filename> )</listitem>
       <listitem>configuration file for handling library ( <filename>META</filename> )</listitem>
       <listitem>&ocamldoc; generated documentation ( <filename>*.odoc</filename> )</listitem>
-      <listitem>&camlp4; related files ( <filename>*.cm[ao]</filename> )</listitem>
-     </simplelist>
+      <listitem>&camlp4; related files ( <filename>*.cm[ao]</filename> )</listitem-->
+     </variablelist>
     </para>
 
 
diff --git a/chapter-ocaml.xml b/chapter-ocaml.xml
index 2afcfc8f..fc23d65d 100644
--- a/chapter-ocaml.xml
+++ b/chapter-ocaml.xml
@@ -98,7 +98,7 @@
     the <option>-dump</option> of this application. By using this, you dump the 
     intermediary representation of the document that will be generated by ocamldoc.
     This can be used to generate HTML documentation and manpages, by reloading this
-    file ( using <option>-load</load> ).
+    file ( using <option>-load</option> ).
     </para>
 
     <para>
@@ -110,7 +110,7 @@
    </section>  
 
    <section id="path">
-    <title>Path for all &ocaml-name; component</para>
+    <title>Path for all &ocaml-name; component</title>
 
     <para>
     Ocaml will search library in two different location, referred to
@@ -118,7 +118,7 @@
     <varname>core</varname> in which packaged modules stood.
     </para>
  
-    <subsection id="library-path">
+    <section id="library-path">
     <title>Library paths</title>
 
      <para>
@@ -138,7 +138,7 @@
      <para>
      When installing a library, packagers should use a subdirectory of the preceding
      set of path. Subdirectory name is not mandatory. 
-     <para>
+     </para>
      
      <para>
      If upstream developpers use already a subdirectory of the &ocaml-name; 
@@ -162,9 +162,9 @@
      name provided by the META of the upstream, or the name of the library itself.
      </para>
      
-    </subsection>
+    </section>
 
-    <subsection id="META-path">
+    <section id="META-path">
     <title><filename>META</filename></title>
     
     <para>
@@ -221,10 +221,10 @@
     the upstream source.
     </para>
 
-    </subsection>
+    </section>
 
 
-    <subsection id="ocamldoc-base-path">
+    <section id="ocamldoc-base-path">
     <title>&ocamldoc; specific generated documentation</title>
 
     <para>
@@ -270,9 +270,9 @@
    <varname>odoc</varname>, generating this documentation and to contact upstream
    author to have a well commented source.
    </para>
-   </subsection>
+   </section>
 
-   <subsection id="camlp4-path">
+   <section id="camlp4-path">
    <para>
    Actually, &camlp4; extensions are stored in 
    <filename>/usr/lib/ocaml/&ocaml-version;/camlp4/</filename>. In order to do something
@@ -300,7 +300,7 @@
    library.
    </para>
 
-   </subsection>
+   </section>
    </section>
 
 
diff --git a/ocaml_packaging_policy.xml b/ocaml_packaging_policy.xml
index a777348d..4c76b64b 100644
--- a/ocaml_packaging_policy.xml
+++ b/ocaml_packaging_policy.xml
@@ -3,15 +3,19 @@
      "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
  <!ENTITY ocaml-version "3.07">
  <!ENTITY ocaml-compat  "1">
- <!ENTITY ocaml-pkg      "<application>ocaml-&ocaml-version;-&ocaml-compat;</application>">
- <!ENTITY ocaml-base-pkg "<application>ocaml-base-&ocaml-version;-&ocaml-compat;</application>">
- <!ENTITY ocaml-name     "<application>OCaml</application>">
- <!ENTITY ocaml-force    "The Debian OCaml Task Force">
- <!ENTITY ocamlc         "<application>ocamlc</application>">
- <!ENTITY ocamlopt       "<application>ocamlopt</application>">
- <!ENTITY ocamldoc       "<application>ocamldoc</application>">
- <!ENTITY ocamlfind      "<application>ocamlfind</application>">
- <!ENTITY debian-name    "Debian">
+ <!ENTITY ocaml-pkg       "<application>ocaml</application>">
+ <!ENTITY ocaml-vpkg      "<application>ocaml-&ocaml-version;-&ocaml-compat;</application>">
+ <!ENTITY ocaml-base-vpkg "<application>ocaml-base-&ocaml-version;-&ocaml-compat;</application>">
+ <!ENTITY ocamlfind-pkg   "<application>ocaml-findlib</application>">
+ <!ENTITY ocamldoc-base   "<application>ocamldoc-base</application>">
+ <!ENTITY ocaml-name      "<application>OCaml</application>">
+ <!ENTITY ocaml-force     "The Debian OCaml Task Force">
+ <!ENTITY ocamlc          "<application>ocamlc</application>">
+ <!ENTITY ocamlopt        "<application>ocamlopt</application>">
+ <!ENTITY ocamldoc        "<application>ocamldoc</application>">
+ <!ENTITY ocamlfind       "<application>ocamlfind</application>">
+ <!ENTITY camlp4          "<application>camlp4</application>">
+ <!ENTITY debian-name     "Debian">
  <!ENTITY authors             SYSTEM "authors.xml">
  <!ENTITY legal               SYSTEM "legal.xml">
  <!ENTITY chapter-ocaml       SYSTEM "chapter-ocaml.xml">
@@ -26,6 +30,7 @@
   <title>&debian-name; &ocaml-name; Packaging Policy</title>
   <subtitle>For Objective Caml version &ocaml-version;</subtitle>
   <releaseinfo>Revision 0.1</releaseinfo>
+  <!-- Bug ici -->
   &authors;
   &legal;
   </articleinfo>
@@ -56,7 +61,7 @@
   </appendix>
 
   <appendix id="resources">
-   <title>&ocaml-task; resources</title>
+   <title>&ocaml-force; resources</title>
    &appendix-resources;
   </appendix>
 </article>
-- 
2.30.2