ooo-build r14627 - in trunk: . patches/dev300

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14627 - in trunk: . patches/dev300
Date: Thu, 27 Nov 2008 19:08:59 +0000 (UTC)
Author: szalaik
Date: Thu Nov 27 19:08:59 2008
New Revision: 14627
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14627&view=rev

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

	* patches/dev300/scp2_accessories_templates_makefile.diff
	* patches/dev300/premium-splitted-language-packages.diff
	* patches/dev300/extensions_configure.diff
	* patches/dev300/extensions_packinfo.diff
	* patches/dev300/scp2_makefile_extensions.diff
	* patches/dev300/scp2_extensions.diff
	* patches/dev300/apply
	Sun Templates Pack I integration was not perfect, now I try to
	make it better. Introducing full language dependency in scp2
	module for it.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/premium-splitted-language-packages.diff
   trunk/patches/dev300/scp2_accessories_templates_makefile.diff
   trunk/patches/dev300/scp2_extensions.diff
   trunk/patches/dev300/scp2_makefile_extensions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Nov 27 19:08:59 2008
@@ -2341,6 +2341,8 @@
 scp2_extensions.diff
 extensions_configure.diff
 extensions_packinfo.diff
+# Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
+premium-splitted-language-packages.diff
 
 [ IntegrateExtensions ]
 extensions_deliver.diff
@@ -2386,9 +2388,10 @@
 scp2_accessories_templates_makefile.diff
 
 # Splitting new contents into new packages
-premium-splitted-language-packages.diff
+# NOTE: premium-splitted-language-packages.diff moved to IntegrateExtensions section, but it contains all required function for OOOP too.
 premium-splitted-language-pack-solenv.diff
 premium-splitted-packages.diff
+
 # Add configure options
 extras_configure.diff
 # Add environment variables base on new configure switches

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Thu Nov 27 19:08:59 2008
@@ -59,7 +59,7 @@
    SYSTEM_JFREEREPORT=NO
  fi
  AC_SUBST(ENABLE_REPORTDESIGN)
-@@ -6055,6 +6068,53 @@
+@@ -6055,6 +6068,52 @@
  fi
  
  dnl ===================================================================
@@ -84,6 +84,7 @@
 +    SUNTEMPLATES_LANG=""
 +    AC_MSG_RESULT([no integration])
 +else
++    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
 +    sun_supported_langs="en-US de it fr es"
 +    if test "z$with_sun_templates" = "zyes" ; then
 +	wanted_sun_templates="$sun_supported_langs"
@@ -101,8 +102,6 @@
 +    for lang in $wanted_sun_templates ; do
 +	if test -n "`echo $with_lang | grep "$lang"`" ; then
 +		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-+		fixed_lang=`echo $lang | sed -e s/-/_/g`
-+       SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
 +	fi
 +    done
 +    AC_MSG_RESULT([$SUNTEMPLATES_LANG])

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Thu Nov 27 19:08:59 2008
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -0,0 +1,99 @@
 +# Format:
 +
 +# Start
@@ -99,84 +99,4 @@
 +packageversion = "%PACKAGEVERSION"
 +End
 +
-+Start
-+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")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-en-US"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (en-US) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+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")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-de"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (de) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+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")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-it"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (it) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+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")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-fr"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (fr) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
-+Start
-+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")"
-+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-es"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "SUN Template Pack (es) %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
 +

Modified: trunk/patches/dev300/premium-splitted-language-packages.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-language-packages.diff	(original)
+++ trunk/patches/dev300/premium-splitted-language-packages.diff	Thu Nov 27 19:08:59 2008
@@ -1,10 +1,26 @@
 --- setup_native/source/packinfo/packinfo_office_lang.txt.orig	2008-03-25 00:11:06.000000000 +0100
 +++ setup_native/source/packinfo/packinfo_office_lang.txt	2008-03-23 15:36:45.000000000 +0100
-@@ -75,3 +75,75 @@
+@@ -75,3 +75,91 @@
  description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
  End
 +
++Start
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
++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")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "1999-2008 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%OOOPACKAGEVERSION"
++End
++
 +# Language depended package definitions for OxygenOffice Professional
 +
 +# 1/4 Templates

Modified: trunk/patches/dev300/scp2_accessories_templates_makefile.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories_templates_makefile.diff	(original)
+++ trunk/patches/dev300/scp2_accessories_templates_makefile.diff	Thu Nov 27 19:08:59 2008
@@ -5,11 +5,11 @@
  .EXPORT : COMPLETELANGISO_VAR
  
 -ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
-+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc
++ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_root.inc $(INCCOM)$/alllangmodules_extensions_templates.inc
  
  .PHONY $(INCCOM)$/alllangmodules.inc:
  	@@-$(RENAME) $@ $  tmp
-@@ -85,3 +85,20 @@
+@@ -85,3 +85,24 @@
  .PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
  	@@-$(RENAME) $@ $  tmp
  	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
@@ -26,6 +26,10 @@
 +	@@-$(RENAME) $@ $  tmp
 +	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
 +
++.PHONY $(INCCOM)$/alllangmodules_extensions_root.inc:
++	@@-$(RENAME) $@ $  tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_root.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++
 +.PHONY $(INCCOM)$/alllangmodules_extensions_templates.inc:
 +	@@-$(RENAME) $@ $  tmp
 +	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_templates.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@

