Bug#468237: libembperl-perl: diff for NMU version 2.2.0-3.1

[Marc Brockschmidt]

tags 468237 + patch
thanks

Hi,

Attached is the diff for my libembperl-perl 2.2.0-3.1 NMU, based on
Niko's patch.

Marc

diff -u libembperl-perl-2.2.0/test.pl libembperl-perl-2.2.0/test.pl
--- libembperl-perl-2.2.0/test.pl
+++ libembperl-perl-2.2.0/test.pl
@@ -45,6 +45,7 @@
 # input_escmode =>
 # portadd =>
 
+my $newperl = ($] >= 5.009 ? 1 : 0);
 @testdata = (
     'ascii' => { },
     'pure.htm' => {
@@ -62,25 +63,25 @@
         },
     'error.htm' => { 
         'repeat'     => 3,
-        'errors'     => 8,
+        'errors'     => 8+$newperl,
         'version'    => 1,
         },
     'error.htm' => { 
         'repeat'     => 3,
-        'errors'     => 5,
+        'errors'     => 5+$newperl,
         'version'    => 2,
         'cgi'        => 0,
         },
     'error.htm' => { 
         'repeat'     => 3,
-        'errors'     => 5,
+        'errors'     => 5+$newperl,
         'version'    => 2,
         'cgi'        => 1,
         'condition'  => '!$MP2',
         },
     'error.htm' => { 
         'repeat'     => 3,
-        'errors'     => 6,
+        'errors'     => 6+$newperl,
         'version'    => 2,
         'cgi'        => 1,
         'condition'  => '$MP2',
@@ -110,19 +111,19 @@
         },
     'errdoc/errdoc.htm' => { 
         'option'     => '262144',
-        'errors'     => 6,
+        'errors'     => 6+$newperl,
         'version'    => 1,
         'cgi'        => 0,
         },
     'errdoc/errdoc.htm' => { 
         'option'     => '262144',
-        'errors'     => 5,
+        'errors'     => 5+$newperl,
         'version'    => 2,
         'modperl'    => 1,
         },
     'errdoc/epl/errdoc2.htm' => { 
         'option'     => '262144',
-        'errors'     => 6,
+        'errors'     => 6+$newperl,
         'version'    => 1,
         'cgi'        => 0,
         'noloop'     => 1,
@@ -130,7 +131,7 @@
         },
     'errdoc/epl/errdoc2.htm' => { 
         'option'     => '262144',
-        'errors'     => 5,
+        'errors'     => 5+$newperl,
         'version'    => 2,
         'cgi'        => 0,
         'noloop'     => 1,
@@ -2263,7 +2264,7 @@
                 				}) ;
 		$t_exec += 0 ; # Embperl::Clock () - $t1 ; 
 		    
-                $err = CheckError ($EP2?5:8) if ($err == 0) ;
+                $err = CheckError (($EP2?5:8)+$newperl) if ($err == 0) ;
 
                 if (@errors != ($EP2?4:12))
                     {
diff -u libembperl-perl-2.2.0/debian/changelog libembperl-perl-2.2.0/debian/changelog
--- libembperl-perl-2.2.0/debian/changelog
+++ libembperl-perl-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+libembperl-perl (2.2.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch from Niko Tyni to allow the test suite to succeed with perl5.10.
+    (Closes: #468237)
+
+ -- Marc 'HE' Brockschmidt <[EMAIL PROTECTED]>  Fri, 09 May 2008 11:26:02 +0200
+
 libembperl-perl (2.2.0-3) unstable; urgency=low
 
   * Dropped build-dependency on (and support for) Apache 1.3 (Closes:
only in patch2:
unchanged:
--- libembperl-perl-2.2.0.orig/test/cmp/errdoc2.htm
+++ libembperl-perl-2.2.0/test/cmp/errdoc2.htm
@@ -24,7 +24,8 @@
 ^syntax error at 
 ^syntax error at 
 ^syntax error at 
-^}&quot;</td></tr>
+^}&quot;(</td></tr>)?
+^-Missing right curly or square bracket at .*?errdoc2.htm line \d+, at end of line</td></tr>
 </table>
 
 </body>
only in patch2:
unchanged:
--- libembperl-perl-2.2.0.orig/test/cmp/error.htm
+++ libembperl-perl-2.2.0/test/cmp/error.htm
@@ -32,6 +32,7 @@
 ^<br>&nbsp;&nbsp;&nbsp;&nbsp;                                
 ^-<br>&nbsp;&nbsp;&nbsp;&nbsp;                                
 ^-<br>&nbsp;&nbsp;&nbsp;&nbsp;}
+^-<br>&nbsp;&nbsp;&nbsp;&nbsp;Missing right curly or square bracket at .*?error.htm line \d+, at end of line
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 </td></tr>
 </table>