ooo-build r14601 - in trunk: . bin patches/dev300

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14601 - in trunk: . bin patches/dev300
Date: Tue, 25 Nov 2008 20:17:39 +0000 (UTC)
Author: szalaik
Date: Tue Nov 25 20:17:39 2008
New Revision: 14601
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14601&view=rev

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

	* patches/dev300/scp2_accessories_templates_makefile.diff
	* patches/dev300/ooop-langpack-policy.diff
	* patches/dev300/apply
	* patches/dev300/scp2_accessories.diff
	* patches/dev300/premium-splitted-packages.diff
	* patches/dev300/scp2_extensions.diff
	* bin/setup.in
	* bin/unpack
	* configure.in
	* download.in
	Transfer ooo-build 3.0.0 changes to trunk.



Added:
   trunk/patches/dev300/ooop-langpack-policy.diff
Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/premium-splitted-packages.diff
   trunk/patches/dev300/scp2_accessories.diff
   trunk/patches/dev300/scp2_accessories_templates_makefile.diff
   trunk/patches/dev300/scp2_extensions.diff

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Nov 25 20:17:39 2008
@@ -48,6 +48,7 @@
 CAIRO_ENABLED= CAIRO_ENABLED@
 SYSTEM_CAIRO= SYSTEM_CAIRO@
 PREBUILT_WRITINGAIDS_TIMESTAMP= PREBUILT_WRITINGAIDS_TIMESTAMP@
+PREBUILT_EXTENSIONAIDS_TIMESTAMP= PREBUILT_EXTENSIONAIDS_TIMESTAMP@
 SYSTEM_LIBWPD= SYSTEM_LIBWPD@
 SYSTEM_LIBWPG= SYSTEM_LIBWPG@
 SYSTEM_LIBWPS= SYSTEM_LIBWPS@

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Nov 25 20:17:39 2008
@@ -151,6 +151,12 @@
 	    ;;
     esac
 
+    case "$DISTRO" in
+	OxygenOffice*|FSFhu*)
+	    check_file $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip
+	    ;;
+    esac
+
 if test "z$SYSTEM_GCC" = "z"; then
     # unpack binutils
     cd $BUILDDIR
@@ -480,6 +486,7 @@
 
 case "$DISTRO" in
     NovellWin32*|GoOoWin32*)
+    echo "Creating prebuilt writing aids extension (dict-bundle.oxt)..."
 
     # Create prebuilt dict-bundle.oxt
 
@@ -585,6 +592,13 @@
     ;;
 esac
 
+case "$DISTRO" in
+	OxygenOffice*|FSFhu*)
+	    echo "Extracting extension aids..."
+	    unzip -q -o $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip -d $OOBUILDDIR/dictionaries
+	    ;;
+esac
+
 if test "z$SYSTEM_GCC" = "z"; then
     echo "Checking for gcc sources and prerequisities"
     if test -d "$BUILDDIR/$GCC_VER" &&
@@ -735,7 +749,7 @@
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_file $SRCDIR/$pack
     echo "Unpacking $pack"
-    unzip $SRCDIR/$pack -d $OOBUILDDIR/extras/source
+    unzip -q $SRCDIR/$pack -d $OOBUILDDIR/extras/source
 done
 
 # Sun Professional Templates Pack

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 25 20:17:39 2008
@@ -733,7 +733,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.6.0.0.zip"
+    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.6.0.2.zip"
 fi
 AC_SUBST(OOOP_FONTS_PACK)
 AC_SUBST(OOOP_GALLERY_PACK)
@@ -797,6 +797,9 @@
 PREBUILT_WRITINGAIDS_TIMESTAMP=20080320
 AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
 
+PREBUILT_EXTENSIONAIDS_TIMESTAMP=20081125
+AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
+
 BUILD_MOZILLA_SOURCE='mozilla-source-1.7.5.tar.gz'
 AC_SUBST(BUILD_MOZILLA_SOURCE)
 

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Nov 25 20:17:39 2008
@@ -65,6 +65,10 @@
     'silgraphite-.*'                     => '@MIRROR@/SRC680',
 # Prebuilt dictionaries for Novell Windows builds
     'writingaids.*\.zip'                 => '@MIRROR@/SRC680',
