The following commit has been merged in the master branch:
commit b030ee57968c349a68786507c636a1bd4ee705b5
Author: Mehdi Dogguy <me...@debian.org>
Date:   Wed Nov 11 22:22:37 2009 +0100

    dh_ocamldoc: Use word boundaries to correctly detect ocamlfind options 
instead of spaces (Closes: #555794).

diff --git a/debhelper/dh_ocamldoc b/debhelper/dh_ocamldoc
index 2f4d5d2..8b107d3 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 =~ / -package | -predicates | -syntax | -ppopt /;
+  if $ocamldoc_flags_global =~ /\b-(package|predicates|syntax|ppopt)\b/;
 
 error "$odoc does not exists or is not executable"
     unless -x $odoc;
diff --git a/debian/changelog b/debian/changelog
index 0d89d8a..80765fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-ocaml (0.9.4) unstable; urgency=low
+
+  * dh_ocamldoc: Use word boundaries to correctly detect ocamlfind options
+    instead of spaces (Closes: #555794).
+
+ -- Mehdi Dogguy <me...@debian.org>  Wed, 11 Nov 2009 22:19:22 +0100
+
 dh-ocaml (0.9.3) unstable; urgency=low
 
   * Revert fix to #500869; -u is deprecated (Closes: #554510)

-- 
dh-ocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to