[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.5-25-g8e11813

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 8e1181372c24694924a0a1f578dc7eea49b1aa78
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Sep 6 20:31:34 2010 +0200

    debian-specific METAs need a comment

diff --git a/debian/changelog b/debian/changelog
index 60e6b78..3fcc24e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,12 +19,14 @@ dh-ocaml (0.9.6) unstable; urgency=low
     - streamline discussion on bytecode vs native code
     - compiling with -custom is deprecated (closes: #500286)
     - reference: add section on dh
+    - findlib integration: META files always go in the directory of the
+      library, debian-specific ones should have a comment.
   * Makefile: generate the reference document
   * update authors in doc-base registration for the policy
   * add doc-base registration for the reference.
   * Added myself to uploaders.
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 05 Sep 2010 13:59:51 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 06 Sep 2010 20:30:15 +0200
 
 dh-ocaml (0.9.5) unstable; urgency=low
 
diff --git a/policy/chapter-libpack.xml b/policy/chapter-libpack.xml
index 0b4cd11..5ae88ae 100644
--- a/policy/chapter-libpack.xml
+++ b/policy/chapter-libpack.xml
@@ -161,7 +161,7 @@
     <title>Providing <filename>META</filename> files</title>
 
     <para>
-      The <filename>ocaml-findlib</filename> provides a tool (named
+      The <filename>ocaml-findlib</filename> provides a tool (called
       <filename>ocamlfind</filename>) to handle OCaml libraries and store
       information about libraries dependencies, compiler flags, linking
       options, etc. Meta informations regarding a library are contained in
@@ -170,7 +170,8 @@
       <filename>META</filename> files is the best way to make more easy to use
       the Debian-specific oragnization of libraries. Packages distributing
       <filename>META</filename> files should suggest the use of &ocamlfind;,
-      that is have a <varname>Suggest: ocaml-findlib</varname>.  </para>
+      that is have a <varname>Suggest: ocaml-findlib</varname>.
+    </para>
 
     <para>
       By default, &ocamlfind; will look for <filename>META</filename> in this order:
@@ -216,10 +217,16 @@
 
     <para>
       If upstream doesn't provide a <filename>META</filename> then
-      packagers are encouraged to create one. In this case, the
-      <filename>META</filename> should be sent to the upstream
-      authors in order to have it included in future versions of the
-      upstream source. For more information about
+      packagers are encouraged to create one. In this case, the META
+      file should contain a comment like this, so that developers will
+      know that they shouldn't count on the availability of a META file
+      on non-Debian machines:
+      <programlisting>
+	# This META file is delivered by the Debian distribution.
+      </programlisting>
+      Furthermore, the <filename>META</filename> file should be sent to the
+      upstream authors in order to have it included in future versions
+      of the upstream source. For more information about
       <filename>META</filename> files see the <ulink
       url="http://www.ocaml-programming.de/packages/documentation/findlib/">Findlib
       manual</ulink>, at the several META files provided by other

-- 
dh-ocaml packaging