diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
| commit | 07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch) | |
| tree | 15568d84be2d77cb24edb7e9cc53fa0b1ceef820 /instsetoo_native | |
| parent | 23bfe8097571fcf5c9ac223100c2fef9087aad01 (diff) | |
| parent | b75801e6ace5eec09c5d04f2f0f9a373acc1a21c (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
configure.in
distro-configs/LibreOfficeMacOSX.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWin32.conf
download
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/gbuild/CppunitTest.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index d5121ad0bee0..bd8268e90dc2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -9,7 +9,7 @@ Globals UREPACKAGEVERSION 3.4.0 URELAYERVERSION 1 BASISROOTNAME LibreOffice - UNIXBASISROOTNAME libreoffice + UNIXBASISROOTNAME libreoffice3.4 SERVICETAG_PRODUCTNAME LibreOffice 3.4 SERVICETAG_PRODUCTVERSION 3.4 SERVICETAG_PARENTNAME LibreOffice 3.4 @@ -56,10 +56,10 @@ LibreOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.4.0 BASEPRODUCTVERSION 3.4 @@ -74,7 +74,7 @@ LibreOffice FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -121,10 +121,10 @@ LibreOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.4.0 BASEPRODUCTVERSION 3.4 @@ -138,7 +138,7 @@ LibreOffice_wJRE FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 GLOBALFILEGID gid_File_Lib_Vcl @@ -185,12 +185,12 @@ LibreOffice_Dev PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.4.0 BASEPRODUCTVERSION 3.4 @@ -208,7 +208,7 @@ LibreOffice_Dev FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -259,9 +259,9 @@ URE PACKAGEVERSION 3.4 PACKAGEREVISION 1 PRODUCTEXTENSION - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -299,12 +299,12 @@ LibreOffice_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK @@ -345,14 +345,14 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} BASISPACKAGEPREFIX libobasis-dev UREPACKAGEPREFIX lodev SOLSUREPACKAGEPREFIX lodev @@ -397,10 +397,10 @@ OxygenOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.4.0 BASEPRODUCTVERSION 3.4 @@ -415,7 +415,7 @@ OxygenOffice FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 GLOBALFILEGID gid_File_Lib_Vcl @@ -467,10 +467,10 @@ OxygenOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta2 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 + BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.4.0 BASEPRODUCTVERSION 3.4 @@ -484,7 +484,7 @@ OxygenOffice_wJRE FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 - PACKAGEREVISION {milestone} + PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 WITHJREPRODUCT 1 |