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

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13296 - in trunk: . patches/dev300
Date: Fri, 18 Jul 2008 12:32:34 +0000 (UTC)
Author: szalaik
Date: Fri Jul 18 12:32:34 2008
New Revision: 13296
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13296&view=rev

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

	* patches/dev300/premium-splitted-language-packages.diff
	* patches/dev300/scp2_directory_accessories.diff
	* patches/dev300/scp2_accessories.diff
	* patches/dev300/premium-splitted-packages.diff
	* patches/dev300/accessories_target.diff
	Follow changes of packaging related to extras.

	* configure.in
	New templates package: 2.5.0.0 with huge additions...	



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/accessories_target.diff
   trunk/patches/dev300/premium-splitted-language-packages.diff
   trunk/patches/dev300/premium-splitted-packages.diff
   trunk/patches/dev300/scp2_accessories.diff
   trunk/patches/dev300/scp2_directory_accessories.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jul 18 12:32:34 2008
@@ -679,7 +679,7 @@
     OOOP_FONTS_PACK="OOOP-fonts-pack-2.4.0.4.zip"
     OOOP_GALLERY_PACK="OOOP-gallery-pack-2.4.0.4.zip"
     OOOP_SAMPLES_PACK="OOOP-samples-pack-2.4.0.4.zip"
-    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.4.0.6.zip"
+    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.5.0.0.zip"
 fi
 AC_SUBST(OOOP_FONTS_PACK)
 AC_SUBST(OOOP_GALLERY_PACK)

Modified: trunk/patches/dev300/accessories_target.diff
==============================================================================
--- trunk/patches/dev300/accessories_target.diff	(original)
+++ trunk/patches/dev300/accessories_target.diff	Fri Jul 18 12:32:34 2008
@@ -1,6 +1,6 @@
 --- extras/util/target.orig	2005-09-09 00:22:16.000000000 +0200
 +++ extras/util/target.pmk	2005-12-30 10:29:41.754670700 +0100
-@@ -76,6 +76,55 @@
+@@ -76,6 +76,68 @@
  GALLERY_WWWBACK_TARGET          = gallwwwback
  GALLERY_WWWGRAF_TARGET          = gallwwwgraf
 
@@ -34,6 +34,19 @@
 +PREMIUM_TEMPLATES_OFFIMISC_TARGET           = kamitemplatesoffimisc
 +PREMIUM_TEMPLATES_PERSONAL_TARGET           = kamitemplatespersonal
 +PREMIUM_TEMPLATES_ROOT_TARGET               = kamitemplates
++
++PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET     = kamitemplatescommonlayout
++PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET     = kamitemplatescommonpresent
++PREMIUM_TEMPLATES_COMMON_EDUCATE_TARGET            = kamitemplatescommoneducate
++PREMIUM_TEMPLATES_COMMON_FINANCE_TARGET            = kamitemplatescommonfinance
++PREMIUM_TEMPLATES_COMMON_FORMS_TARGET              = kamitemplatescommonforms
++PREMIUM_TEMPLATES_COMMON_LABELS_TARGET             = kamitemplatescommonlabels
++PREMIUM_TEMPLATES_COMMON_MISC_TARGET               = kamitemplatescommonmisc
++PREMIUM_TEMPLATES_COMMON_OFFICORR_TARGET           = kamitemplatescommonofficorr
++PREMIUM_TEMPLATES_COMMON_OFFIMISC_TARGET           = kamitemplatescommonoffimisc
++PREMIUM_TEMPLATES_COMMON_PERSONAL_TARGET           = kamitemplatescommonpersonal
++PREMIUM_TEMPLATES_COMMON_ROOT_TARGET               = kamitemplatescommon
++
 +PREMIUM_SAMPLES_ROOT_TARGET                 = kamisamples
 +PREMIUM_SAMPLES_DOCUMENTATION_TARGET        = kamisamplesdocumentation
 +PREMIUM_SAMPLES_ADVERTISEMENT_TARGET        = kamisamplesadvertisement

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	Fri Jul 18 12:32:34 2008
@@ -1,6 +1,6 @@
 --- 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,79 @@
