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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 58bcc6e126b873af8cd694b24e22321b96424218
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Oct 12 23:52:58 2009 +0200

    dh_ocaml: fix a bug in error code
    
    Conditional results in map block argument makes perl assign "undef"
    (or similar) to some positions in the list. In this case, $_ is
    undefined in some iterations of the following foreach loop! Remove the
    test, it is redundant with the foreach loop anyway.

diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index 6ce5a46..9f7ce01 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -357,7 +357,7 @@ foreach my $package (keys(%dev_packages), @binary_packages)
     # Search for OCaml objects
     if ($is_dev)
     {
-      my @paths = map {"$_/usr/lib" if -e "$_/usr/lib"} @search_path;
+      my @paths = map {"$_/usr/lib"} @search_path;
 
       foreach (@paths)
       {
diff --git a/debian/changelog b/debian/changelog
index a712801..0291a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dh-ocaml (0.9.1) UNRELEASED; urgency=low
 
   [ Stéphane Glondu ]
   * dh_ocamldoc: fix typo in regexp (Closes: #549939)
+  * dh_ocaml: better error when /usr/lib doesn't exist in a relevant
+    binary package
 
   [ Mehdi Dogguy ]
   * Don't pass --nodefined-map to ocaml-lintian

-- 
dh-ocaml packaging