[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.5.0-17-gfce4e39

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6e28e3bcd77109ababdced1e03fc6219737981af
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jul 21 14:39:02 2009 +0000

    Fix trailing white spaces.

diff --git a/ocaml-md5sums/ocaml-md5sums b/ocaml-md5sums/ocaml-md5sums
index a63785f..e9819ce 100755
--- a/ocaml-md5sums/ocaml-md5sums
+++ b/ocaml-md5sums/ocaml-md5sums
@@ -17,7 +17,7 @@ $ocamlplugininfo="ocamlplugininfo" unless defined($ocamlplugininfo);
 
 use constant VERSION => "0.1";
 
-sub info 
+sub info
 {
   print STDERR (@_, "\n") if $verbose >= 1;
 };
@@ -32,11 +32,11 @@ package OCamlMD5Sums::File;
 use warnings;
 use strict;
 
-sub new 
+sub new
 {
-  my ($class, 
-      $dev, 
-      $runtime, 
+  my ($class,
+      $dev,
+      $runtime,
       $version,
       @nodefined) = @_;
 
@@ -55,7 +55,7 @@ sub new
   return $self;
 };
 
-sub add_unit 
+sub add_unit
 {
   my ($self, $symbol_table, $unit_name, $md5) = @_;
   my $key = "$md5+$unit_name";
@@ -65,7 +65,7 @@ sub add_unit
   }
   else
   {
-    main::debug "Adding unit $unit_name to $symbol_table" 
+    main::debug "Adding unit $unit_name to $symbol_table"
       unless exists $self->{$symbol_table}{$key};
     $self->{$symbol_table}{$key} = "none";
   };
@@ -78,7 +78,7 @@ sub get_unit
   die "$key doesn't have the right format";
 };
 
-sub squeeze_imported 
+sub squeeze_imported
 {
   my ($self) = @_;
 
@@ -166,7 +166,7 @@ sub add_object
 sub read_dump
 {
   my ($self, $file) = @_;
-  
+
   my $symbol_table = undef;
 
   main::info "Load from dump $file";
@@ -193,7 +193,7 @@ sub write_dump
   my ($self, $file) = @_;
 
   open(FH,">", $file) || die "Cannot open file $file";
-  
+
   print FH "dev $self->{dev}\n";
   print FH "runtime $self->{runtime}\n";
   print FH "version $self->{version}\n";
@@ -218,18 +218,18 @@ sub print
   {
     my ($unit_name, $md5) = $self->get_unit("defined", $_);
     print
-      (join 
+      (join
         (" ",
-         $md5, 
-         $unit_name, 
-         $self->{dev}, 
-         $self->{runtime}, 
+         $md5,
+         $unit_name,
+         $self->{dev},
+         $self->{runtime},
          $self->{version}),
          "\n");
   };
 };
 
-sub load_assign 
+sub load_assign
 {
   my ($self, $key, $b) = @_;
   my $a = $self->{$key};
@@ -252,7 +252,7 @@ sub load_assign
   };
 };
 
-sub load 
+sub load
 {
   my ($self, $file) = @_;
   main::debug "Load $file";
@@ -270,8 +270,8 @@ sub load
   $self->{file} = $file;
 };
 
-# String representation 
-sub to_string 
+# String representation
+sub to_string
 {
   my ($self) = @_;
   if (defined($self->{file}))
@@ -280,7 +280,7 @@ sub to_string
   }
   else
   {
-    return 
+    return
       $self->{dev}.
       ($self->{runtime} ne "-" ? "/".$self->{runtime} : "").
       ($self->{version} ne "-" ? " v".$self->{version} : "");
@@ -343,7 +343,7 @@ sub print_depends
   my ($self) = @_;
 
   print "$_->{dev} $_->{runtime} $_->{version}\n"
-    foreach (@{$self->{depends}}); 
+    foreach (@{$self->{depends}});
 
   foreach (keys(%{$self->{imported}}))
   {
@@ -353,7 +353,7 @@ sub print_depends
       warn $self->to_string().
            " doesn't resolve dependency on unit ".
            $unit_name.
-           "\n" 
+           "\n"
            # MD5 = 0 means that we encounter an object which
            # .cmxa has been used instead of its .cmx
            unless $md5 eq "00000000000000000000000000000000";
@@ -411,17 +411,17 @@ my @nodefined = ();
 
 sub process_not_option
 {
-  if (defined($action)) 
+  if (defined($action))
   {
-    push @objects, @_; 
+    push @objects, @_;
   }
-  else 
+  else
   {
     $action = $_[0];
   };
 }
 
-sub get_objects 
+sub get_objects
 {
   my ($already_loaded) = @_;
   return <STDIN> unless @objects > 0 || $already_loaded;
@@ -453,11 +453,11 @@ if ($print_version)
 
 die "No action\n" unless defined($action);
 
-if ($action eq "compute" || $action eq "dep") 
+if ($action eq "compute" || $action eq "dep")
 {
-  my $md5sums = 
-    OCamlMD5Sums::File->new 
-      ($package_dev, 
+  my $md5sums =
+    OCamlMD5Sums::File->new
+      ($package_dev,
        $package_runtime,
        $package_version,
        @nodefined);
@@ -476,7 +476,7 @@ if ($action eq "compute" || $action eq "dep")
   {
     $md5sums->print();
   }
-  else # dep 
+  else # dep
   {
     foreach my $md5sums_dir (@md5sums_dirs)
     {

-- 
dh-ocaml packaging