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

[szalaik svn gnome org]

Author: szalaik
Date: Fri Oct 10 14:05:09 2008
New Revision: 14281
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14281&view=rev

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

	* patches/dev300/scp2_extensions.diff
	* patches/dev300/extensions_packinfo.diff:
	Split extensions packinfo into packinfo_extensions.txt file.

	* patches/dev300/scp2_accessories.diff
	* patches/dev300/premium-splitted-packages.diff:
	Split accessories packinfo into packinfo_accessories.txt file.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
   branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff
   branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
   branches/ooo-build-3-0/patches/dev300/scp2_extensions.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	Fri Oct 10 14:05:09 2008
@@ -1,9 +1,25 @@
---- setup_native/source/packinfo/packinfo_office.txt.orig	2008-01-14 20:09:47.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office.txt	2008-03-29 11:00:24.000000000 +0100
-@@ -63,6 +63,166 @@
- End
- 
- Start
+--- setup_native/source/packinfo/packinfo_extensions.txt.orig	2008-01-14 20:09:47.000000000 +0100
++++ setup_native/source/packinfo/packinfo_extensions.txt	2008-03-29 11:00:24.000000000 +0100
+@@ -0,0 +1,179 @@
++# Format:
++
++# Start
++# scpModule
++# shellscript file (optional)
++# solarispackagename
++# solarisrequires (optional)
++# solarisprovides (optional)
++# packagename
++# linuxreplaces (optional)
++# requires (optional)
++# provides (optional)
++# copyright
++# vendor
++# description
++# destpath
++# End
++
++Start
 +module = "gid_Module_Optional_Extensions_MINIMIZER"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
@@ -163,7 +179,4 @@
 +packageversion = "%PACKAGEVERSION"
 +End
 +
-+Start
- module = "gid_Module_Prg_Wrt_Bin"
- script = "shellscripts_module.txt"
- solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
++

Modified: branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/premium-splitted-packages.diff	Fri Oct 10 14:05:09 2008
@@ -1,10 +1,23 @@
---- setup_native/source/packinfo/packinfo_office.txt.orig	2008-03-25 00:12:39.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office.txt	2008-03-23 15:00:51.000000000 +0100
-@@ -457,3 +473,59 @@
- destpath = "/opt"
- packageversion = "%OOOPACKAGEVERSION"
- End
-+
+--- setup_native/source/packinfo/packinfo_accessories.txt.orig	2008-03-25 00:12:39.000000000 +0100
++++ setup_native/source/packinfo/packinfo_accessories.txt	2008-03-23 15:00:51.000000000 +0100
+@@ -0,0 +1,74 @@
++# Format:
++
++# Start
++# scpModule
++# shellscript file (optional)
++# solarispackagename
++# solarisrequires (optional)
++# solarisprovides (optional)
++# packagename
++# linuxreplaces (optional)
++# requires (optional)
++# provides (optional)
++# copyright
++# vendor
++# description
++# destpath
++# End
 +
 +# Package definitions for OxygenOffice Professional
 +# 1/3 Gallery
@@ -60,3 +73,5 @@
 +
 +
 +# END OF Package definitions for OxygenOffice Professional
++
++

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	Fri Oct 10 14:05:09 2008
@@ -1576,7 +1576,7 @@
 +#ifndef WITHOUT_EXTRA_FONT
 +
 +Module gid_Module_Optional_Accessories_Fonts
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_accessories.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
 +    ParentID = gid_Module_Optional_Accessories;
 +    Files = ( 
@@ -1820,7 +1820,7 @@
 +#ifndef WITHOUT_EXTRA_GALLERY
 +
 +Module gid_Module_Optional_Accessories_Gallery
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_accessories.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
 +    ParentID = gid_Module_Optional_Accessories;
 +    Files = (
@@ -2105,7 +2105,7 @@
 +End
 +
 +Module gid_Module_Optional_Accessories_Templates_Common
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_accessories.txt";
 +    ParentID = gid_Module_Optional_Accessories;
 +    Name = "gid_Module_Optional_Accessories_Templates_Common";
 +    Description = "gid_Module_Optional_Accessories_Templates_Common";

Modified: branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	Fri Oct 10 14:05:09 2008
@@ -287,7 +287,7 @@
 +#ifndef WITHOUT_EXTENSION_MINIMIZER
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MINIMIZER
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -304,7 +304,7 @@
 +#ifndef WITHOUT_EXTENSION_REPORTDESIGN
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_REPORTDESIGN
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -321,7 +321,7 @@
 +#ifndef WITHOUT_EXTENSION_MEDIAWIKI
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MEDIAWIKI
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -338,7 +338,7 @@
 +#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -355,7 +355,7 @@
 +#ifndef WITHOUT_EXTENSION_PDFIMPORT
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PDFIMPORT
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -371,7 +371,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -386,7 +386,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -401,7 +401,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -416,7 +416,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -431,7 +431,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (