[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 +-
 patches/dev300/localize-pl-cygwin-paths.diff |   16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit e0c7375368cc673ce68b088ed1a04f795966bab6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri May 21 13:54:06 2010 +0300

    Fix localize-pl-cygwin-paths.diff and use it again

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 90b4ba1..3514e97 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -484,7 +484,7 @@ sfx-check-real-help-path.diff, i#81139, pmladek
 # display help correctly even when the files are symlinks
 xmlhelp-work-with-symlinks.diff, i#81138, pmladek
 
-# FIXME dev300-m77 localize-pl-cygwin-paths.diff, tml # RENAMED transex3 -> l10ntools
+localize-pl-cygwin-paths.diff, tml
 
 # Allow some technically illegal pathname components on Win32
 # (directories with trailing spaces or periods) because some SMB
diff --git a/patches/dev300/localize-pl-cygwin-paths.diff b/patches/dev300/localize-pl-cygwin-paths.diff
index c1b0060..bd417e8 100644
--- a/patches/dev300/localize-pl-cygwin-paths.diff
+++ b/patches/dev300/localize-pl-cygwin-paths.diff
@@ -9,8 +9,8 @@ Subject: [PATCH 117/878] localize-pl-cygwin-paths.diff
 
 diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
 index 122e443..66e0e06 100755
---- a/transex3/scripts/localize.pl
-+++ b/transex3/scripts/localize.pl
+--- l10ntools/scripts/localize.pl
++++ l10ntools/scripts/localize.pl
 @@ -407,8 +407,9 @@ sub merge_gsicheck{
          $command = "gsicheck";
      }
@@ -31,15 +31,6 @@ index 122e443..66e0e06 100755
              my $bFlag="";
              if( $bAll ) {$args .= " en-US";}
              else{
-@@ -543,7 +544,7 @@ sub collectfiles{
- #            if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log";  }
- #            else                  { $args .= " >& $my_localize_log"; }
- #        }
--        if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
-+        if ( $bVerbose ) { print STDOUT "localize.pl running $command.$args.\n"; }
-         
-         my $rc = system( $command.$args );
- 
 @@ -1173,6 +1174,19 @@ sub usage{
      print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into the sourcecode ) \n";
  }
@@ -60,6 +51,3 @@ index 122e443..66e0e06 100755
  #            my $line           = defined $_ ? $_ : '';
  #            my $leftpart       = defined $2 ? $2 : '';
  #            my $prj            = defined $3 ? $3 : '';
--- 
-1.7.0.1
-