[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.6-3-g411891a

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 411891a89ce26bad4d85799f09871cc96ca68ea7
Merge: f5cf15884070214ee546b2d6397ee4732056cd65 a04fef8ad9704ab7fc630d9c408cac39b0ff7cf0
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Wed Nov 17 17:53:15 2010 +0000

    Merge branch 'policy-update'

diff --combined policy/chapter-libpack.xml
index 5ae88ae,5df9e8c..a5f6fa4
--- a/policy/chapter-libpack.xml
+++ b/policy/chapter-libpack.xml
@@@ -56,14 -56,15 +56,15 @@@
              <programlisting>
    Package: libpcre-ocaml
    Architecture: any
-   Section: libs
+   Section: ocaml
    Depends: &ocaml-base-nox-vpkg;, ${shlibs:Depends}, ${misc:Depends}
    ...
  
    Package: libpcre-ocaml-dev
    Architecture: any
-   Section: libdevel
-   Depends: &ocaml-nox-vpkg;, libpcre3-dev (>= 4.5), <emphasis>libpcre-ocaml (= ${binary:Version})</emphasis>, ocaml-findlib (>= 1.1), ${misc:Depends}
+   Section: ocaml
+   Depends: &ocaml-nox-vpkg;, libpcre3-dev (>= 4.5), <emphasis>libpcre-ocaml (= ${binary:Version})</emphasis>, ${misc:Depends}
+   Suggests: ocaml-findlib (>= 1.1)
    ...
              </programlisting>
            </example>
@@@ -161,7 -162,7 +162,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,8 -171,7 +171,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:
@@@ -217,16 -217,10 +218,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