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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit c91f9e11781227cb907cd3dda652d9465d0cfb8e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Nov 11 23:00:51 2009 +0100

    correct fix to detect ocamlfind flags (ugly but works)

diff --git a/debhelper/dh_ocamldoc b/debhelper/dh_ocamldoc
index 8b107d3..a70508f 100755
--- a/debhelper/dh_ocamldoc
+++ b/debhelper/dh_ocamldoc
@@ -78,7 +78,7 @@ my $ocamldoc_flags_global = "";
 $ocamldoc_flags_global = join " ", @{$dh{U_PARAMS}}
   if defined($dh{U_PARAMS});
 $odoc = "ocamlfind ocamldoc"
-  if $ocamldoc_flags_global =~ /\b-(package|predicates|syntax|ppopt)\b/;
+  if $ocamldoc_flags_global =~ /(^|\s+)-(package|predicates|syntax|ppopt)\b/;
 
 error "$odoc does not exists or is not executable"
     unless -x $odoc;
@@ -131,7 +131,7 @@ sub read_ocamldoc_file($) {
         next if /^\#/;
         chomp;
         # Activate ocamlfind when needed
-        $use_ocamlfind = 1 if / -package | -predicates | -syntax | -ppopt /;
+        $use_ocamlfind = 1 if /(^|\s+)-(package|predicates|syntax|ppopt)\b/;
         # Detect html_dir
         if (/-d[\s]+([^\s]+)/) {
             $html_dir = $1;

-- 
dh-ocaml packaging