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

René Engelhard rene at kemper.freedesktop.org
Mon Nov 30 19:05:01 PST 2009


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

New commits:
commit 68904e6eaa3ed98bfcf8b431408fa7d6ea6d24a2
Author: Rene <rene at debian.org>
Date:   Tue Dec 1 03:45:16 2009 +0100

    handle patch 2.6
    
    * patches/apply.pl.in: allow also two-digit patch versions

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


More information about the ooo-build-commit mailing list