[ooo-build-commit] .: bin/a2az.pl bin/localize-ooo bin/Makefile.am bin/unpack

[Andras Timar]

 bin/Makefile.am  |    1 -
 bin/a2az.pl      |   54 ------------------------------------------------------
 bin/localize-ooo |   10 ----------
 bin/unpack       |   17 -----------------
 4 files changed, 82 deletions(-)

New commits:
commit 982081d99e4734123757a5c8856273ea4d9dc760
Author: Andras Timar <timar at fsf.hu>
Date:   Sat May 1 14:03:40 2010 +0200

    a2az.pl hack is no longer needed
    
    StarOffice has been renamed to Oracle Open Office. Hungarian definite
    article is the same for OOO and OOo therefore upstream and downstream
    Hungarian translations are in sync now.
    
    * bin/Makefile.am:
    * bin/a2az.pl:
    * bin/localize-ooo:
    * bin/unpack:

diff --git a/bin/Makefile.am b/bin/Makefile.am
index e33df9d..d3be254 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,7 +4,6 @@ script_files = \
 	add_acor.py \
 	amt-license-patch \
 	applyflags \
-	a2az.pl \
 	bash-completion.in \
 	build-galleries \
 	build-ooo \
diff --git a/bin/a2az.pl b/bin/a2az.pl
deleted file mode 100755
index 6aa74d1..0000000
--- a/bin/a2az.pl
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/perl -w
-
-# This script changes the definite article of ProductName
-
-use strict;
-
-my $sdffile1 = $ARGV[0]; 
-if (!$sdffile1) {die "Usage: a2az.pl <SDF file>\n";}
-
-         #        (                          leftpart                                                     )        (         rightpart                                   )    
-         #           prj      file     dummy     type      gid        lid        helpid   pform     width     lang      text     helptext  qhelptext  title    timestamp
-my $sdf_regex  = "((([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t])*\t([^\t]*)\t([^\t]*))\t([^\t]*)\t(([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t)([^\t]*))";
-
-
-open FILE1 , "< $sdffile1" or die "Can't open '$sdffile1'\n";
-
-while( <FILE1>){
-         if( /$sdf_regex/ ){
-            my $lang           = defined $12 ? $12 : '';
-            my $prj            = defined $3 ? $3 : '';
-            if ($lang eq "hu") {
-              if ($prj ne "databaseext" && 
-                  $prj ne "embeddedobj" && 
-                  $prj ne "extras_full" && 
-                  $prj ne "instset_native" && 
-                  $prj ne "lingu" && 
-                  $prj ne "macromigration" && 
-                  $prj ne "migrationanalysis" && 
-                  $prj ne "offmgr" && 
-                  $prj ne "readme" && 
-                  $prj ne "setup2" && 
-                  $prj ne "syncaccess" && 
-                  $prj ne "tab" && 
-                  $prj ne "scp2so" && 
-                  $prj ne "customres") {
-                   s/([ 	~">][Aa]) %PRODUCTNAME/$1z %PRODUCTNAME/g;
-                   s/([ 	~">][Aa]) \\<emph\\>%PRODUCTNAME/$1z \\<emph\\>%PRODUCTNAME/g;
-                   s/([ 	~">][Aa]) \\<item type=\\\"productname\\\"\\>%PRODUCTNAME/$1z \\<item type=\\\"productname\\\"\\>%PRODUCTNAME/g;
-                   s/([ 	~">][Aa]) %productname/$1z %productname/g;
-                   s/([ 	~">][Aa]) \$\[officename\]/$1z \$\[officename\]/g;
-                   s/([ 	~">][Aa]) \$\{PRODUCT_NAME\}/$1z \$\{PRODUCT_NAME\}/g;
-                   s/([ 	~">][Aa]) \\<emph\\>\$\[officename\]/$1z \\<emph\\>\$\[officename\]/g;
-                   s/([ 	~">][Aa]) \[ProductName\]/$1z \[ProductName\]/g;
-                   s/\\nA %PRODUCTNAME/\\nAz %PRODUCTNAME/g;
-              }
-            };
-         }
-         print $_;
-}
-
-close(FILE1);
-
-exit 0;
-
diff --git a/bin/localize-ooo b/bin/localize-ooo
index 734e15c..6232092 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -148,16 +148,6 @@ sed -e 's/source\\ooo\\module_langpack\.ulf/source\\extensions\\module_extension
 rm $sdf_langpack
 echo "done!"
 
-# workaround for i#56622, n#210797
-if test "$hungarian_updated" = "yes" ; then
-    echo "Fixing Hungarian strings: OOo vs. SO"
-    for file in `find $OOBUILDDIR/l10n/source/hu/ -type f -name "localize.sdf"` ; do
-        echo "Making Hungarian a -> az conversion on $file..."
-        $TOOLSDIR/bin/a2az.pl $file >$file.a2az
-        mv $file.a2az $file
-    done
-fi
-
 echo "Processing non language specific files:"
 # apply lang-non-specific sdf files
 # the files "any-name-<lang>.sdf" are ignored because they are already processed above
diff --git a/bin/unpack b/bin/unpack
index 76108d6..ceb16d7 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -351,23 +351,6 @@ echo "$CVSTAG" > "$OOBUILDDIR/.tag"
 echo "Fixing unfortunate snafus"
 cd $BUILDDIR
 
-# workaround for i#56622, n#210797
-
-if test "z$PIECE" = "z"; then
-case "$OOO_LANGS" in
-*\ hu\ *|*\ hu|hu\ *|hu)
-    echo "Fixing Hungarian strings: OOo vs. SO"
-    if [ -d $OOBUILDDIR/l10n ]; then
-	for file in `find $OOBUILDDIR/l10n -type f -name "localize.sdf"` ; do
-	    chmod 644 $file
-	    $TOOLSDIR/bin/a2az.pl $file >$file.a2az
-	    mv $file.a2az $file
-	done
-    fi
-    ;;
-esac
-fi
-
 # workaround for i#95634, bnc#571489
 
 if test "z$PIECE" = "z"; then