ooo-build r13409 - trunk/patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Sun Jul 27 17:36:38 2008
New Revision: 13409
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13409&view=rev

Log:
2008-07-29  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/not_requires_core08.diff
	* patches/dev300/apply
	
	No dependency on core08 in branding for OxygenOffice.



Added:
   trunk/patches/dev300/not_requires_core08.diff
Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Jul 27 17:36:38 2008
@@ -2526,9 +2526,11 @@
 ooowikipedia_genericcommands.diff
 ooowikipedia_writer.diff
 ooowikipedia_toolbars.diff
-#Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
+# Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
 win32-prebuilt-writingaids-zip.diff
 win32-prebuilt-writingaids-zip-scp2.diff
+# Does not reqire core08 for branding
+not_requires_core08.diff
 
 
 [ Win32Only ]

Added: trunk/patches/dev300/not_requires_core08.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/not_requires_core08.diff	Sun Jul 27 17:36:38 2008
@@ -0,0 +1,11 @@
+--- setup_native/source/packinfo/packinfo_brand.txt.orig	2008-07-18 14:41:08.000000000 +0200
++++ setup_native/source/packinfo/packinfo_brand.txt	2008-07-27 19:30:13.000000000 +0200
+@@ -34,7 +34,7 @@
+ # script = "shellscripts_brand.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+ packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+-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"
++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-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"