+@@ -75,3 +75,75 @@
  description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
  End
@@ -11,17 +11,16 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Templates"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
-+requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-templates"
++provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
 +description = "Extra templates for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
 +packageversion = "%OOOPACKAGEVERSION"
 +End
 +
@@ -29,17 +28,16 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Samples"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
-+requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-samples"
++provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
 +description = "Extra samples for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
 +packageversion = "%OOOPACKAGEVERSION"
 +End
 +
@@ -47,12 +45,11 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Documentations"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-documentations"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-documentations"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-documentations"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-documentations"
-+requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
++provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
@@ -65,17 +62,16 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Advertisement"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-advertisement"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-advertisement"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-advertisement"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-advertisement"
-+requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
++provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
 +description = "Extra advertisement for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
 +packageversion = "%OOOPACKAGEVERSION"
 +End
 +

Modified: trunk/patches/dev300/premium-splitted-packages.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-packages.diff	(original)
+++ trunk/patches/dev300/premium-splitted-packages.diff	Fri Jul 18 12:32:34 2008
@@ -1,45 +1,60 @@
 --- 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,44 @@
+@@ -457,3 +473,59 @@
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
  End
 +
 +
 +# Package definitions for OxygenOffice Professional
-+# 1/2 Gallery
++# 1/3 Gallery
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Gallery"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-gallery"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-extra-gallery"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-gallery"
-+requires = "%UNIXPRODUCTNAME-core01"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
-+copyright = "1999-2008 by %PRODUCTNAMEg"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
 +description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
 +packageversion = "%OOOPACKAGEVERSION"
 +End
 +
-+# 2/2 Fonts
++# 2/3 Fonts
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Fonts"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-fonts"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-extra-fonts"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-fonts"
-+requires = "%UNIXPRODUCTNAME-core01"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "%PRODUCTNAME"
 +description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%OOOPACKAGEVERSION"
++End
++
++# 3/3 Templates - Common
++
++Start
++module = "gid_Module_Optional_Accessories_Templates_Common"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
++solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++copyright = "1999-2008 by %PRODUCTNAME"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
 +packageversion = "%OOOPACKAGEVERSION"
 +End
 +

Modified: trunk/patches/dev300/scp2_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_accessories.diff	Fri Jul 18 12:32:34 2008
@@ -1,7 +1,7 @@
 diff -Naur scp2/source/accessories/file_accessories.scp scp2/source/accessories/file_accessories.scp
 --- scp2/source/accessories/file_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,53 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1074,7 +1074,7 @@
 diff -Naur scp2/source/accessories/file_templates_accessories.scp scp2/source/accessories/file_templates_accessories.scp
 --- scp2/source/accessories/file_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_templates_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,279 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1195,6 +1195,85 @@
 +    EXTRA_ALL_LANG(kamitemplatespersonal);
 +End
 +
++/* ** Templates - Common** */
++
++File gid_File_Extra_Templates_Common
++    Dir = gid_Dir_Template_Common;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommon.zip";
++End
++
++File gid_File_Extra_Templates_Common_Layout
++    Dir = gid_Dir_Template_Common_Layout;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonlayout";
++End
++
++File gid_File_Extra_Templates_Common_Present
++    Dir = gid_Dir_Template_Common_Presnt;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonpresent";
++End
++
++File gid_File_Extra_Templates_Common_Educate
++    Dir = gid_Dir_Template_Common_Educate;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommoneducate";
++End
++
++File gid_File_Extra_Templates_Common_Finance
++    Dir = gid_Dir_Template_Common_Finance;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonfinance";
++End
++
++File gid_File_Extra_Templates_Common_Forms
++    Dir = gid_Dir_Template_Common_Forms;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonforms";
++End
++
++File gid_File_Extra_Templates_Common_Labels
++    Dir = gid_Dir_Template_Common_Labels;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonlabels";
++End
++
++File gid_File_Extra_Templates_Common_Misc
++    Dir = gid_Dir_Template_Common_Misc;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonmisc";
++End
++
++File gid_File_Extra_Templates_Common_Officorr
++    Dir = gid_Dir_Template_Common_Officorr;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonofficorr";
++End
++
++File gid_File_Extra_Templates_Common_Offimisc
++    Dir = gid_Dir_Template_Common_Offimisc;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonoffimisc";
++End
++
++File gid_File_Extra_Templates_Common_Personal
++    Dir = gid_Dir_Template_Common_Personal;
++    TXT_FILE_BODY;
++    Styles = (ARCHIVE, DONT_OVERWRITE);
++    Name = "kamitemplatescommonpersonal";
++End
++
 +/* ** Templates - NON FREE ** */
 +
 +File gid_File_Extra_Templates_NONFREE_KAMI
