INTEGRATION: CWS nativebroffice_SRC680 (1.10.2.2.2); FILE MERGED

2007/03/14 12:53:35 obr 1.10.2.2.2.2: #i74459# consistant icon naming scheme
2007/03/14 12:09:47 obr 1.10.2.2.2.1: #i74459# multi product support

1 files changed, 32 insertions, 32 deletions

diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype
index ec4f71eb27f2..985ab765d85b 100644
--- a/sysui/desktop/solaris/prototype
+++ b/sysui/desktop/solaris/prototype
@@ -23,7 +23,7 @@ d none usr/share/gnome/mime-info 0755 root other
 d none usr/share/pixmaps 0755 root other
 !default 0644 root bin
 e build etc/mime.types=./mime.types
-e build etc/mailcap=%SOURCE/mailcap
+e build etc/mailcap=mailcap
 f none usr/share/gnome/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
 s none usr/share/applications/%PREFIX-writer.desktop=/etc/%PREFIX/share/xdg/writer.desktop
 s none usr/share/applications/%PREFIX-calc.desktop=/etc/%PREFIX/share/xdg/calc.desktop
@@ -35,37 +35,37 @@ s none usr/share/applications/%PREFIX-extension.desktop=/etc/%PREFIX/share/xdg/e
 s none usr/share/applications/%PREFIX-printeradmin.desktop=/etc/%PREFIX/share/xdg/printeradmin.desktop
 f none usr/share/gnome/mime-info/%PREFIX.keys=%SOURCE/openoffice.keys
 f none usr/share/gnome/mime-info/%PREFIX.mime=%SOURCE/openoffice.mime
