[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 13 commits - instsetoo_native/util setup_native/source solenv/bin sysui/desktop
Ariel Constenla-Haile
arielch at apache.org
Wed May 29 23:07:53 PDT 2013
instsetoo_native/util/openoffice.lst | 10
setup_native/source/packinfo/package_names.txt | 93 +-
setup_native/source/packinfo/packinfo_brand.txt | 78 +-
setup_native/source/packinfo/packinfo_office.txt | 571 +++++++++---------
setup_native/source/packinfo/packinfo_office_lang.txt | 115 +--
setup_native/source/packinfo/packinfo_sdkoo.txt | 9
setup_native/source/packinfo/packinfo_ure.txt | 6
solenv/bin/modules/installer/packagelist.pm | 2
sysui/desktop/freedesktop/freedesktop-menus.spec | 5
sysui/desktop/mandriva/mandriva-menus.spec | 5
sysui/desktop/redhat/redhat-menus.spec | 5
sysui/desktop/suse/suse-menus.spec | 5
12 files changed, 485 insertions(+), 419 deletions(-)
New commits:
commit 7eb652cb229e05281ed7939041275c7c75dcc1b7
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:44 2013 +0000
i121968 - Obsoletes openoffice.org3
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 7612796..3579487 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -31,7 +31,7 @@ packagename = "%UNIXPACKAGENAME"
# openoffice.org3-dict-en|es|fr (installed by OOo 3.3.0)
# ooobasis3.*-binfilter
# ooobasis3.*-testtool
-linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter,ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
+linuxreplaces = "openoffice.org3,openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter,ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "2012 by The Apache Software Foundation"
commit 44bc762b41e4edf087fe944cc36fac5a5d1755a3
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:34 2013 +0000
i121968 - Remove references to testtool
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index ae89693..c726cda 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -36,7 +36,6 @@
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for %APACHEPROJECTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for %APACHEPROJECTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for %APACHEPROJECTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for %APACHEPROJECTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for %APACHEPROJECTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for %APACHEPROJECTNAME %PRODUCTVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index f090ca8..7612796 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -30,7 +30,8 @@ packagename = "%UNIXPACKAGENAME"
# ooobasis3.*-kde-integration
# openoffice.org3-dict-en|es|fr (installed by OOo 3.3.0)
# ooobasis3.*-binfilter
-linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
+# ooobasis3.*-testtool
+linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter,ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "2012 by The Apache Software Foundation"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index b5db9c7..082fa35 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -223,22 +223,6 @@ packageversion = "%OOOPACKAGEVERSION"
End
Start
-module = "gid_Module_Optional_Testtool"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX-testtool"
-linuxreplaces = "ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
-freebsdrequires = "%BASISPACKAGEPREFIX-core01"
-requires = "%BASISPACKAGEPREFIX-core01"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Testtool module for %APACHEPROJECTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-End
-
-Start
module = "gid_Module_Optional_Oo_English"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
commit 82473d12f9e85f58a0f7bb720bc2a496b5d19432
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:27 2013 +0000
i121968 - Prevent package name conflict
Now that all packages have the same base name, the package name has
no version number at all, and there is no more basis packages, the
basis package name colides with the brand package name, for example:
ooobasis3.4-writer is now openoffice-writer
openoffice.org3-writer must be openoffice-brand-writer or the like
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index ab6b711..ae89693 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -62,10 +62,10 @@
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th Th dictionary for %PRODUCTNAME %PRODUCTVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu Zu dictionary for %PRODUCTNAME %PRODUCTVERSION
%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION Brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING Brand language module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base Base brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc Calc brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw Draw brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress Impress brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math Math brand module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer Writer brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-%LANGUAGESTRING Brand language module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-base Base brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-calc Calc brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-draw Draw brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-impress Impress brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-math Math brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-writer Writer brand module for %PRODUCTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 713194a..f090ca8 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -44,7 +44,7 @@ End
Start
module = "gid_Module_Brand_Prg_Wrt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-writer"
-packagename = "%UNIXPACKAGENAME-writer"
+packagename = "%UNIXPACKAGENAME-brand-writer"
linuxreplaces = "openoffice.org3-writer"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -59,7 +59,7 @@ End
Start
module = "gid_Module_Brand_Prg_Calc"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-calc"
-packagename = "%UNIXPACKAGENAME-calc"
+packagename = "%UNIXPACKAGENAME-brand-calc"
linuxreplaces = "openoffice.org3-calc"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -74,7 +74,7 @@ End
Start
module = "gid_Module_Brand_Prg_Impress"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-impress"
-packagename = "%UNIXPACKAGENAME-impress"
+packagename = "%UNIXPACKAGENAME-brand-impress"
linuxreplaces = "openoffice.org3-impress"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -89,7 +89,7 @@ End
Start
module = "gid_Module_Brand_Prg_Draw"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-draw"
-packagename = "%UNIXPACKAGENAME-draw"
+packagename = "%UNIXPACKAGENAME-brand-draw"
linuxreplaces = "openoffice.org3-draw"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -104,7 +104,7 @@ End
Start
module = "gid_Module_Brand_Prg_Math"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-math"
-packagename = "%UNIXPACKAGENAME-math"
+packagename = "%UNIXPACKAGENAME-brand-math"
linuxreplaces = "openoffice.org3-math"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-math"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -119,7 +119,7 @@ End
Start
module = "gid_Module_Brand_Prg_Base"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-base"
-packagename = "%UNIXPACKAGENAME-base"
+packagename = "%UNIXPACKAGENAME-brand-base"
linuxreplaces = "openoffice.org3-base"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-base"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -134,7 +134,7 @@ End
Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
-packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
+packagename = "%UNIXPACKAGENAME-brand-%LANGUAGESTRING"
# replace ooobasis3.*-%LANGUAGESTRING-binfilter
linuxreplaces = "openoffice.org3-%LANGUAGESTRING,ooobasis3.0-%LANGUAGESTRING-binfilter,ooobasis3.1-%LANGUAGESTRING-binfilter,ooobasis3.2-%LANGUAGESTRING-binfilter,ooobasis3.3-%LANGUAGESTRING-binfilter,ooobasis3.4-%LANGUAGESTRING-binfilter,aoobasis3.4.1-%LANGUAGESTRING-binfilter"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING,%BASISPACKAGEPREFIX-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
commit a20860a7696608e9766e931d688db963c0f2cbac
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:19 2013 +0000
i121968 - Change BASISPACKAGEPREFIX
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 6d059db..ffc9807 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -13,7 +13,7 @@ Globals
UNIXBASISROOTNAME openoffice
HIDELICENSEDIALOG 1
PACKAGEPREFIX
- BASISPACKAGEPREFIX aoobasis
+ BASISPACKAGEPREFIX openoffice
UREPACKAGEPREFIX openoffice
SOLSUREPACKAGEPREFIX openoffice
USE_FILEVERSION 1
@@ -193,7 +193,7 @@ Apache_OpenOffice_Dev
ABOUTBOXPRODUCTVERSION 4.0.0
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX aoobasis-dev
+ BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
@@ -351,7 +351,7 @@ Apache_OpenOffice_Dev_SDK
BRANDPACKAGEVERSION 4
PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
- BASISPACKAGEPREFIX aoobasis-dev
+ BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
commit 73fbc2005dc3a89da5ed6bc351fb510d83bc1ea0
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:12 2013 +0000
i121968 - Replace OOOBASEVERSION with PRODUCTVERSION
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index 60e1862..ab6b711 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -1,44 +1,44 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for %APACHEPROJECTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for %APACHEPROJECTNAME %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for %APACHEPROJECTNAME %PRODUCTVERSION
%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 117cde9..b5db9c7 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -49,7 +49,7 @@ findrequires = "find-requires-gnome.sh"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Gnome integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -65,7 +65,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "KDE integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -82,7 +82,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISP
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -99,7 +99,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Writer module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -116,7 +116,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Calc module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -133,7 +133,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Draw module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Draw module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -150,7 +150,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Impress module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -167,7 +167,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Base module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -184,7 +184,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Math module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -201,7 +201,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Graphic filter module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -217,7 +217,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Usage tracking module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Usage tracking module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -233,7 +233,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Testtool module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -249,7 +249,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "English spellchecker module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -265,7 +265,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "XSLT filter samples module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -281,7 +281,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Java filter module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -297,7 +297,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "ActiveX control for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -312,7 +312,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Online update modul for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -328,7 +328,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Pyuno module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -344,7 +344,7 @@ requires = "%BASISPACKAGEPREFIX-pyuno"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Email mailmerge module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -360,7 +360,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Headless display module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -376,7 +376,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Images module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Images module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -392,7 +392,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Mailcap module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -408,7 +408,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Linguistic module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -425,7 +425,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -441,7 +441,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -458,7 +458,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -474,7 +474,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -490,7 +490,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -506,7 +506,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -1084,7 +1084,7 @@ requires = "%BASISPACKAGEPREFIX-impress"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "OpenGL slide transitions module for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "OpenGL slide transitions module for %APACHEPROJECTNAME %PRODUCTVERSION"
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 16cb70e..b1b4e6a 100644
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -48,7 +48,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -65,7 +65,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -82,7 +82,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -99,7 +99,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language help module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -116,7 +116,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -133,7 +133,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -150,7 +150,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -184,7 +184,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -201,7 +201,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -218,7 +218,7 @@ requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for %APACHEPROJECTNAME %PRODUCTVERSION, 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 53cfc9e..9ddb97a 100644
--- a/setup_native/source/packinfo/packinfo_sdkoo.txt
+++ b/setup_native/source/packinfo/packinfo_sdkoo.txt
@@ -30,7 +30,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Software Development Kit for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
commit cab526c16048301fbf24cd1bb9e78d45326225b8
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:55:04 2013 +0000
i121968 - Obsolete previous URE
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt
index df1daeb..a8a258b 100644
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -24,6 +24,7 @@ module = "gid_Module_Root"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure"
solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure"
+linuxreplaces = "openoffice.org-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -37,6 +38,7 @@ module = "gid_Module_Root_Ure_Hidden"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure"
solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure"
+linuxreplaces = "openoffice.org-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
commit 3ec220b5e0253e48d501e133815fc8320d45bdf4
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:54:57 2013 +0000
i121968 - Add product name and version in UREs description
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt
index 67d92ee..df1daeb 100644
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -27,7 +27,7 @@ packagename = "%UREPACKAGEPREFIX-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "UNO Runtime Environment"
+description = "UNO Runtime Environment for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%UREPACKAGEVERSION"
End
@@ -40,7 +40,7 @@ packagename = "%UREPACKAGEPREFIX-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "UNO Runtime Environment"
+description = "UNO Runtime Environment for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%UREPACKAGEVERSION"
End
commit 23a6ebe4aeec1c3473b329f2e024dcc9a2f85dd4
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:54:49 2013 +0000
i121968 - Obsolete binfilter
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index 45deaaa..60e1862 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -1,6 +1,5 @@
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
@@ -12,7 +11,6 @@
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 4842435..713194a 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -29,7 +29,8 @@ packagename = "%UNIXPACKAGENAME"
# ooobasis3.*-oooimprovement
# ooobasis3.*-kde-integration
# openoffice.org3-dict-en|es|fr (installed by OOo 3.3.0)
-linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration"
+# ooobasis3.*-binfilter
+linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "2012 by The Apache Software Foundation"
@@ -134,7 +135,8 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
-linuxreplaces = "openoffice.org3-%LANGUAGESTRING"
+# replace ooobasis3.*-%LANGUAGESTRING-binfilter
+linuxreplaces = "openoffice.org3-%LANGUAGESTRING,ooobasis3.0-%LANGUAGESTRING-binfilter,ooobasis3.1-%LANGUAGESTRING-binfilter,ooobasis3.2-%LANGUAGESTRING-binfilter,ooobasis3.3-%LANGUAGESTRING-binfilter,ooobasis3.4-%LANGUAGESTRING-binfilter,aoobasis3.4.1-%LANGUAGESTRING-binfilter"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING,%BASISPACKAGEPREFIX-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKA
GEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
copyright = "2012 by The Apache Software Foundation"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 101a2ad..117cde9 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -189,21 +189,6 @@ destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
-Start
-module = "gid_Module_Optional_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX-binfilter"
-linuxreplaces = "ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX-core01"
-requires = "%BASISPACKAGEPREFIX-core01"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-End
Start
module = "gid_Module_Optional_Grfflt"
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 346efe0..16cb70e 100644
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -208,23 +208,6 @@ pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
End
Start
-module = "gid_Module_Langpack_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-binfilter"
-linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-binfilter,ooobasis3.1-%LANGUAGESTRING-binfilter,ooobasis3.2-%LANGUAGESTRING-binfilter,ooobasis3.3-%LANGUAGESTRING-binfilter,ooobasis3.4-%LANGUAGESTRING-binfilter"
-provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-binfilter"
-requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-End
-
-Start
module = "gid_Module_Langpack_Onlineupdate"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
commit 16d44fe27604e23c89d4c969c6864aa12c1aaf26
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:54:42 2013 +0000
i121968 - Obsolete brand packages
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index aa827b59..4842435 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -44,6 +44,7 @@ Start
module = "gid_Module_Brand_Prg_Wrt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-writer"
packagename = "%UNIXPACKAGENAME-writer"
+linuxreplaces = "openoffice.org3-writer"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
copyright = "2012 by The Apache Software Foundation"
@@ -58,6 +59,7 @@ Start
module = "gid_Module_Brand_Prg_Calc"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-calc"
packagename = "%UNIXPACKAGENAME-calc"
+linuxreplaces = "openoffice.org3-calc"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
copyright = "2012 by The Apache Software Foundation"
@@ -72,6 +74,7 @@ Start
module = "gid_Module_Brand_Prg_Impress"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-impress"
packagename = "%UNIXPACKAGENAME-impress"
+linuxreplaces = "openoffice.org3-impress"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
copyright = "2012 by The Apache Software Foundation"
@@ -86,6 +89,7 @@ Start
module = "gid_Module_Brand_Prg_Draw"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-draw"
packagename = "%UNIXPACKAGENAME-draw"
+linuxreplaces = "openoffice.org3-draw"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
copyright = "2012 by The Apache Software Foundation"
@@ -100,6 +104,7 @@ Start
module = "gid_Module_Brand_Prg_Math"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-math"
packagename = "%UNIXPACKAGENAME-math"
+linuxreplaces = "openoffice.org3-math"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-math"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
copyright = "2012 by The Apache Software Foundation"
@@ -114,6 +119,7 @@ Start
module = "gid_Module_Brand_Prg_Base"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-base"
packagename = "%UNIXPACKAGENAME-base"
+linuxreplaces = "openoffice.org3-base"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-base"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
copyright = "2012 by The Apache Software Foundation"
@@ -128,6 +134,7 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
+linuxreplaces = "openoffice.org3-%LANGUAGESTRING"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING,%BASISPACKAGEPREFIX-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKA
GEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
copyright = "2012 by The Apache Software Foundation"
commit 823928ae34cee03c89e5a8f523901201fd9707ea
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:54:33 2013 +0000
i121968 - Change URE package name
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index ee14c94..6d059db 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -14,8 +14,8 @@ Globals
HIDELICENSEDIALOG 1
PACKAGEPREFIX
BASISPACKAGEPREFIX aoobasis
- UREPACKAGEPREFIX apacheopenoffice
- SOLSUREPACKAGEPREFIX apacheopenoffice
+ UREPACKAGEPREFIX openoffice
+ SOLSUREPACKAGEPREFIX openoffice
USE_FILEVERSION 1
LIBRARYVERSION 10.0.0
POOLPRODUCT 1
commit 308a849e875f8caba7a32651ea63da1947a39e31
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:54:24 2013 +0000
i121968 - Add Obsoletes to RPM spec files
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 1fb9c5f..24cd2f3 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -32,6 +32,11 @@ Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
Conflicts: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-freedesktop-menus
+Obsoletes: openoffice.org3.1-freedesktop-menus
+Obsoletes: openoffice.org3.2-freedesktop-menus
+Obsoletes: openoffice.org3.3-freedesktop-menus
+Obsoletes: openoffice.org3.4-freedesktop-menus
BuildArch: noarch
AutoReqProv: no
%define _binary_filedigest_algorithm 1
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index b51bf44..0aa8636 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -23,6 +23,11 @@ Version: %version
Release: %release
Summary: %productname desktop integration
Name: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-mandriva-menus
+Obsoletes: openoffice.org3.1-mandriva-menus
+Obsoletes: openoffice.org3.2-mandriva-menus
+Obsoletes: openoffice.org3.3-mandriva-menus
+Obsoletes: openoffice.org3.4-mandriva-menus
Group: Office
License: ALv2
AutoReqProv: no
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index f25f153..d2b95d4 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -28,6 +28,11 @@ License: ALv2
Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
+Obsoletes: openoffice.org3.0-redhat-menus
+Obsoletes: openoffice.org3.1-redhat-menus
+Obsoletes: openoffice.org3.2-redhat-menus
+Obsoletes: openoffice.org3.3-redhat-menus
+Obsoletes: openoffice.org3.4-redhat-menus
Requires: redhat-release
Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 9ea96a9..c37d85c 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -33,6 +33,11 @@ Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
Provides: openoffice-desktop-integration
+Obsoletes: openoffice.org3.0-suse-menus
+Obsoletes: openoffice.org3.1-suse-menus
+Obsoletes: openoffice.org3.2-suse-menus
+Obsoletes: openoffice.org3.3-suse-menus
+Obsoletes: openoffice.org3.4-suse-menus
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
commit 88abeec7f61161bc5fb9cd0adc15ae5b0a64f554
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu May 30 04:53:59 2013 +0000
i121968 - Add linuxreplaces to package info and remove version number from package name
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index c7dda49..aa827b59 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -22,9 +22,15 @@
Start
module = "gid_Module_Root_Brand"
# script = "shellscripts_brand.txt"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
-requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME"
+packagename = "%UNIXPACKAGENAME"
+# We must replace packages no longer provided by Apache OpenOffice
+# but installed with previous versions
+# ooobasis3.*-oooimprovement
+# ooobasis3.*-kde-integration
+# openoffice.org3-dict-en|es|fr (installed by OOo 3.3.0)
+linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
@@ -36,10 +42,10 @@ End
Start
module = "gid_Module_Brand_Prg_Wrt"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-writer"
+packagename = "%UNIXPACKAGENAME-writer"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -50,10 +56,10 @@ End
Start
module = "gid_Module_Brand_Prg_Calc"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-calc"
+packagename = "%UNIXPACKAGENAME-calc"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -64,10 +70,10 @@ End
Start
module = "gid_Module_Brand_Prg_Impress"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-impress"
+packagename = "%UNIXPACKAGENAME-impress"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -78,10 +84,10 @@ End
Start
module = "gid_Module_Brand_Prg_Draw"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-draw"
+packagename = "%UNIXPACKAGENAME-draw"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -92,10 +98,10 @@ End
Start
module = "gid_Module_Brand_Prg_Math"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-math"
+packagename = "%UNIXPACKAGENAME-math"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-math"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -106,10 +112,10 @@ End
Start
module = "gid_Module_Brand_Prg_Base"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-base"
+packagename = "%UNIXPACKAGENAME-base"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-base"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -120,10 +126,10 @@ End
Start
module = "gid_Module_Langpack_Brand"
-solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGE
STRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
+packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
+requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING,%BASISPACKAGEPREFIX-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKA
GEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 040014d..101a2ad 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -41,9 +41,10 @@ Start
module = "gid_Module_Optional_Gnome"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWgnome-config, SUNWgnome-vfs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-gnome-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-gnome-integration"
+linuxreplaces = "ooobasis3.0-gnome-integration,ooobasis3.1-gnome-integration,ooobasis3.2-gnome-integration,ooobasis3.3-gnome-integration,ooobasis3.4-gnome-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
findrequires = "find-requires-gnome.sh"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
@@ -57,9 +58,10 @@ Start
module = "gid_Module_Optional_Kde"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-kde-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-kde-integration"
+linuxreplaces = "ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.4-kde-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -72,10 +74,11 @@ Start
module = "gid_Module_Root"
# script = "shellscripts_core01.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-core01"
+linuxreplaces = "ooobasis3.0-core01,ooobasis3.1-core01,ooobasis3.2-core01,ooobasis3.3-core01,ooobasis3.4-core01"
requires = "%UREPACKAGEPREFIX-ure"
solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX-ure"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+freebsdrequires = "%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -88,10 +91,11 @@ Start
module = "gid_Module_Prg_Wrt_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
+packagename = "%BASISPACKAGEPREFIX-writer"
+linuxreplaces = "ooobasis3.0-writer,ooobasis3.1-writer,ooobasis3.2-writer,ooobasis3.3-writer,ooobasis3.4-writer"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -105,9 +109,10 @@ module = "gid_Module_Prg_Calc_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-calc"
+linuxreplaces = "ooobasis3.0-calc,ooobasis3.1-calc,ooobasis3.2-calc,ooobasis3.3-calc,ooobasis3.4-calc"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -121,9 +126,10 @@ module = "gid_Module_Prg_Draw_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-draw"
+linuxreplaces = "ooobasis3.0-draw,ooobasis3.1-draw,ooobasis3.2-draw,ooobasis3.3-draw,ooobasis3.4-draw"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -137,9 +143,10 @@ module = "gid_Module_Prg_Impress_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-impress"
+linuxreplaces = "ooobasis3.0-impress,ooobasis3.1-impress,ooobasis3.2-impress,ooobasis3.3-impress,ooobasis3.4-impress"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -153,9 +160,10 @@ module = "gid_Module_Prg_Base_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSIONg-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-base"
+linuxreplaces = "ooobasis3.0-base,ooobasis3.1-base,ooobasis3.2-base,ooobasis3.3-base,ooobasis3.4-base"
+freebsdrequires = "%BASISPACKAGEPREFIXg-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -169,9 +177,10 @@ module = "gid_Module_Prg_Math_Bin"
script = "shellscripts_module.txt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-math"
+linuxreplaces = "ooobasis3.0-math,ooobasis3.1-math,ooobasis3.2-math,ooobasis3.3-math,ooobasis3.4-math"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -184,9 +193,10 @@ Start
module = "gid_Module_Optional_Binfilter"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-binfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-binfilter"
+linuxreplaces = "ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -199,9 +209,10 @@ Start
module = "gid_Module_Optional_Grfflt"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-graphicfilter"
+linuxreplaces = "ooobasis3.0-graphicfilter,ooobasis3.1-graphicfilter,ooobasis3.2-graphicfilter,ooobasis3.3-graphicfilter,ooobasis3.4-graphicfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -214,9 +225,10 @@ Start
module = "gid_Module_Oooimprovement"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-oooimprovement"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-oooimprovement"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-oooimprovement"
+linuxreplaces = "ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.4-oooimprovement"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -229,9 +241,10 @@ Start
module = "gid_Module_Optional_Testtool"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-testtool"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-testtool"
+linuxreplaces = "ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -244,9 +257,10 @@ Start
module = "gid_Module_Optional_Oo_English"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-spellcheck"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-spellcheck"
+linuxreplaces = "ooobasis3.0-spellcheck,ooobasis3.1-spellcheck,ooobasis3.2-spellcheck,ooobasis3.3-spellcheck,ooobasis3.4-spellcheck"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -259,9 +273,10 @@ Start
module = "gid_Module_Optional_Xsltfiltersamples"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-xsltfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-xsltfilter"
+linuxreplaces = "ooobasis3.0-xsltfilter,ooobasis3.1-xsltfilter,ooobasis3.2-xsltfilter,ooobasis3.3-xsltfilter,ooobasis3.4-xsltfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -274,9 +289,10 @@ Start
module = "gid_Module_Optional_Javafilter"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-javafilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-javafilter"
+linuxreplaces = "ooobasis3.0-javafilter,ooobasis3.1-javafilter,ooobasis3.2-javafilter,ooobasis3.3-javafilter,ooobasis3.4-javafilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -289,9 +305,10 @@ Start
module = "gid_Module_Optional_Activexcontrol"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-activex"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-activex"
+linuxreplaces = "ooobasis3.0-activex,ooobasis3.1-activex,ooobasis3.2-activex,ooobasis3.3-activex,ooobasis3.4-activex"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -304,8 +321,9 @@ Start
module = "gid_Module_Optional_Onlineupdate"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWgzip"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-onlineupdate"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-onlineupdate"
+linuxreplaces = "ooobasis3.0-onlineupdate,ooobasis3.1-onlineupdate,ooobasis3.2-onlineupdate,ooobasis3.3-onlineupdate,ooobasis3.4-onlineupdate"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -318,9 +336,10 @@ Start
module = "gid_Module_Optional_Pyuno"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWPython"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-pyuno"
+linuxreplaces = "ooobasis3.0-pyuno,ooobasis3.1-pyuno,ooobasis3.2-pyuno,ooobasis3.3-pyuno,ooobasis3.4-pyuno"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -333,9 +352,10 @@ Start
module = "gid_Module_Optional_Pymailmerge"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-emailmerge"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
+packagename = "%BASISPACKAGEPREFIX-emailmerge"
+linuxreplaces = "ooobasis3.0-emailmerge,ooobasis3.1-emailmerge,ooobasis3.2-emailmerge,ooobasis3.3-emailmerge,ooobasis3.4-emailmerge"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-pyuno"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -348,9 +368,10 @@ Start
module = "gid_Module_Optional_Headless"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-headless"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-headless"
+linuxreplaces = "ooobasis3.0-headless,ooobasis3.1-headless,ooobasis3.2-headless,ooobasis3.3-headless,ooobasis3.4-headless"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -363,9 +384,10 @@ Start
module = "gid_Module_Root_Files_Images"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-images"
+linuxreplaces = "ooobasis3.0-images,ooobasis3.1-images,ooobasis3.2-images,ooobasis3.3-images,ooobasis3.4-images"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
@@ -378,9 +400,10 @@ Start
module = "gid_Module_Root_Fonts_OOo_Hidden"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-ooofonts"
+linuxreplaces = "ooobasis3.0-ooofonts,ooobasis3.1-ooofonts,ooobasis3.2-ooofonts,ooobasis3.3-ooofonts,ooobasis3.4-ooofonts"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list