[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/1.0.0-1-g8cfe718

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 8cfe718a7e48f62e73a1c404ed898db6bb126439
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Jun 22 15:19:29 2011 -0500

    Added patch as discussed in the ML

diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index 37074f7..bfd4114 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -251,8 +251,11 @@ foreach (@{$dh{DOPACKAGES}}) {
   if ($fn && -e $fn)
   {
     open(FH, "<", $fn);
-    my @nodef = @{$nodefined{$_}} if exists $nodefined{$_};
-    push(@nodef,<FH>);
+    my @nodef = ();
+    @nodef = @{$nodefined{$_}} if exists $nodefined{$_};
+    my @lines = <FH>;
+    chomp(@lines);
+    push(@nodef, at lines);
     $nodefined{$_} = \@nodef;
   }
 };
@@ -296,6 +299,15 @@ foreach (keys(%dev_packages), @binary_packages) {
   };
 };
 
+sub nodefined_args ($)
+{
+  my $package = shift;
+  my $args = "";
+  $args .= join(" ",map {("--nodefined", $_)} @{$nodefined{$package}})
+    if exists $nodefined{$package};
+  return ($args);
+}
+
 verbose_print "+++ Generate .olist.debhelper files +++";
 sub test_bytecode ($)
 {
@@ -369,8 +381,7 @@ foreach my $package (keys(%dev_packages)) {
   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};
+  $local_flags .= " ". nodefined_args($package);
 
   # compute md5sums files
   doit(qw/mkdir -p/, dirname $md5sums_fn);
@@ -455,7 +466,8 @@ foreach my $package (@binary_packages) {
   delsubstvar $package, "ocaml:Depends";
 
   # Compute deps
-  my $cmd = "$omd5 $flags --package $package dep < $olist{$package}";
+  my $local_flags = nodefined_args($package);
+  my $cmd = "$omd5 $flags $local_flags --package $package dep < $olist{$package}";
   verbose_print "$cmd";
   if (!$dh{NO_ACT})
   {
diff --git a/debian/changelog b/debian/changelog
index 188ea14..bf1ce36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dh-ocaml (1.0.1) unstable; urgency=low
+
+  * Added patch to dh_ocaml:
+    + Fix parsing of .onodefine files.
+    + Pass --nodefined option during the computation 
+      of binary package dependencies.
+  * Added myself (Romain Beauxis) as uploader.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 22 Jun 2011 15:17:23 -0500
+
 dh-ocaml (1.0.0) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/control b/debian/control
index 70c0afb..3b72448 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>,
  Sylvain Le Gall <gildor at debian.org>,
- Ralf Treinen <treinen at debian.org>
+ Ralf Treinen <treinen at debian.org>,
+ Romain Beauxis <toots at rastageeks.org>
 Build-Depends:
  debhelper (>= 8)
 Build-Depends-Indep:

-- 
dh-ocaml packaging