summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-07-07 15:23:44 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-07-07 15:23:44 +0000
commitf52e5042ba2f0eeb04a551b0de573667ec53cb16 (patch)
treef298de92e7ff7dfb5205201ca20ac79e19c1e877 /setup_native
parentdeb0e7aaeafc910c6d231899c04bcbeec1f391bc (diff)
INTEGRATION: CWS native161 (1.6.24); FILE MERGED
2008/06/30 13:27:13 is 1.6.24.2: #i90919# new dependencies to avoid uninstallation with foreign product 2008/06/27 16:25:44 is 1.6.24.1: #i90919# dependencies to ooobasis packages
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/packinfo/packinfo_brand.txt34
1 files changed, 17 insertions, 17 deletions
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 1f9cd1ecf3cf..9015bd775e53 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -8,7 +8,7 @@
#
# $RCSfile: packinfo_brand.txt,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
# This file is part of OpenOffice.org.
#
@@ -34,8 +34,8 @@ module = "gid_Module_Root_Brand"
# script = "shellscripts_brand.txt"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+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-core08,%BASISPACKAGEPREFIX%OOOBASEVERSION-images,%BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts"
+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")"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -48,8 +48,8 @@ Start
module = "gid_Module_Brand_Prg_Wrt"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-writer"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-writer"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -62,8 +62,8 @@ Start
module = "gid_Module_Brand_Prg_Calc"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-calc"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-calc"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -76,8 +76,8 @@ Start
module = "gid_Module_Brand_Prg_Impress"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-impress"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-impress"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -90,8 +90,8 @@ Start
module = "gid_Module_Brand_Prg_Draw"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-draw"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-draw"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -104,8 +104,8 @@ Start
module = "gid_Module_Brand_Prg_Math"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-math"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-math"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -118,8 +118,8 @@ Start
module = "gid_Module_Brand_Prg_Base"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-base"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-base"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
copyright = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
@@ -132,8 +132,8 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME%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-binfilter (Name="Binfilter 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"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd (Name="Online update 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 = "1999-2007 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"