-f none usr/share/pixmaps/%PREFIX-writer.png=../icons/hicolor/48x48/apps/writer.png
-f none usr/share/pixmaps/%PREFIX-calc.png=../icons/hicolor/48x48/apps/calc.png
-f none usr/share/pixmaps/%PREFIX-draw.png=../icons/hicolor/48x48/apps/draw.png
-f none usr/share/pixmaps/%PREFIX-impress.png=../icons/hicolor/48x48/apps/impress.png
-f none usr/share/pixmaps/%PREFIX-math.png=../icons/hicolor/48x48/apps/math.png
-f none usr/share/pixmaps/%PREFIX-base.png=../icons/hicolor/48x48/apps/base.png
-f none usr/share/pixmaps/%PREFIX-printeradmin.png=../icons/hicolor/48x48/apps/printeradmin.png
-f none usr/share/pixmaps/%PREFIX-text.png=../icons/hicolor/48x48/mimetypes/text.png
-f none usr/share/pixmaps/%PREFIX-text-template.png=../icons/hicolor/48x48/mimetypes/text-template.png
-f none usr/share/pixmaps/%PREFIX-spreadsheet.png=../icons/hicolor/48x48/mimetypes/spreadsheet.png
-f none usr/share/pixmaps/%PREFIX-spreadsheet-template.png=../icons/hicolor/48x48/mimetypes/spreadsheet-template.png
-f none usr/share/pixmaps/%PREFIX-drawing.png=../icons/hicolor/48x48/mimetypes/drawing.png
-f none usr/share/pixmaps/%PREFIX-drawing-template.png=../icons/hicolor/48x48/mimetypes/drawing-template.png
-f none usr/share/pixmaps/%PREFIX-presentation.png=../icons/hicolor/48x48/mimetypes/presentation.png
-f none usr/share/pixmaps/%PREFIX-presentation-template.png=../icons/hicolor/48x48/mimetypes/presentation-template.png
-f none usr/share/pixmaps/%PREFIX-master-document.png=../icons/hicolor/48x48/mimetypes/master-document.png
-f none usr/share/pixmaps/%PREFIX-formula.png=../icons/hicolor/48x48/mimetypes/formula.png
-f none usr/share/pixmaps/%PREFIX-database.png=../icons/hicolor/48x48/mimetypes/database.png
-f none usr/share/pixmaps/%PREFIX-extension.png=../icons/hicolor/48x48/mimetypes/extension.png
-f none usr/share/pixmaps/%PREFIX-oasis-text.png=../icons/hicolor/48x48/mimetypes/oasis-text.png
-f none usr/share/pixmaps/%PREFIX-oasis-text-template.png=../icons/hicolor/48x48/mimetypes/oasis-text-template.png
-f none usr/share/pixmaps/%PREFIX-oasis-spreadsheet.png=../icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
-f none usr/share/pixmaps/%PREFIX-oasis-spreadsheet-template.png=../icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
-f none usr/share/pixmaps/%PREFIX-oasis-drawing.png=../icons/hicolor/48x48/mimetypes/oasis-drawing.png
-f none usr/share/pixmaps/%PREFIX-oasis-drawing-template.png=../icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
-f none usr/share/pixmaps/%PREFIX-oasis-presentation.png=../icons/hicolor/48x48/mimetypes/oasis-presentation.png
-f none usr/share/pixmaps/%PREFIX-oasis-presentation-template.png=../icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
-f none usr/share/pixmaps/%PREFIX-oasis-master-document.png=../icons/hicolor/48x48/mimetypes/oasis-master-document.png
-f none usr/share/pixmaps/%PREFIX-oasis-formula.png=../icons/hicolor/48x48/mimetypes/oasis-formula.png
-f none usr/share/pixmaps/%PREFIX-oasis-database.png=../icons/hicolor/48x48/mimetypes/oasis-database.png
-f none usr/share/pixmaps/%PREFIX-oasis-web-template.png=../icons/hicolor/48x48/mimetypes/oasis-web-template.png
+f none usr/share/pixmaps/%ICONPREFIX-writer.png=../icons/hicolor/48x48/apps/writer.png
+f none usr/share/pixmaps/%ICONPREFIX-calc.png=../icons/hicolor/48x48/apps/calc.png
+f none usr/share/pixmaps/%ICONPREFIX-draw.png=../icons/hicolor/48x48/apps/draw.png
+f none usr/share/pixmaps/%ICONPREFIX-impress.png=../icons/hicolor/48x48/apps/impress.png
+f none usr/share/pixmaps/%ICONPREFIX-math.png=../icons/hicolor/48x48/apps/math.png
+f none usr/share/pixmaps/%ICONPREFIX-base.png=../icons/hicolor/48x48/apps/base.png
+f none usr/share/pixmaps/%ICONPREFIX-printeradmin.png=../icons/hicolor/48x48/apps/printeradmin.png
+f none usr/share/pixmaps/%ICONPREFIX-text.png=../icons/hicolor/48x48/mimetypes/text.png
+f none usr/share/pixmaps/%ICONPREFIX-text-template.png=../icons/hicolor/48x48/mimetypes/text-template.png
+f none usr/share/pixmaps/%ICONPREFIX-spreadsheet.png=../icons/hicolor/48x48/mimetypes/spreadsheet.png
+f none usr/share/pixmaps/%ICONPREFIX-spreadsheet-template.png=../icons/hicolor/48x48/mimetypes/spreadsheet-template.png
+f none usr/share/pixmaps/%ICONPREFIX-drawing.png=../icons/hicolor/48x48/mimetypes/drawing.png
+f none usr/share/pixmaps/%ICONPREFIX-drawing-template.png=../icons/hicolor/48x48/mimetypes/drawing-template.png
+f none usr/share/pixmaps/%ICONPREFIX-presentation.png=../icons/hicolor/48x48/mimetypes/presentation.png
+f none usr/share/pixmaps/%ICONPREFIX-presentation-template.png=../icons/hicolor/48x48/mimetypes/presentation-template.png
+f none usr/share/pixmaps/%ICONPREFIX-master-document.png=../icons/hicolor/48x48/mimetypes/master-document.png
+f none usr/share/pixmaps/%ICONPREFIX-formula.png=../icons/hicolor/48x48/mimetypes/formula.png
+f none usr/share/pixmaps/%ICONPREFIX-database.png=../icons/hicolor/48x48/mimetypes/database.png
+f none usr/share/pixmaps/%ICONPREFIX-extension.png=../icons/hicolor/48x48/mimetypes/extension.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-text.png=../icons/hicolor/48x48/mimetypes/oasis-text.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-text-template.png=../icons/hicolor/48x48/mimetypes/oasis-text-template.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-spreadsheet.png=../icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-spreadsheet-template.png=../icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-drawing.png=../icons/hicolor/48x48/mimetypes/oasis-drawing.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-drawing-template.png=../icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-presentation.png=../icons/hicolor/48x48/mimetypes/oasis-presentation.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-presentation-template.png=../icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-master-document.png=../icons/hicolor/48x48/mimetypes/oasis-master-document.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-formula.png=../icons/hicolor/48x48/mimetypes/oasis-formula.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-database.png=../icons/hicolor/48x48/mimetypes/oasis-database.png
+f none usr/share/pixmaps/%ICONPREFIX-oasis-web-template.png=../icons/hicolor/48x48/mimetypes/oasis-web-template.png
 f none usr/dt/appconfig/icons/C/printeradmin.l.pm=../cde/icons/printeradmin.l.xpm
 f none usr/dt/appconfig/icons/C/printeradmin.m.pm=../cde/icons/printeradmin.m.xpm
 f none usr/dt/appconfig/icons/C/printeradmin.t.pm=../cde/icons/printeradmin.t.xpm