ooo-build r14497 - in branches/ooo-build-3-0: . patches/dev300 po

[szalaik svn gnome org]

Author: szalaik
Date: Thu Nov 13 16:04:37 2008
New Revision: 14497
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14497&view=rev

Log:
2008-11-13  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extensions_packinfo.diff
	* patches/dev300/scp2_accessories.diff: Refine packaging for 
OxygenOffice
	* po/ooo-build-sl.po: Welcome new translation: Slovenian



Added:
   branches/ooo-build-3-0/po/ooo-build-sl.po
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
   branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff

Modified: branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff	Thu Nov 13 16:04:37 2008
@@ -100,7 +100,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_en-US"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_en-US"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-en-US"
 +solarisrequires =  "%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")"
@@ -116,7 +116,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_de"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_de"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-de"
 +solarisrequires =  "%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")"
@@ -132,7 +132,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_it"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_it"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-it"
 +solarisrequires =  "%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")"
@@ -148,7 +148,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_fr"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_fr"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-fr"
 +solarisrequires =  "%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")"
@@ -164,7 +164,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_es"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_es"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-es"
 +solarisrequires =  "%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")"

Modified: branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	Thu Nov 13 16:04:37 2008
@@ -1432,7 +1432,7 @@
 diff -Naur scp2/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
 --- scp2/source/accessories/module_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,55 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1473,8 +1473,11 @@
 +Module gid_Module_Optional_Accessories
 +    ParentID = gid_Module_Optional;
 +    Files = (
++#ifndef WITHOUT_EXTRA_ACCESSORY
 +        gid_File_Basic_Premium,
-+	 	 gid_File_Basic_OOoWikipedia  ); 
++	 gid_File_Basic_OOoWikipedia
++#endif
++  ); 
 +    XPDParentID = "root";
 +    Sortkey = "300";
 +    Minimal = NO;