INTEGRATION: CWS native141 (1.4.8); FILE MERGED

2008/04/09 16:42:55 is 1.4.8.2: #i88109# no packages at nodes in java installer and new install order
2008/04/02 16:09:22 is 1.4.8.1: #i87732# version number in package names

1 files changed, 56 insertions, 56 deletions

diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 982e749a017a..83722ac83519 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -17,13 +17,13 @@
 # End
 
 Start
-module = "gid_Module_Langpack_Root"
-solarispackagename = "openofficeorg-%LANGUAGESTRING"
-# solarisrequires = "openofficeorg-core01"
-packagename = "openoffice.org-%LANGUAGESTRING"
+module = "gid_Module_Langpack_Basis"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-core01"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING"
-provides = "openofficeorg-%LANGUAGESTRING"
-# requires = "openoffice.org-core01"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+requires = "openoffice.org%OOOBASEVERSION-core01"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -33,12 +33,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Fonts"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-fonts"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-fonts"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-fonts"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-fonts"
-provides = "openofficeorg-%LANGUAGESTRING-fonts"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -48,12 +48,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Resource"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-res"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-res"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-res"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-res"
-provides = "openofficeorg-%LANGUAGESTRING-res"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -63,12 +63,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Help"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-help"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-help"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-help"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-help"
-provides = "openofficeorg-%LANGUAGESTRING-help"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -78,12 +78,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Writer"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-writer"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-writer"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-writer"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-writer"
-provides = "openofficeorg-%LANGUAGESTRING-writer"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -93,12 +93,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Calc"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-calc"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-calc"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-calc"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-calc"
-provides = "openofficeorg-%LANGUAGESTRING-calc"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -108,12 +108,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Impress"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-impress"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-impress"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-impress"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-impress"
-provides = "openofficeorg-%LANGUAGESTRING-impress"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -123,12 +123,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Draw"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-draw"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-draw"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-draw"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-draw"
-provides = "openofficeorg-%LANGUAGESTRING-draw"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -138,12 +138,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Math"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-math"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-math"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-math"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-math"
-provides = "openofficeorg-%LANGUAGESTRING-math"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -153,12 +153,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Base"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-base"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-base"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-base"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-base"
-provides = "openofficeorg-%LANGUAGESTRING-base"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"
@@ -168,12 +168,12 @@ End
 
 Start
 module = "gid_Module_Langpack_Onlineupdate"
-solarispackagename = "openofficeorg-%LANGUAGESTRING-onlineupd"
-solarisrequires = "openofficeorg-%LANGUAGESTRING"
-packagename = "openoffice.org-%LANGUAGESTRING-onlineupd"
+solarispackagename = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+solarisrequires = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
 linuxreplaces = "openofficeorg-%LANGUAGESTRING-onlineupd"
-provides = "openofficeorg-%LANGUAGESTRING-onlineupd"
-requires = "openoffice.org-%LANGUAGESTRING"
+provides = "openofficeorg%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+requires = "openoffice.org%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "OpenOffice.org"