@@ -1952,7 +2031,7 @@
 diff -Naur scp2/source/accessories/module_templates_accessories.scp scp2/source/accessories/module_templates_accessories.scp
 --- scp2/source/accessories/module_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_templates_accessories.scp	2008-03-23 11:10:17.000000000 +0100
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,92 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -2024,6 +2103,24 @@
 +    Default = YES;
 +End
 +
++Module gid_Module_Optional_Accessories_Templates_Common
++    ParentID = gid_Module_Optional_Accessories_Templates_Template;
++    Files = (
++        gid_File_Extra_Templates_Common,
++        gid_File_Extra_Templates_Common_Layout,
++        gid_File_Extra_Templates_Common_Present,
++        gid_File_Extra_Templates_Common_Educate,
++        gid_File_Extra_Templates_Common_Finance,
++        gid_File_Extra_Templates_Common_Forms,
++        gid_File_Extra_Templates_Common_Labels,
++        gid_File_Extra_Templates_Common_Misc,
++        gid_File_Extra_Templates_Common_Officorr,
++        gid_File_Extra_Templates_Common_Offimisc,
++        gid_File_Extra_Templates_Common_Personal );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
 +
 +#include "alllangmodules_accessories_templates.inc"
 +#endif

Modified: trunk/patches/dev300/scp2_directory_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_directory_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_directory_accessories.diff	Fri Jul 18 12:32:34 2008
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/directory_ooo.scp.orig	2007-08-10 19:15:32.000000000 +0200
 +++ scp2/source/ooo/directory_ooo.scp	2007-09-12 15:16:23.052215200 +0200
-@@ -1595,3 +1595,139 @@
+@@ -1595,3 +1595,194 @@
  End
  
  #endif
@@ -140,3 +140,60 @@
 +    ParentID = gid_Dir_Gallery_Elements;
 +    DosName = "Bullets2";
 +End
++
++ /* Templates - Common */
++Directory gid_Dir_Template_Common
++    ParentID = gid_Dir_Template;
++    DosName = "common";
++End
++
++Directory gid_Dir_Template_Common_Educate
++    ParentID = gid_Dir_Template_Common;
++    DosName = "educate";
++End
++
++Directory gid_Dir_Template_Common_Finance
++    ParentID = gid_Dir_Template_Common;
++    DosName = "finance";
++End
++
++Directory gid_Dir_Template_Common_Forms
++    ParentID = gid_Dir_Template_Common;
++    DosName = "forms";
++End
++
++Directory gid_Dir_Template_Common_Labels
++    ParentID = gid_Dir_Template_Common;
++    DosName = "labels";
++End
++
++Directory gid_Dir_Template_Common_Layout
++    ParentID = gid_Dir_Template_Common;
++    DosName = "layout";
++End
++
++Directory gid_Dir_Template_Common_Misc
++    ParentID = gid_Dir_Template_Common;
++    DosName = "misc";
++End
++
++Directory gid_Dir_Template_Common_Officorr
++    ParentID = gid_Dir_Template_Common;
++    DosName = "officorr";
++End
++
++Directory gid_Dir_Template_Common_Offimisc
++    ParentID = gid_Dir_Template_Common;
++    DosName = "offimisc";
++End
++
++Directory gid_Dir_Template_Common_Personal
++    ParentID = gid_Dir_Template_Common;
++    DosName = "personal";
++End
++
++Directory gid_Dir_Template_Common_Presnt
++    ParentID = gid_Dir_Template_Common;
++    DosName = "presnt";
++End
++
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]