[SCM] Debian packaging of libxml-bare-perl branch, master, updated. 8b7d44db610effb84244ad7aecc642dc40a68e78

[gregor herrmann]

The following commit has been merged in the master branch:
commit 02af63f70e360859c0e52e68ea660ca0e2cc576f
Merge: 5c0aa8efc9b28e291420de30ddc6e0a91a811bb5 aef235e995306138a5aa751abe467caeac947eaa
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Feb 11 20:26:31 2012 +0100

    Merge tag 'upstream/0.47'
    
    Upstream version 0.47

diff --combined makebench.PL
index 3b9b297,59602c2..59602c2
mode 100644,100755..100644
--- a/makebench.PL
+++ b/makebench.PL
@@@ -98,7 -98,7 +98,7 @@@ foreach my $part ( @parts ) 
      $type = $1;
    }
    #print "[$type $module]\n";
-   
+ 
    if( $type eq 'c' ) {
      $part =~ s/c\n//g;
      $part = "##".$part."##";
@@@ -108,11 -108,11 +108,11 @@@
      next;
    }
    if( $type eq '0' ) {
-     
+ 
      if( $module ) {
        $part =~ s/(#0)\W*.*/$1/;
      }
-     
+ 
      while( $part =~ m/(require [A-Za-z\:]+;)/g ) {
        my $req = $1;
        if( !$module ) {
@@@ -123,17 -123,17 +123,17 @@@
        push( @requires, $req );
      }
      $part =~ s/require [A-Za-z\:]+;\n//g;
-     
+ 
      $part = "##".$part."##";
      $part =~ s/^##[#0 \n]+//;
      $part =~ s/[ \n]+##$//;
-     
+ 
      print OUT "
      if( \$ARGV[0]*1 >= $i ) {
        (\$s, \$usec) = gettimeofday();
        if( eval( '@requires' ) ) {
          (\$s2, \$usec2) = gettimeofday();
-         
+ 
  $part
  
          (\$s3, \$usec3) = gettimeofday();
@@@ -144,11 -144,11 +144,11 @@@
      ";
    }
    if( $type eq '-' ) {
-     
+ 
      if( $module ) {
        $part =~ s/(#[\-\0\+])\W*.*/$1/;
      }
-     
+ 
      while( $part =~ m/(require [A-Za-z\:]+;)/g ) {
        my $req = $1;
        if( !$module ) {
@@@ -159,17 -159,17 +159,17 @@@
        push( @requires, $req );
      }
      $part =~ s/require [A-Za-z\:]+;\n//g;
-     
+ 
      $part = "##".$part."##";
      $part =~ s/^##[#\- \n]+//;
      $part =~ s/[ \n]+##$//;
-     
+ 
      print OUT "
      if( \$ARGV[0] eq '$i' ) {
        (\$s, \$usec) = gettimeofday();
        if( eval( '@requires' ) ) {
          (\$s2, \$usec2) = gettimeofday();
-         
+ 
  $part
  
          (\$s3, \$usec3) = gettimeofday();
@@@ -185,9 -185,9 +185,9 @@@
      $part =~ s/[ \n]+##$//;
      print OUT "
      if( \$ARGV[0] eq '$i' ) {
-     
+ 
  $part
-     
+ 
      }
      ";
    }
@@@ -197,9 -197,9 +197,9 @@@
      $part =~ s/[ \n]+##$//;
      print OUT "
      #if( \$ARGV[0] eq '$i' ) {
-     
+ 
  $part
-     
+ 
      #}
      ";
    }
@@@ -220,9 -220,9 +220,9 @@@ sub unload 
  sub timeit {
    my \$name = shift;
    my \$base = shift;
-   \$sa = \$s2-\$s + ((\$usec2-\$usec)/1000000); 
-   \$sb = \$s3-\$s2 + ((\$usec3-\$usec2)/1000000); 
-   \$sc = \$s3-\$s + ((\$usec3-\$usec)/1000000); 
+   \$sa = \$s2-\$s + ((\$usec2-\$usec)/1000000);
+   \$sb = \$s3-\$s2 + ((\$usec3-\$usec2)/1000000);
+   \$sc = \$s3-\$s + ((\$usec3-\$usec)/1000000);
    if( \$base ) {
      \$base1 = \$sa;
      \$base2 = \$sb;

-- 
Debian packaging of libxml-bare-perl