Author: arielch
Date: Thu May 30 04:53:59 2013
New Revision: 1487726
URL: http://svn.apache.org/r1487726
Log:
i121968 - Add linuxreplaces to package info and remove version number from
package name
Modified:
openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt
Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt?rev=1487726&r1=1487725&r2=1487726&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
(original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt Thu
May 30 04:53:59 2013
@@ -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"