+
+# Prebuilt extension dictionaries for OxygenOffice and FSFhu builds
+    'extensionaids.*\.zip'                 => 'http://ftp.devall.hu/kami/go-oo/',
+
 # Win32 bits:
     'unicows\.exe'			 => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
     # from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
@@ -264,6 +268,8 @@
 push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 
+push @files, ( 'extensionaids- PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows|FSFhu/;
+
 if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
     push @files, ( 'cairo- CAIRO_VER@.tar.gz' );
 }
@@ -371,7 +377,6 @@
 @templang = split (/ /, $suntemplang);
 foreach (@templang) {
     push @files, ( 'Sun_ODF_Template_Pack_' . $_ . '.oxt');
-	print $_. ' k';
 }
 
 my $distro = '@DISTRO@';

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Nov 25 20:17:39 2008
@@ -2509,6 +2509,8 @@
 toolbars_sw.diff
 #Always use default iconset
 always_default_iconset.diff
+#Create langpack and full installers
+#ooop-langpack-policy.diff
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module

Added: trunk/patches/dev300/ooop-langpack-policy.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ooop-langpack-policy.diff	Tue Nov 25 20:17:39 2008
@@ -0,0 +1,14 @@
+--- instsetoo_native/util/makefile.mk	30 Jul 2008 13:30:16 -0000	1.90.8.1
++++ instsetoo_native/util/makefile.mk	29 Sep 2008 12:24:56 -0000
+@@ -102,9 +102,9 @@ ALLTAR : $(LOCALPYFILES)
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
++ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
++ALLTAR : openoffice ooolanguagepack 
+ .ELSE
++ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
++ALLTAR : openoffice ooolanguagepack sdkoo_en-US ure_en-US
+ .ENDIF
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack

Modified: trunk/patches/dev300/premium-splitted-packages.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-packages.diff	(original)
+++ trunk/patches/dev300/premium-splitted-packages.diff	Tue Nov 25 20:17:39 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 @@
- packageversion = "%PACKAGEVERSION"
- 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: trunk/patches/dev300/scp2_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_accessories.diff	Tue Nov 25 20:17:39 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;
@@ -1573,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 = ( 
@@ -1817,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 = (
@@ -2102,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: 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	Tue Nov 25 20:17:39 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
++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
  
  .PHONY $(INCCOM)$/alllangmodules.inc:
  	@@-$(RENAME) $@ $  tmp
-@@ -85,3 +85,15 @@
+@@ -85,3 +85,20 @@
  .PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
  	@@-$(RENAME) $@ $  tmp
  	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
@@ -25,3 +25,8 @@
 +.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 $@
++
++.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	Tue Nov 25 20:17:39 2008
@@ -1,7 +1,7 @@
 diff -Naur scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
 --- scp2/source/extensions/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/file_extensions.scp	2008-03-29 07:50:21.000000000 +0100
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,120 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -106,67 +106,19 @@
 +
 +#endif
 +
-+/* ** Sun Template Pack (en-US) ** */
++/* ** Sun Template Pack ** */
 +
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
 +
-+File gid_File_Optional_Extensions_Sun_Template_Pack_en-US
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "Sun_ODF_Template_Pack_en-US.oxt";
-+End
-+
-+#endif
-+
-+/* ** Sun Template Pack (de) ** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
-+
-+File gid_File_Optional_Extensions_Sun_Template_Pack_de
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "Sun_ODF_Template_Pack_de.oxt";
-+End
-+
-+#endif
-+
-+/* ** Sun Template Pack (it) ** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
-+
-+File gid_File_Optional_Extensions_Sun_Template_Pack_it
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "Sun_ODF_Template_Pack_it.oxt";
-+End
-+
-+#endif
-+
-+/* ** Sun Template Pack (fr) ** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
-+
-+File gid_File_Optional_Extensions_Sun_Template_Pack_fr
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "Sun_ODF_Template_Pack_fr.oxt";
-+End
-+
-+#endif
-+
-+/* ** Sun Template Pack (es) ** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
-+
-+File gid_File_Optional_Extensions_Sun_Template_Pack_es
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
++File gid_File_Optional_Extensions_Sun_Template_Pack
 +    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "Sun_ODF_Template_Pack_es.oxt";
++    Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt";
++    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";
++   Styles = (PACKED);
++   UnixRights = 444;
 +End
 +
 +#endif
@@ -235,7 +187,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,206 @@
+@@ -0,0 +1,149 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -367,85 +319,29 @@
 +#endif
 +#endif
 +
-+/* ** SUN Template Pack (en-US)** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
-+    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
-+    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Optional_Extensions_Sun_Template_Pack_en-US );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+#endif
-+
-+/* ** SUN Template Pack (de)** */
++/* ** SUN Template Pack ** */
 +
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
-+    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
-+    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Optional_Extensions_Sun_Template_Pack_de );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+#endif
-+
-+/* ** SUN Template Pack (it)** */
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
 +
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
++Module gid_Module_Optional_Extensions_Sun_Template_Pack
 +    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK);
 +    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Optional_Extensions_Sun_Template_Pack_it );
