From: Ralf Treinen <treinen@debian.org>
Date: Sun, 6 Apr 2008 08:30:06 +0000 (+0000)
Subject: ocaml version 3.10.1
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~478
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d19deb5bda8fac28b80ccd561cc94c420501e13;p=ocaml.git

ocaml version 3.10.1
make it more clear what "local installation" means
---

diff --git a/debian/policy/chapter-generalities.xml b/debian/policy/chapter-generalities.xml
index 340d7d21..2b14e632 100644
--- a/debian/policy/chapter-generalities.xml
+++ b/debian/policy/chapter-generalities.xml
@@ -241,24 +241,40 @@
     <title>Locally Installing OCaml Programs and Libraries</title>
 
     <para>
-        Installation and use of locally installed OCaml related programs is out of the scope of this document. However, in order to have it work with a standard Debian installation, you should follow some guidelines.
-        <itemizedlist>
-            <listitem>
-                <para>
-                    Executable files should be installed in <filename>/usr/local/bin</filename>.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    Shared libraries (for C bindings) should be installed in <filename>/usr/local/lib/ocaml/&ocaml-version;/stublibs/</filename>
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    Basically, every other file should be installed in <filename>/usr/local/lib/ocaml/&ocaml-version;/</filename>. This includes in particular bytecode libraries (<filename>*.cma</filename>), native libraries (<filename>*.cmxa</filename>), bytecode object files (<filename>*.cmo</filename>), native object files (<filename>*.cmx</filename>), static libraries (<filename>*.a</filename>) and <filename>META</filename> files.
-                </para>
-            </listitem>
-        </itemizedlist>
+      Locally installed files are files that are installed directly by
+      the system administrator, in contrast to files installed through
+      Debian packages.  Installation and use of locally installed
+      OCaml related programs is out of the scope of this
+      document. However, in order to have it work with a standard
+      Debian installation, a local system administrator should follow
+      these guidelines:
+      <itemizedlist>
+        <listitem>
+          <para>
+            Executable files should be installed
+            in <filename>/usr/local/bin</filename>.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Shared libraries (for C bindings) should be installed
+            in <filename>/usr/local/lib/ocaml/&ocaml-version;/stublibs/</filename>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Basically, every other file should be installed
+            in <filename>/usr/local/lib/ocaml/&ocaml-version;/</filename>. This
+            includes in particular bytecode libraries
+            (<filename>*.cma</filename>), native libraries
+            (<filename>*.cmxa</filename>), bytecode object files
+            (<filename>*.cmo</filename>), native object files
+            (<filename>*.cmx</filename>), static libraries
+            (<filename>*.a</filename>) and <filename>META</filename>
+            files.
+          </para>
+        </listitem>
+      </itemizedlist>
     </para>
 
     <para>
diff --git a/debian/policy/ocaml_packaging_policy.xml b/debian/policy/ocaml_packaging_policy.xml
index ec1482f5..1e06c64f 100644
--- a/debian/policy/ocaml_packaging_policy.xml
+++ b/debian/policy/ocaml_packaging_policy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "/usr/share/sgml/docbook/dtd/xml/4.3/docbookx.dtd" [
-<!ENTITY ocaml-version "3.10.0">
+<!ENTITY ocaml-version "3.10.1">
 <!ENTITY ocaml-sys-dir-base "/usr/lib/ocaml">
 <!ENTITY ocaml-sys-dir "&ocaml-sys-dir-base;/&ocaml-version;">
 <!ENTITY ocaml-metas-dir "&ocaml-sys-dir;/METAS">