Author: jsc Date: Wed Feb 12 13:15:48 2014 New Revision: 1567612 URL: http://svn.apache.org/r1567612 Log: #124224# replace images and adapt DS_Store file
Modified: openoffice/trunk/main/default_images/introabout/intro.png openoffice/trunk/main/ooo_custom_images/dev/introabout/intro.png openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp openoffice/trunk/main/setup_native/prj/d.lst openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp Modified: openoffice/trunk/main/default_images/introabout/intro.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/introabout/intro.png?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/ooo_custom_images/dev/introabout/intro.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ooo_custom_images/dev/introabout/intro.png?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== --- openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp (original) +++ openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp Wed Feb 12 13:15:48 2014 @@ -318,9 +318,10 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image Copy = "osxdndinstall.png"; - Name = "background.png"; + LangPackCopy = "osxdndinstall_lang.png"; + Name = "background.png"; UnixRights = 444; - Styles = (); + Styles = (FORCELANGUAGEPACK); Subdir = ".background"; End Modified: openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== --- openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp (original) +++ openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp Wed Feb 12 13:15:48 2014 @@ -216,7 +216,7 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image - Copy = "osxdndinstall.png"; + Copy = "osxdndinstall_sdk.png"; Name = "background.png"; UnixRights = 444; Styles = (); Modified: openoffice/trunk/main/setup_native/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/prj/d.lst?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== --- openoffice/trunk/main/setup_native/prj/d.lst (original) +++ openoffice/trunk/main/setup_native/prj/d.lst Wed Feb 12 13:15:48 2014 @@ -32,11 +32,13 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf ..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns ..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png +..\source\mac\ooo\osxdndinstall_lang.png %_DEST%\bin%_EXT%\osl\osxdndinstall_lang.png ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png ..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store ..\source\mac\ooo\DS_Store_Dev %_DEST%\bin%_EXT%\osl\DS_Store_Dev ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack ..\source\mac\sdk\DS_Store_SDK %_DEST%\bin%_EXT%\osl\DS_Store_SDK +..\source\mac\sdk\osxdndinstall_sdk.png %_DEST%\bin%_EXT%\osl\osxdndinstall_sdk.png ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat Modified: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1567612&r1=1567611&r2=1567612&view=diff ============================================================================== Binary files - no diff available.