[ooo-build-commit] 2 commits - bin/openoffice-xlate-lang patches/dev300

[René Engelhard]

 bin/openoffice-xlate-lang |   21 ++++++++-------------
 patches/dev300/apply      |    5 +++--
 2 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 374f2b7edd4449d0d28532d65975a541083cee98
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 26 16:26:41 2009 +0100

    armeabi-softfp-buildfix.diff is in m66

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f2f1d6c..08547a8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1178,11 +1178,12 @@ build-enable-boost-1.36.diff, i#105772, pmladek
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
 
-armeabi-softfp-buildfix.diff, i#105302, doko
-
 # support db4.8
 db4.8.diff, rengelha
 
+[ BuildBits < dev300-m66 ]
+armeabi-softfp-buildfix.diff, i#105302, doko
+
 [ BuildBits >= dev300-m60 < ooo320-m1 < dev300-m62 ]
 instsetoo-native-fix-system-python.diff, i#105663, rengelha
 
commit e3e67248519ee08600c087ae288848987f765a8a
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 26 16:16:15 2009 +0100

    remove langauages removed upstream in m6; adapt for xx-IN->xx change
    
    * bin/openoffice-xlate-lang:

diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang
index f1a93b3..f8a32fb 100755
--- a/bin/openoffice-xlate-lang
+++ b/bin/openoffice-xlate-lang
@@ -116,7 +116,7 @@ __DATA__
 :bn:bengali
 :bs:bosnian
 :en-GB:english_british
-:gu-IN:gujarati
+:gu:gujarati
 :hr:croatian
 :km:khmer
 :ku:kurdish
@@ -128,7 +128,6 @@ __DATA__
 :vi:vietnamese
 :ns:northern_sotho
 :ss:swazi
-:sr-CS:serbian
 :sr:serbian
 :ve:venda
 :ts:tsonga
@@ -142,21 +141,18 @@ __DATA__
 :bs-BA:bosnian
 :en-ZA:english_southafrican
 :mk:macedonian
-:lo:lao
-:as-IN:assamese
-:ml-IN:malayalam
-:mr-IN:marathi
-:or-IN:oriya
-:ur-IN:urdu
+:as:assamese
+:ml:malayalam
+:mr:marathi
+:or:oriya
+:ur:urdu
 :fa:farsi
 :lv:latvian
 :nr:ndebele
 :ne:nepalese
-:sh-YU:serbian
 :sh:serbian
-:te-IN:telugu
-:ti-ER:tigrinya
-:ta-IN:tamil
+:te:telugu
+:ta:tamil
 :tg:tajik
 :ka:georgian
 :eo:esperanto
@@ -164,7 +160,6 @@ __DATA__
 :kk:kazahk
 :dz:dzongkha
 :kn:kannada
-:sw:swahili
 :gl:galician
 :uz:uzbek
 :oc:occitan