diff options
| -rw-r--r-- | setup_native/scripts/update.sh | 2 | ||||
| -rw-r--r-- | setup_native/scripts/userland.txt | 2 | ||||
| -rw-r--r-- | setup_native/source/packinfo/package_names.txt | 82 | ||||
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_office.txt | 28 | ||||
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_office_lang.txt | 60 | ||||
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_sdkoo.txt | 6 | ||||
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_ure.txt | 8 | ||||
| -rw-r--r-- | setup_native/source/packinfo/shellscripts_brand.txt | 8 | ||||
| -rw-r--r-- | setup_native/source/packinfo/shellscripts_core01.txt | 13 | ||||
| -rw-r--r-- | setup_native/source/win32/stwrapper/resource.rc | 14 | ||||
| -rw-r--r-- | setup_native/source/win32/stwrapper/stwrapper.cxx | 2 |
11 files changed, 104 insertions, 121 deletions
diff --git a/setup_native/scripts/update.sh b/setup_native/scripts/update.sh index 20b8bbae0292..2aa727944012 100644 --- a/setup_native/scripts/update.sh +++ b/setup_native/scripts/update.sh @@ -99,7 +99,7 @@ elevate() { update_pkg() { - ADMINFILE=`make_tempfile 'OpenOffice.org-Online-Update-admin'` + ADMINFILE=`make_tempfile 'LibreOffice-Online-Update-admin'` cat >> $ADMINFILE << EOF action=nocheck diff --git a/setup_native/scripts/userland.txt b/setup_native/scripts/userland.txt index 9983ab46fe16..8cd7a184bc1c 100644 --- a/setup_native/scripts/userland.txt +++ b/setup_native/scripts/userland.txt @@ -25,4 +25,4 @@ # #************************************************************************* -USERLANDPACKAGENAME=openoffice.org-userland-1.0-0.noarch.rpm +USERLANDPACKAGENAME=libreoffice-userland-1.0-0.noarch.rpm diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt index 7e7276c2fa40..86475e6f4146 100644 --- a/setup_native/source/packinfo/package_names.txt +++ b/setup_native/source/packinfo/package_names.txt @@ -1,46 +1,46 @@ -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for LibreOffice %OOOBASEVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for LibreOffice %OOOBASEVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs Cs dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da Da dictionary for %PRODUCTNAME %PRODUCTVERSION diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index fb04b347fcdf..24e455c0865c 100755 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -26,8 +26,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" findrequires = "find-requires-gnome.sh" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Gnome integration module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -41,8 +41,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "KDE integration module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "KDE integration module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -57,8 +57,8 @@ solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwr freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Core module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Core module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -73,8 +73,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Writer module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Writer module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -89,8 +89,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Calc module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Calc module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -105,8 +105,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Draw module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Draw module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -121,8 +121,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Impress module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Impress module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt index 3ac23d947295..ca2fda7d2d62 100755 --- a/setup_native/source/packinfo/packinfo_office_lang.txt +++ b/setup_native/source/packinfo/packinfo_office_lang.txt @@ -25,8 +25,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -41,8 +41,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -57,8 +57,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -73,8 +73,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -89,8 +89,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer" @@ -105,8 +105,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc" @@ -121,8 +121,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" @@ -137,8 +137,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw" @@ -153,30 +153,14 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math" End Start -module = "gid_Module_Langpack_Base" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" -packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base" -provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base" -requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" -copyright = "1999-2009 by OpenOffice.org" -solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" -destpath = "/opt" -packageversion = "%OOOPACKAGEVERSION" -pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base" -End - -Start module = "gid_Module_Langpack_Binfilter" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" @@ -185,8 +169,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilt requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" @@ -201,8 +185,8 @@ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineu requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt index 8fb9c53de80b..2855a1467de8 100755 --- a/setup_native/source/packinfo/packinfo_sdkoo.txt +++ b/setup_native/source/packinfo/packinfo_sdkoo.txt @@ -32,10 +32,10 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWbtoo packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" -copyright = "1999-2009 by OpenOffice.org" +copyright = "1999-2009 by OpenOffice.org Community" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Software Development Kit for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt index fd15f91a4380..a93bc4386d4e 100755 --- a/setup_native/source/packinfo/packinfo_ure.txt +++ b/setup_native/source/packinfo/packinfo_ure.txt @@ -30,9 +30,9 @@ module = "gid_Module_Root" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" -copyright = "2005-2009 by OpenOffice.org" +copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" +vendor = "The Document Foundation" description = "UNO Runtime Environment" destpath = "/opt" packageversion = "%UREPACKAGEVERSION" @@ -43,9 +43,9 @@ module = "gid_Module_Root_Ure_Hidden" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" -copyright = "2005-2009 by OpenOffice.org" +copyright = "2005-1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" +vendor = "The Document Foundation" description = "UNO Runtime Environment" destpath = "/opt" packageversion = "%UREPACKAGEVERSION" diff --git a/setup_native/source/packinfo/shellscripts_brand.txt b/setup_native/source/packinfo/shellscripts_brand.txt index 62039f504c32..8d52d5752fb1 100644 --- a/setup_native/source/packinfo/shellscripts_brand.txt +++ b/setup_native/source/packinfo/shellscripts_brand.txt @@ -13,7 +13,7 @@ SunOS) PRODUCTINSTALLLOCATION="$$BASEDIR" ;; Linux) - BASISPACKAGE=openoffice.org-core01 + BASISPACKAGE=libreoffice-core01 BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE` PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX" ;; @@ -23,11 +23,11 @@ Linux) esac # creating link to basis layer -if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ] +if [ -d $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION ] then - ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 else - ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s ../libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 fi exit 0 diff --git a/setup_native/source/packinfo/shellscripts_core01.txt b/setup_native/source/packinfo/shellscripts_core01.txt index 623e5e901be2..e81d611030c0 100644 --- a/setup_native/source/packinfo/shellscripts_core01.txt +++ b/setup_native/source/packinfo/shellscripts_core01.txt @@ -23,11 +23,11 @@ Linux) esac # creating link to ure -if [ -d $$UREDIR/openoffice.org/ure ] +if [ -d $$UREDIR/libreoffice/ure ] then - ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s $$UREDIR/libreoffice/ure $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 else - ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s ../ure $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 fi exit 0 @@ -59,11 +59,10 @@ Linux) ;; esac -if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] +if [ -h $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] then - rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null + rm -f $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null + rmdir $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION 2>/dev/null fi exit 0 diff --git a/setup_native/source/win32/stwrapper/resource.rc b/setup_native/source/win32/stwrapper/resource.rc index 7951547dcfaf..fa2ec6096589 100644 --- a/setup_native/source/win32/stwrapper/resource.rc +++ b/setup_native/source/win32/stwrapper/resource.rc @@ -76,25 +76,25 @@ VS_VERSION_INFO versioninfo block "040704E4" { // German StringTable - value "CompanyName", "Sun Microsystems, Inc.\0" + value "CompanyName", "The Document Foundation\0" value "FileDescription", "Service Tags Wrapper\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" value "OriginalFilename", "STCLIENT_WRAPPER.EXE\0" - value "InternalName", "stclient_wrapper\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" + value "InternalName", "stclient_wrapper\0" + value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" } #else block "040904E4" { // International StringTable - value "CompanyName", "Sun Microsystems, Inc.\0" - value "FileDescription", "Service Tags Wrapper\0" + value "CompanyName", "The Document Foundation\0" + value "FileDescription", "Service Tags Wrapper\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" value "OriginalFilename", "STCLIENT_WRAPPER.EXE\0" - value "InternalName", "stclient_wrapper\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" + value "InternalName", "stclient_wrapper\0" + value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" } #endif } diff --git a/setup_native/source/win32/stwrapper/stwrapper.cxx b/setup_native/source/win32/stwrapper/stwrapper.cxx index b75e8da4cf79..371651e59a2f 100644 --- a/setup_native/source/win32/stwrapper/stwrapper.cxx +++ b/setup_native/source/win32/stwrapper/stwrapper.cxx @@ -424,7 +424,7 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int ) _tcscat( lpCommandLine, TEXT( "\"" )); _tcscat( lpCommandLine, szParentProductName ); _tcscat( lpCommandLine, TEXT( "\"" )); - _tcscat( lpCommandLine, TEXT( " -m \"Sun Microsystems, Inc.\"" )); + _tcscat( lpCommandLine, TEXT( " -m \"The Document Foundation\"" )); _tcscat( lpCommandLine, TEXT( " -A " )); _tcscat( lpCommandLine, TEXT( "\"" )); _tcscat( lpCommandLine, GetOperatingSystemString() ); |