GNOME.org
 

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

Author: szalaik
Date: Tue Sep 23 10:01:22 2008
New Revision: 14033
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14033&view=rev

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

	* patches/dev300/extensions_packinfo.diff: Fixed malformed 
patch.
	* patches/dev300/scp2_extensions.diff: Added SUN Templates Pack.
	* download.in: Added automatic download of SUN Templates Pack
	(if configured).

	And SUN -> Sun rename.




Modified:
   trunk/ChangeLog
   trunk/download.in
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/scp2_extensions.diff

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Sep 23 10:01:22 2008
@@ -17,6 +17,13 @@
     print STDERR "gcc & binutils\n";
 };
 
+sub trim($)
+{
+	my $string = shift;
+	$string =~ s/^\s+//;
+	$string =~ s/\s+$//;
+	return $string;
+}
 
 %SRC_URLS = (
     'http:\/\/.*'                        => '',
@@ -91,7 +98,13 @@
     'cairo-.*'			         => 'http://cairographics.org/releases/',
 # OxygenOffice extras
 #    'OOOP-.*\.zip'                 	 => 'http://kent.dl.sf.net/sourceforge/ooop/'
-    'OOOP-.*\.zip'                 	 => 'http://ftp.devall.hu/kami/go-oo/'
+    'OOOP-.*\.zip'                 	 => 'http://ftp.devall.hu/kami/go-oo/',
+# Sun Professional Template Pack
+    'Sun_ODF_Template_Pack_en-US.oxt'	 => 'http://extensions.services.openoffice.org/files/273/0/',
+    'Sun_ODF_Template_Pack_de.oxt'	 => 'http://extensions.services.openoffice.org/files/295/1/',
+    'Sun_ODF_Template_Pack_it.oxt'	 => 'http://extensions.services.openoffice.org/files/299/0/',
+    'Sun_ODF_Template_Pack_fr.oxt'	 => 'http://extensions.services.openoffice.org/files/297/0/',
+    'Sun_ODF_Template_Pack_es.oxt'	 => 'http://extensions.services.openoffice.org/files/301/1/'
 );
 
 if ( '@UPSTREAM_NAME@' ne '' ) {
@@ -349,6 +362,13 @@
     push @files, ( '@OOOP_TEMPLATES_PACK@' );
 }
 
+$suntemplang = trim('@SUNTEMPLATES_LANG@');
+ templang = split (/ /, $suntemplang);
+foreach (@templang) {
+    push @files, ( 'Sun_ODF_Template_Pack_' . $_ . '.oxt');
+	print $_. ' k';
+}
+
 my $distro = '@DISTRO@';
 if ($distro eq 'Ark' ||
     $distro eq 'DroplineGNOME' ||

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Tue Sep 23 10:01:22 2008
@@ -1,6 +1,6 @@
 --- 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,171 @@
+@@ -63,6 +63,166 @@
  End
  
  Start

Modified: trunk/patches/dev300/scp2_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_extensions.diff	Tue Sep 23 10:01:22 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,104 @@
+@@ -0,0 +1,169 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -106,6 +106,71 @@
 +
 +#endif
 +
++/* ** Sun Template Pack (en-US) ** */
++
++#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_en-US
++
++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) ** */
++
++#ifndef WITHOUT_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) ** */
++
++#ifndef WITHOUT_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) ** */
++
++#ifndef WITHOUT_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) ** */
++
++#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_es
++
++File gid_File_Optional_Extensions_Sun_Template_Pack_es
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = "Sun_ODF_Template_Pack_es.oxt";
++End
++
++#endif
++
 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
@@ -170,7 +235,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,121 @@
+@@ -0,0 +1,196 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -291,11 +356,86 @@
 +    Styles = ( );
 +End
 +#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_office.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)** */
++
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
++Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
++    PackageInfo = "packinfo_office.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_it
++Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Optional_Extensions_Sun_Template_Pack_it );
++    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_office.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_office.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,71 @@
+@@ -0,0 +1,101 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -338,33 +478,63 @@
 +en-US = "Useful %PRODUCTNAME extensions."
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-+en-US = "SUN Presentation Minimizer"
++en-US = "Sun Presentation Minimizer"
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-+en-US = "SUN Presentation Minimizer"
++en-US = "Sun Presentation Minimizer"
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-+en-US = "SUN Report Builder"
++en-US = "Sun Report Builder"
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-+en-US = "SUN Report Builder"
++en-US = "Sun Report Builder"
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
-+en-US = "SUN MediaWiki Publisher"
++en-US = "Sun MediaWiki Publisher"
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
-+en-US = "SUN MediaWiki Publisher"
++en-US = "Sun MediaWiki Publisher"
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
-+en-US = "SUN Presenter Screen"
++en-US = "Sun Presenter Screen"
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
-+en-US = "SUN Presenter Screen"
++en-US = "Sun Presenter Screen"
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-+en-US = "SUN PDF Import"
++en-US = "Sun PDF Import"
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-+en-US = "SUN PDF Import"
++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_de]
++en-US = "Sun Professional Template Pack (de)"
++
++[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)"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr]
++en-US = "Sun Professional Template Pack (fr)"
++
++[STR_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es]
++en-US = "Sun Professional Template Pack (es)"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es]
++en-US = "Sun Professional Template Pack (es)"
 +
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]