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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit afed3529d511059cf21895cd0c208c9abeaf490d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 17:18:06 2009 +0200

    ocaml-md5sums: Print object file's name when failing

diff --git a/debhelper/ocaml-md5sums b/debhelper/ocaml-md5sums
index 307e004..51b17ca 100755
--- a/debhelper/ocaml-md5sums
+++ b/debhelper/ocaml-md5sums
@@ -126,7 +126,7 @@ sub add_object
         $self->add_unit($symbol_table, $2, $1);
       };
     };
-    die "E: Error running $ocamlobjinfo" if $?;
+    die "E: Error running $ocamlobjinfo on $obj_file\n" if $?;
   }
   elsif ($obj_file =~ /.*\.(cmx|cmxa|cmxs)$/)
   {
@@ -152,22 +152,19 @@ sub add_object
         $self->add_unit("imported", $1, $2);
       };
     };
-    die "E: Error running $command" if $?;
+    die "E: Error running $command on $obj_file\n" if $?;
   }
   else
   {
     main::info "Execute $ocamlbyteinfo $obj_file";
-    my $processed = 0;
     foreach (`$ocamlbyteinfo $obj_file`)
     {
-      $processed = 1;
       if (/^\s*([a-fA-F0-9]+)\s+(\S+)$/)
       {
         $self->add_unit("imported", $2, $1);
       };
     };
-    die "E: Error running $ocamlobjinfo" if $?;
-    die "E: Don't know how to process $obj_file\n" unless $processed;
+    die "E: Error running $ocamlobjinfo on $obj_file\n" if $?;
   };
 
   $self->squeeze_imported();
diff --git a/debian/changelog b/debian/changelog
index c3eb9fe..e123427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ dh-ocaml (0.9.1) UNRELEASED; urgency=low
   * Add a variable to be able to desactivate dh_ocaml in a cdbs
     package when needed. The variable WITH_DH_OCAML has to be set
     to 0 to desactivate dh_ocaml.
+  * ocaml-md5sums: Print object file's name when failing
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 24 Sep 2009 20:46:23 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 17:17:24 +0200
 
 dh-ocaml (0.9.0) unstable; urgency=low
 

-- 
dh-ocaml packaging