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

[szalaik svn gnome org]

Author: szalaik
Date: Sun Jun  1 18:25:23 2008
New Revision: 12741
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12741&view=rev

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

	* patches/dev300/scp2_accessories_templates.diff
	* patches/dev300/scp2_accessories_templates_makefile.diff:
	Adding language depended scp2 templates.

	* patches/dev300/apply



Added:
   trunk/patches/dev300/scp2_accessories_templates.diff
   trunk/patches/dev300/scp2_accessories_templates_makefile.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Jun  1 18:25:23 2008
@@ -2161,6 +2161,8 @@
 scp2_build_accessories.diff
 scp2_directory_accessories.diff
 scp2_makefile_accessories.diff
+scp2_accessories_templates.diff
+scp2_accessories_templates_makefile.diff
 # Splitting new contents into new packages
 premium-splitted-language-packages.diff
 premium-splitted-language-pack-solenv.diff

Added: trunk/patches/dev300/scp2_accessories_templates.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/scp2_accessories_templates.diff	Sun Jun  1 18:25:23 2008
@@ -0,0 +1,162 @@
+diff -Naur nul/module_langpack_accessories_root.sct scp2/source/templates/module_langpack_accessories_root.sct
+--- nul/module_langpack_accessories_root.sct	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/templates/module_langpack_accessories_root.sct	2008-06-01 09:55:19.000000000 +0200
+@@ -0,0 +1,40 @@
++/*************************************************************************
++*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: module_langpack_accessories_root.sct,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org 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 version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++************************************************************************/
++
++
++
++Module gid_Module_Optional_Accessories_Root_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Accessories;
++    Sortkey = "<SORTKEY>";
++    Language = "<LANGUAGE>";
++    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
++    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
++End
++
+diff -Naur nul/module_langpack_accessories_samples.sct scp2/source/templates/module_langpack_accessories_samples.sct
+--- nul/module_langpack_accessories_samples.sct	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/templates/module_langpack_accessories_samples.sct	2008-06-01 09:55:35.000000000 +0200
+@@ -0,0 +1,66 @@
++/*************************************************************************
++*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: module_langpack_accessories_samples.sct,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org 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 version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++************************************************************************/
++
++
++
++
++Module gid_Module_Optional_Accessories_Samples_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Accessories_Root_<LANGUAGE_>;
++    Sortkey = "100";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Optional_Accessories_Samples_Template;
++    Name = "gid_Module_Optional_Accessories_Samples_<LANGUAGE_>";
++    Description = "gid_Module_Optional_Accessories_Samples_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
++
++Module gid_Module_Optional_Accessories_Documentations_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Accessories_Root_<LANGUAGE_>;
++    Sortkey = "200";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Optional_Accessories_Documentations_Template;
++    Name = "gid_Module_Optional_Accessories_Documentations_<LANGUAGE_>";
++    Description = "gid_Module_Optional_Accessories_Documentations_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
++
++Module gid_Module_Optional_Accessories_Advertisement_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Accessories_Root_<LANGUAGE_>;
++    Sortkey = "300";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Optional_Accessories_Advertisement_Template;
++    Name = "gid_Module_Optional_Accessories_Advertisement_<LANGUAGE_>";
++    Description = "gid_Module_Optional_Accessories_Advertisement_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
++
+diff -Naur nul/module_langpack_accessories_templates.sct scp2/source/templates/module_langpack_accessories_templates.sct
+--- nul/module_langpack_accessories_templates.sct	1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/templates/module_langpack_accessories_templates.sct	2008-06-01 09:55:54.000000000 +0200
+@@ -0,0 +1,43 @@
++/*************************************************************************
++*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: module_langpack_accessories_templates.sct,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org 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 version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++************************************************************************/
++
++
++
++Module gid_Module_Optional_Accessories_Templates_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Accessories_Root_<LANGUAGE_>;
++    Sortkey = "50";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Optional_Accessories_Templates_Template;
++    Name = "gid_Module_Optional_Accessories_Templates_<LANGUAGE_>";
++    Description = "gid_Module_Optional_Accessories_Templates_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
++
+

Added: trunk/patches/dev300/scp2_accessories_templates_makefile.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/scp2_accessories_templates_makefile.diff	Sun Jun  1 18:25:23 2008
@@ -0,0 +1,28 @@
+--- scp2/source/templates/makefile.mk.orig	2008-04-10 11:54:19.000000000 +0200
++++ scp2/source/templates/makefile.mk	2008-06-01 10:01:57.000000000 +0200
+@@ -44,7 +44,7 @@
+ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
+ .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_onlineupdate.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_onlineupdate.inc $(INCCOM)$/alllangmodules_accessories_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc
+ 
+ .PHONY $(INCCOM)$/alllangmodules.inc:
+ 	@@-$(RENAME) $@ $  tmp
+@@ -81,3 +81,16 @@
+ .PHONY $(INCCOM)$/alllangmodules_onlineupdate.inc:
+ 	@@-$(RENAME) $@ $  tmp
+ 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_onlineupdate.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_root.inc:
++	@@-$(RENAME) $@ $  tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_root.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_templates.inc:
++	@@-$(RENAME) $@ $  tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_samples.inc:
++	@@-$(RENAME) $@ $  tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
++