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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f15c870359acbe8d961a2d9a8591319c59739003
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 24 00:56:26 2009 +0200

    Don't pass --nodefined-map to ocaml-lintian

diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index dc2870c..6ce5a46 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -394,6 +394,7 @@ foreach my $package (keys(%dev_packages)) {
   isnative($package); # set $dh{VERSION}
   my $local_flags = "$flags --package $package --version $dh{VERSION}";
   $local_flags .= " --runtime ".$runtime if $runtime;
+  my $olintian_flags = $local_flags;
   $local_flags .= " ".join(" ",map {("--nodefined", $_)} @{$nodefined{$package}})
     if exists $nodefined{$package};
 
@@ -407,7 +408,7 @@ foreach my $package (keys(%dev_packages)) {
 
   # compute lintian informations
   doit(qw/mkdir -p/, dirname $lintian_fn);
-  complex_doit("$olintian $local_flags < $olist{$package} > $lintian_fn.info");
+  complex_doit("$olintian $olintian_flags < $olist{$package} > $lintian_fn.info");
   if (defined($runtime))
   {
     my @META = ();
diff --git a/debian/changelog b/debian/changelog
index 81e2d58..aa35373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 dh-ocaml (0.9.1) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * dh_ocamldoc: fix typo in regexp
 
- -- Stéphane Glondu <glondu at debian.org>  Wed, 23 Sep 2009 20:19:51 +0200
+  [ Mehdi Dogguy ]
+  * Don't pass --nodefined-map to ocaml-lintian
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 24 Sep 2009 00:55:31 +0200
 
 dh-ocaml (0.9.0) unstable; urgency=low
 

-- 
dh-ocaml packaging