diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-21 06:55:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-21 06:55:28 +0000 |
| commit | 3f926bb9104c4f51acc232b6737adb4890e89581 (patch) | |
| tree | fb21fe2e9fb443fdc2388a491d26c8238e4af0f7 /setup_native | |
| parent | 481156c9184a23f22f1d027cd11b5daf2958d55e (diff) | |
#i10000# Correct wrong conflict resolution: get back changes from CWS iconupdate04.
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_office.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 86cd9ba5338a..8fe1082a5a79 100755 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -309,6 +309,20 @@ packageversion = "%OOOPACKAGEVERSION" End Start +module = "gid_Module_Root_Files_Images" +solarispackagename = "openofficeorg-images" +solarisrequires = "openofficeorg-core01" +packagename = "openoffice.org-images" +freebsdrequires = "openoffice.org-core01" +requires = "openoffice.org-core01" +copyright = "1999-2007 by OpenOffice.org" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "Images module for OpenOffice.org %OOOBASEVERSION" +destpath = "/opt" +End + +Start module = "gid_Module_Root_Fonts_OOo_Hidden" solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-ooofonts" solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-core01" |