[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.3-9-g04dba95

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 04dba95e42ced22f61445b0e86a555b7b841d98d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Dec 16 13:01:04 2009 +0100

    Pass -sort to ocamldoc to sort the list of top-level modules before generating the documentation.

diff --git a/debhelper/dh_ocamldoc b/debhelper/dh_ocamldoc
index 7e4837a..750e1a8 100755
--- a/debhelper/dh_ocamldoc
+++ b/debhelper/dh_ocamldoc
@@ -80,8 +80,8 @@ my $ocaml_lib_dir = "/usr/lib/ocaml/";
 $odoc = "/usr/bin/ocamldoc.opt" if -x "/usr/bin/ocamldoc.opt";
 $ocaml_lib_dir = `ocamlc -where` if -x "/usr/bin/ocamlc";
 chomp $ocaml_lib_dir;
-my $ocamldoc_flags_global = "";
-$ocamldoc_flags_global = join " ", @{$dh{U_PARAMS}}
+my $ocamldoc_flags_global = "-sort ";
+$ocamldoc_flags_global .= join " ", @{$dh{U_PARAMS}}
   if defined($dh{U_PARAMS});
 $odoc = "ocamlfind ocamldoc"
   if $ocamldoc_flags_global =~ /(^|\s+)-(package|predicates|syntax|ppopt)\b/;
diff --git a/debian/changelog b/debian/changelog
index c5997f7..cd62d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,14 @@ dh-ocaml (0.9.4) UNRELEASED; urgency=low
     + Add some bits to the manpage about how to deal with
       several documentations.
     + Make different titles when a package ships several documentations.
+    + Pass -sort to ocamldoc to sort the list of top-level modules before
+      generating the documentation.
 
   [ Stéphane Glondu ]
   * Move debhelper to Build-Depends (needed for "clean" target)
   * Add debhelper to Recommends
 
- -- Mehdi Dogguy <mehdi at debian.org>  Fri, 13 Nov 2009 12:00:19 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 16 Dec 2009 13:00:21 +0100
 
 dh-ocaml (0.9.3) unstable; urgency=low
 

-- 
dh-ocaml packaging