++    Name = "gid_Module_Optional_Extensions_Sun_Template_Pack_Template";
++    Description = "gid_Module_Optional_Extensions_Sun_Template_Pack_Template";
++    Styles = (TEMPLATEMODULE);
++    Files = ( 
++        gid_File_Optional_Extensions_Sun_Template_Pack );
 +    Minimal = NO;
 +    Default = YES;
-+    Styles = ( );
 +End
-+#endif
 +
-+/* ** SUN Template Pack (fr)** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
-+    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
-+    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Optional_Extensions_Sun_Template_Pack_fr );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
 +#endif
 +
-+/* ** SUN Template Pack (es)** */
-+
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
-+    PackageInfo = "packinfo_extensions.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
-+    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Optional_Extensions_Sun_Template_Pack_es );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+#endif
-+					
 diff -Naur scp2/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
 --- scp2/source/extensions/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.ulf	2008-03-29 07:50:27.000000000 +0100
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,76 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -517,34 +413,69 @@
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
 +en-US = "Sun PDF Import"
 +
-+[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US]
-+en-US = "Sun Professional Template Pack (en-US)"
-+
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US]
-+en-US = "Sun Professional Template Pack (en-US)"
++[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK]
++en-US = "Sun Professional Template Pack"
 +
-+[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de]
-+en-US = "Sun Professional Template Pack (de)"
++[STR_DESC_OPTIONAL_EXTENSIONS_TEMPLATE_PACK]
++en-US = "Sun Professional Template Pack"
 +
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de]
-+en-US = "Sun Professional Template Pack (de)"
-+
-+[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it]
-+en-US = "Sun Professional Template Pack (it)"
-+
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it]
-+en-US = "Sun Professional Template Pack (it)"
-+
-+[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr]
-+en-US = "Sun Professional Template Pack (fr)"
+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 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: module_accessories.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
++ *
++ ************************************************************************/
 +
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr]
-+en-US = "Sun Professional Template Pack (fr)"
++#include "macros.inc"
 +
-+[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es]
-+en-US = "Sun Professional Template Pack (es)"
++Module gid_Module_Optional_Extensions_Root_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Extensions;
++    Sortkey = "<SORTKEY>";
++    Language = "<LANGUAGE>";
++    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
++    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
++End
 +
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es]
-+en-US = "Sun Professional Template Pack (es)"
++Module gid_Module_Optional_Extensions_Sun_Template_Pack_<LANGUAGE_>
++    ParentID = gid_Module_Optional_Extensions_Root_<LANGUAGE_>;
++    Sortkey = "50";
++    Language = "<LANGUAGE>";
++    Assigns = gid_Module_Optional_Extensions_Sun_Template_Pack_Template;
++    Name = "gid_Module_Optional_Extensions_Sun_Template_Pack_<LANGUAGE_>";
++    Description = "gid_Module_Optional_Extensions_Sun_Template_Pack_<LANGUAGE_>";
++    PackageInfo = "packinfo_office_lang.txt";
++    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
++End
 +
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]