[ooo-build-commit] Branch 'ooo/OOO310' - 2 commits - solenv/bin solenv/inc

[Jan Holesovsky]

 solenv/bin/modules/installer/epmfile.pm |   12 ++++++++----
 solenv/inc/minor.mk                     |    6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 07288e894bdef7e63eed4a8cc4bc3c5584d74474
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Jul 27 23:53:17 2009 +0000

    OOO310

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f25ab41..b08de40 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=310
-RSCREVISION=310m16(Build:9413)
-BUILD=9413
-LAST_MINOR=m16
+RSCREVISION=310m17(Build:9415)
+BUILD=9415
+LAST_MINOR=m17
 SOURCEVERSION=OOO310
commit 47b32f792659d8eb472c20aad245c85aeece4aee
Author: Kurt Zenker <kz at openoffice.org>
Date:   Mon Jul 27 23:10:07 2009 +0000

    CWS-TOOLING: integrate CWS so91s10u8
    2009-07-21 09:12:39 +0200 releng  r274160 : #b6835838#
    2009-07-21 09:10:03 +0200 releng  r274158 : #b6836360#
    2009-06-26 16:18:53 +0200 releng  r273427 : #i10000# remove wrong elsif lines
    2009-06-26 13:54:07 +0200 obo  r273408 : #b6836339#,#b6835838#,#b6836573#,#b6836360#,#b6840384#,#b6836711#,#159633#,#159138#,#b6838895#,#b6836340#,#b6836712# initial changes

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index e9f6166..ab52036 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1914,10 +1914,8 @@ sub include_patchinfos_into_pkginfo
         $newline = "SUNW_REQUIRES=" . $requires . "\n";
         add_one_line_into_file($changefile, $newline, $filename);
     }
-
     $newline = "SUNW_PATCH_PROPERTIES=\n"; 
     add_one_line_into_file($changefile, $newline, $filename);
-
     # $newline = "SUNW_PKGTYPE=usr\n"; 
     # add_one_line_into_file($changefile, $newline, $filename);
 
@@ -1937,14 +1935,20 @@ sub get_solaris_language_for_langpack
     $sollanguage =~ s/\-/\_/;
     
     if ( $sollanguage eq "de" ) { $sollanguage = "de"; }
+    elsif ( $sollanguage eq "en_US" ) { $sollanguage = "en_AU,en_CA,en_GB,en_IE,en_MT,en_NZ,en_US,en_US.UTF-8"; }
     elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; }
     elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; }
+    elsif ( $sollanguage eq "hu" ) { $sollanguage = "hu_HU"; }
     elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; }
+    elsif ( $sollanguage eq "nl" ) { $sollanguage = "nl_BE,nl_NL"; }
+    elsif ( $sollanguage eq "pl" ) { $sollanguage = "pl_PL"; }
     elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; }
+    elsif ( $sollanguage eq "pt" ) { $sollanguage = "pt_PT"; }
     elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; }
+    elsif ( $sollanguage eq "ru" ) { $sollanguage = "ru_RU"; }
     elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; }
     elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; }
-    elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN,zh_CN.GB18030,zh.UTF-8"; }
+    elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN.GB18030,zh.UTF-8"; }
     elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; }
     
     return $sollanguage;
@@ -2139,7 +2143,7 @@ sub prepare_packages
         if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); }
         if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); }
         if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); }
-        if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
+        if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" ) && ( $onepackage->{'language'} ne "en-US" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
         installer::files::save_file($completefilename, $changefile);
     
         my $prototypefilename = $packagename . ".prototype";