[ooo-build-commit] .: 8 commits - basctl/uiconfig extensions/source setup_native/scripts setup_native/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Sep 27 23:49:31 PDT 2010
basctl/uiconfig/basicide/menubar/menubar.xml | 2
extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 2
setup_native/scripts/update.sh | 2
setup_native/scripts/userland.txt | 2
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/osxdndinstall.png |binary
setup_native/source/mac/ooo/osxdndinstall_nologo.png |binary
setup_native/source/packinfo/package_names.txt | 82 +++++-----
setup_native/source/packinfo/packinfo_office.txt | 28 +--
setup_native/source/packinfo/packinfo_office_lang.txt | 48 ++---
setup_native/source/packinfo/packinfo_sdkoo.txt | 6
setup_native/source/packinfo/packinfo_ure.txt | 8
setup_native/source/packinfo/shellscripts_brand.txt | 8
setup_native/source/packinfo/shellscripts_core01.txt | 13 -
setup_native/source/win32/nsis/ooobanner.bmp |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
setup_native/source/win32/nsis/ooosdkbanner.bmp |binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
setup_native/source/win32/nsis/ooosetup.ico |binary
setup_native/source/win32/nsis/urebanner.bmp |binary
setup_native/source/win32/nsis/urebitmap.bmp |binary
setup_native/source/win32/stwrapper/resource.rc | 14 -
setup_native/source/win32/stwrapper/stwrapper.cxx | 2
23 files changed, 108 insertions(+), 109 deletions(-)
New commits:
commit 632d09fb53cfef80e5119eeeefff1cc8af7ea019
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Mon Sep 27 04:00:48 2010 +0200
Update Mac installer image and icon config
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index e722b54..4f65b81 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
index 7eb5c76..f50008f 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
index 7133e73..f50008f 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall_nologo.png and b/setup_native/source/mac/ooo/osxdndinstall_nologo.png differ
commit b99e4e1cf3c6e9d104de8c050add04cc866ef7f8
Author: Thorsten Behrens <thb at openoffice.org>
Date: Sun Sep 26 13:01:18 2010 +0200
Updated nsis installer icon from Chris
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
old mode 100755
new mode 100644
index 8a6ee67..bed4687
Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ
commit f29b3575c33218883696926cf62285b75f254c9a
Author: Thorsten Behrens <thb at openoffice.org>
Date: Sun Sep 26 05:34:45 2010 +0200
Shrunk NSIS banner image by three pixel
diff --git a/setup_native/source/win32/nsis/ooobanner.bmp b/setup_native/source/win32/nsis/ooobanner.bmp
index a453f1f..58665b5 100644
Binary files a/setup_native/source/win32/nsis/ooobanner.bmp and b/setup_native/source/win32/nsis/ooobanner.bmp differ
commit 4f4e350c72b924a3fb5b0a226011386b7196099c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Sep 24 13:40:05 2010 +0200
LibreOffice branding: some more win32 imagery tweaks
diff --git a/setup_native/source/win32/nsis/ooosdkbanner.bmp b/setup_native/source/win32/nsis/ooosdkbanner.bmp
index ab37b1f..a453f1f 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbanner.bmp and b/setup_native/source/win32/nsis/ooosdkbanner.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index 86a48d5..11acb28 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/urebanner.bmp b/setup_native/source/win32/nsis/urebanner.bmp
index 06b8ae0..a453f1f 100644
Binary files a/setup_native/source/win32/nsis/urebanner.bmp and b/setup_native/source/win32/nsis/urebanner.bmp differ
diff --git a/setup_native/source/win32/nsis/urebitmap.bmp b/setup_native/source/win32/nsis/urebitmap.bmp
index 654ad1f..11acb28 100755
Binary files a/setup_native/source/win32/nsis/urebitmap.bmp and b/setup_native/source/win32/nsis/urebitmap.bmp differ
commit a4dab474af084c30975660657d09bacf35dfb0c1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Sep 24 13:25:21 2010 +0200
Replace the "Help Support" menu item by the "License Information" one
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 9a40215..1c24216 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -81,7 +81,7 @@
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index 310e80f..a192414 100644
--- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -84,7 +84,7 @@
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:About"/>
commit 7242997a580c3ab95b8be38fd4ba990343877bbd
Author: Thorsten Behrens <thb at openoffice.org>
Date: Thu Sep 23 04:01:55 2010 +0200
new libreoffice artwork
diff --git a/setup_native/source/win32/nsis/ooobanner.bmp b/setup_native/source/win32/nsis/ooobanner.bmp
index ab37b1f..a453f1f 100644
Binary files a/setup_native/source/win32/nsis/ooobanner.bmp and b/setup_native/source/win32/nsis/ooobanner.bmp differ
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp
index c94c3cf..11acb28 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and b/setup_native/source/win32/nsis/ooobitmap.bmp differ
commit dc61b68fed16e8432d42befb71525f7ae10bc1c6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Sep 22 17:30:14 2010 +0200
LibreOffice branding: fix1
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index ca2fda7..8a79431 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -161,6 +161,22 @@ 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 = "The Document Foundation"
+description = "Base language module for LibreOffice %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"
commit b9ebd256348dc490ee78cd73144a7198d5474167
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Sep 22 15:32:13 2010 +0200
LibreOffice Branding: first cut
diff --git a/setup_native/scripts/update.sh b/setup_native/scripts/update.sh
index 176352d..1b3785b 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 9983ab4..8cd7a18 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 7e7276c..86475e6 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 fb04b34..24e455c 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 3ac23d9..ca2fda7 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 8fb9c53..2855a14 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 fd15f91..a93bc43 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 62039f5..8d52d57 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 623e5e9..e81d611 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 7951547..fa2ec60 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 85992b9..0a6735d 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() );
More information about the ooo-build-commit
mailing list