Modified: trunk/patches/dev300/scp2_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_extensions.diff	Thu Nov 27 19:08:59 2008
@@ -116,7 +116,7 @@
 +    Name (de) = "Sun_ODF_Template_Pack_de.oxt";
 +    Name (it) = "Sun_ODF_Template_Pack_it.oxt";
 +    Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
-+    Name (es)= "Sun_ODF_Template_Pack_es.oxt";
++    Name (es) = "Sun_ODF_Template_Pack_es.oxt";
 +   Styles = (PACKED);
 +   UnixRights = 444;
 +End
@@ -126,7 +126,7 @@
 diff -Naur scp2/source/extensions/makefile.mk scp2/source/extensions/makefile.mk
 --- scp2/source/extensions/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/makefile.mk	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,58 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -177,6 +177,7 @@
 +SCP_PRODUCT_TYPE=osl
 +PARFILES= \
 +        module_extensions.par             \
++        module_extensions_sun_templates.par             \
 +        file_extensions.par
 +
 +ULFFILES= \
@@ -187,7 +188,7 @@
 diff -Naur scp2/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
 --- scp2/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2008-03-29 07:50:23.000000000 +0100
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,132 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -319,13 +320,54 @@
 +#endif
 +#endif
 +
++#include "alllangmodules_extensions_root.inc"
++
+diff -Naur scp2/source/extensions/module_extensions_sun_templates.scp scp2/source/extensions/module_extensions_sun_templates.scp
+--- scp2/source/extensions/module_extensions_sun_templates.scp	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/extensions/module_extensions_sun_templates.scp	2008-03-29 07:50:23.000000000 +0100
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: module_extensions_sun_templates.scp,v $
++ *
++ *  $Revision: 1.0 $
++ *
++ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include "macros.inc"
++
 +/* ** SUN Template Pack ** */
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
 +
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack
-+    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK);
++Module gid_Module_Optional_Extensions_Sun_Template_Pack_Template
 +    ParentID = gid_Module_Optional_Extensions;
 +    Name = "gid_Module_Optional_Extensions_Sun_Template_Pack_Template";
 +    Description = "gid_Module_Optional_Extensions_Sun_Template_Pack_Template";
@@ -336,6 +378,8 @@
 +    Default = YES;
 +End
 +
++#include "alllangmodules_extensions_templates.inc"
++
 +#endif
 +
 diff -Naur scp2/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
@@ -419,19 +463,19 @@
 +[STR_DESC_OPTIONAL_EXTENSIONS_TEMPLATE_PACK]
 +en-US = "Sun Professional Template Pack"
 +
-diff -Naur scp2/source/templates/module_langpack_extensions_templates.sct scp2/source/templates/module_langpack_extensions_templates.sct
---- scp2/source/templates/module_langpack_extensions_templates.sct	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_extensions_templates.sct	2008-03-29 07:50:23.000000000 +0100
-@@ -0,0 +1,55 @@
+diff -Naur scp2/source/templates/module_langpack_extensions_root.sct scp2/source/templates/module_langpack_extensions_root.sct
+--- scp2/source/templates/module_langpack_extensions_root.sct	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/templates/module_langpack_extensions_root.sct	2008-03-29 07:50:23.000000000 +0100
+@@ -0,0 +1,44 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
 + *
-+ *  $RCSfile: module_accessories.scp,v $
++ *  $RCSfile: module_langpack_extensions_root.sct,v $
 + *
 + *  $Revision: 1.0 $
 + *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
++ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
 + *
 + *  The Contents of this file are made available subject to
 + *  the terms of GNU Lesser General Public License Version 2.1.
@@ -468,6 +512,47 @@
 +    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
 +End
 +
+diff -Naur scp2/source/templates/module_langpack_extensions_templates.sct scp2/source/templates/module_langpack_extensions_templates.sct
+--- scp2/source/templates/module_langpack_extensions_templates.sct	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/templates/module_langpack_extensions_templates.sct	2008-03-29 07:50:23.000000000 +0100
+@@ -0,0 +1,47 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
++ *
++ *  $Revision: 1.0 $
++ *
++ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include "macros.inc"
++
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_<LANGUAGE_>
 +    ParentID = gid_Module_Optional_Extensions_Root_<LANGUAGE_>;
 +    Sortkey = "50";

Modified: trunk/patches/dev300/scp2_makefile_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_makefile_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_makefile_extensions.diff	Thu Nov 27 19:08:59 2008
@@ -1,19 +1,21 @@
 --- scp2/util/makefile.mk.orig	2008-03-19 07:37:00.000000000 +0100
 +++ scp2/util/makefile.mk	2008-03-19 10:24:18.000000000 +0100
-@@ -81,6 +81,8 @@
+@@ -81,6 +81,9 @@
               module_systemint.par          \
               module_graphicfilter.par      \
               file_graphicfilter.par        \
 +             module_extensions.par         \
++             module_extensions_sun_templates.par         \
 +             file_extensions.par           \
               module_testtool.par           \
               file_testtool.par             \
               file_lingu.par                \
-@@ -222,6 +224,8 @@
+@@ -222,6 +224,9 @@
               module_systemint.par          \
               module_graphicfilter.par      \
               file_graphicfilter.par        \
 +             module_extensions.par         \
++             module_extensions_sun_templates.par         \
 +             file_extensions.par           \
               module_testtool.par           \
               file_testtool.par             \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]