[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Fri Feb 19 04:17:54 PST 2010
patches/dev300/apply | 4
patches/dev300/packinfo_office_lang_requires.diff | 105 ++++++++++++++++++++++
patches/dev300/packinfo_office_requires.diff | 99 ++++++++++++++++++++
3 files changed, 208 insertions(+)
New commits:
commit 3b2cd897c6c457f461f0857b6172941bd712266f
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Fri Feb 19 13:16:29 2010 +0100
Add richer dependency to OxygenOffice Linux packages
* patches/dev300/apply:
* patches/dev300/packinfo_office_lang_requires.diff:
* patches/dev300/packinfo_office_requires.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4d8ae2b..5bbbc45 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2803,6 +2803,10 @@ ooowikipedia_genericcommands.diff
ooowikipedia_writer.diff
ooowikipedia_toolbars.diff
+#Adding richer requires dependency
+packinfo_office_lang_requires.diff
+packinfo_office_requires.diff
+
[ OxygenOfficeWin32Only ]
# Update Windows installation of OpenOffice.org even the version is same
# So you can upgrade to OxygenOffice without removing OpenOffice.org
diff --git a/patches/dev300/packinfo_office_lang_requires.diff b/patches/dev300/packinfo_office_lang_requires.diff
new file mode 100644
index 0000000..dceafab
--- /dev/null
+++ b/patches/dev300/packinfo_office_lang_requires.diff
@@ -0,0 +1,105 @@
+--- setup_native/source/packinfo.old/packinfo_office_lang.txt 2010-02-15 11:32:14.000000000 +0100
++++ setup_native/source/packinfo/packinfo_office_lang.txt 2010-02-16 20:51:56.000000000 +0100
+@@ -83,10 +83,10 @@
+ Start
+ module = "gid_Module_Langpack_Writer"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -99,10 +99,10 @@
+ Start
+ module = "gid_Module_Langpack_Calc"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -115,9 +115,9 @@
+ Start
+ module = "gid_Module_Langpack_Impress"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
+-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
++provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress, %BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+@@ -131,10 +131,10 @@
+ Start
+ module = "gid_Module_Langpack_Draw"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -147,10 +147,10 @@
+ Start
+ module = "gid_Module_Langpack_Math"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-math"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -163,10 +163,10 @@
+ Start
+ module = "gid_Module_Langpack_Base"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-base"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -179,10 +179,10 @@
+ Start
+ module = "gid_Module_Langpack_Binfilter"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-binfilter"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -195,10 +195,10 @@
+ Start
+ module = "gid_Module_Langpack_Onlineupdate"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+ provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING, %BASISPACKAGEPREFIX%OOOBASEVERSION-onlineupdate"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
diff --git a/patches/dev300/packinfo_office_requires.diff b/patches/dev300/packinfo_office_requires.diff
new file mode 100644
index 0000000..a1b6fb2
--- /dev/null
+++ b/patches/dev300/packinfo_office_requires.diff
@@ -0,0 +1,99 @@
+--- setup_native/source/packinfo.old/packinfo_office.txt 2010-01-12 17:35:23.000000000 +0100
++++ setup_native/source/packinfo/packinfo_office.txt 2010-02-17 09:30:27.000000000 +0100
+@@ -18,7 +18,7 @@
+
+ Start
+ module = "gid_Module_Optional_Gnome"
+-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integration"
+ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWgnome-config, SUNWgnome-vfs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-gnome-integration"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+@@ -52,8 +52,8 @@
+ # script = "shellscripts_core01.txt"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%UREPACKAGEPREFIX-ure"
+-solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX-ure"
++requires = "%UREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
++solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+@@ -68,9 +68,9 @@
+ script = "shellscripts_module.txt"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooolinguistic, %BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images, %BASISPACKAGEPREFIX%OOOBASEVERSION-javafilter"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -83,10 +83,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"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images, %BASISPACKAGEPREFIX%OOOBASEVERSION-javafilter"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -99,10 +99,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"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -115,10 +115,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"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ogltrans, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter, %BASISPACKAGEPREFIX%OOOBASEVERSION-ogltrans, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -131,10 +131,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"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSIONg-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
+@@ -147,10 +147,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"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
+ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01, %BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts, %BASISPACKAGEPREFIX%OOOBASEVERSION-images"
+ copyright = "1999-2009 by OpenOffice.org"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "OpenOffice.org"
More information about the ooo-build-commit
mailing list