[ooo-build-commit] patches/apply.pl.in

[René Engelhard]

 patches/apply.pl.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 15eb3afa09c6ad0a56bccae289ef6c446fe556ee
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Dec 2 00:23:58 2009 +0100

    Revert "handle patch 2.6"
    
    This reverts commit 68904e6eaa3ed98bfcf8b431408fa7d6ea6d24a2.

diff --git a/patches/apply.pl.in b/patches/apply.pl.in
index 70dd3d5..5b8c8e4 100755
--- a/patches/apply.pl.in
+++ b/patches/apply.pl.in
@@ -921,8 +921,7 @@ sub is_old_patch_version()
 
     open ($Patch, "@GNUPATCH@ --version|") || die "Can't run patch: $!";
     $ver_line = <$Patch>;
-    $ver_line =~ m/\s+(\d+)\.(\d+)\.?(\d+)?/ ||
-    $ver_line =~ m/\s+(\d+)\.(\d+)?/ || die "Can't get patch version\n";
+    $ver_line =~ m/\s+(\d+)\.(\d+)\.?(\d+)?/ || die "Can't get patch version\n";
     if ( ( $1 > 2 ) ||
          ( $1 == 2 && $2 > 5 ) ||
          ( $1 == 2 && $2 == 5 && $3 >= 9 ) ) {