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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 596ccff86eef93ae8b250a441cd42ab13e9adfb2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Nov 13 12:04:23 2009 +0100

    Make different titles when a package ships several documentations

diff --git a/debhelper/dh_ocamldoc b/debhelper/dh_ocamldoc
index 6719606..7e4837a 100755
--- a/debhelper/dh_ocamldoc
+++ b/debhelper/dh_ocamldoc
@@ -106,6 +106,8 @@ sub ocamldoc_destdir_html($$) {
 sub generate_docbase($$$) {
     return if defined($dh{NO_ACT});
     my ($package, $html_dir, $document_name) = @_;
+    my $document_title = "";
+    $document_title = " (${document_name})" if ! $document_name eq "";
     my $dest_dir = ocamldoc_destdir_html($package, $html_dir);
     my $file = "debian/${package}/usr/share/doc-base/${package}.doc-base.apiref${document_name}";
     verbose_print("Generating doc-base file: $file");
@@ -113,7 +115,7 @@ sub generate_docbase($$$) {
     complex_doit("> $file");
     open(DOC, ">> $file");
     print DOC "Document: ${package}-ocamldoc-api-reference${document_name}\n";
-    print DOC "Title: $package OCamldoc API Reference\n";
+    print DOC "Title: $package OCamldoc API Reference${document_title}\n";
     print DOC "Abstract: API reference manual for $package (generated via OCamldoc)\n";
     print DOC "Section: Programming/OCaml\n";
     print DOC "\n";
diff --git a/debian/changelog b/debian/changelog
index a4d745a..04fed80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
 dh-ocaml (0.9.4) unstable; urgency=low
 
-  * dh_ocamldoc: Use word boundaries to correctly detect ocamlfind options
-    instead of spaces (Closes: #555794).
-  * dh_ocamldoc: Add some bits to the manpage about how to deal with
-    several documentations.
-
- -- Mehdi Dogguy <mehdi at debian.org>  Fri, 13 Nov 2009 11:08:22 +0100
+  * dh_ocamldoc:
+    + Use word boundaries to correctly detect ocamlfind options
+      instead of spaces (Closes: #555794).
+    + Add some bits to the manpage about how to deal with
+      several documentations.
+    + Make different titles when a package ships several documentations
+      (Closes: #).
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 13 Nov 2009 12:00:19 +0100
 
 dh-ocaml (0.9.3) unstable; urgency=low
 

-- 
dh-ocaml packaging