ooo-build r11299 - in trunk: distro-configs patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Thu Jan 17 12:21:35 2008
New Revision: 11299
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11299&view=rev

Log:


Modified:
   trunk/distro-configs/OxygenOfficeLinux.conf.in
   trunk/patches/src680/premium-splitted-language-pack-solenv.diff

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Thu Jan 17 12:21:35 2008
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 2.4.0 - OxygenOffice Build 2\"
+--with-build-version=\"OxygenOffice Professional 2.4.0 - OxygenOffice Build 3\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -21,8 +21,9 @@
 --with-extra-sample
 --with-extra-font
 --with-extra-accessory
---with-lang=\"en-US hu\"
+--with-lang=\"en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv\"
+--enable-crashdump
 --enable-opengl
 --enable-dbus
 --enable-sdext
---enable-ogltrans
\ No newline at end of file
+--enable-ogltrans

Modified: trunk/patches/src680/premium-splitted-language-pack-solenv.diff
==============================================================================
--- trunk/patches/src680/premium-splitted-language-pack-solenv.diff	(original)
+++ trunk/patches/src680/premium-splitted-language-pack-solenv.diff	Thu Jan 17 12:21:35 2008
@@ -1,21 +1,20 @@
---- solenv/bin/modules/installer/languagepack.pm.orig	2007-08-10 19:16:31.000000000 +0200
-+++ solenv/bin/modules/installer/languagepack.pm	2007-09-12 15:16:21.739698400 +0200
-@@ -94,6 +94,8 @@
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts"; }
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource"; }
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help"; }
-+						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Accessories_Samples"; }
-+						if ( $oneitem->{'Dir'} eq "gid_Dir_Template_Language" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Accessories_Templates"; }
+--- solenv/bin/modules/installer/languagepack.pm.orig	2007-09-06 11:52:02.000000000 +0200
++++ solenv/bin/modules/installer/languagepack.pm	2008-01-15 18:25:40.000000000 +0100
+@@ -98,6 +98,8 @@
+ 						if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
+ 						if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
+ 						if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
++						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Accessories_Samples_$locallang"; }
++						if ( $oneitem->{'Dir'} eq "gid_Dir_Template_Language" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Accessories_Templates_$locallang"; }
  					}
  				}
  
-@@ -200,7 +202,8 @@
+@@ -204,6 +206,8 @@
  		if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; } 
  		if ( ${$alldirs}[$i] =~ /-help/ ) { next; } 
  		if ( ${$alldirs}[$i] =~ /-res/ ) { next; } 
--	
-+        	if ( ${$alldirs}[$i] =~ /-premium-samples/ ) { next; }
-+		if ( ${$alldirs}[$i] =~ /-premium-templates/ ) { next; }
++        	if ( ${$alldirs}[$i] =~ /-samples/ ) { next; } 
++		if ( ${$alldirs}[$i] =~ /-templates/ ) { next; } 
+ 	
  		$packagename = ${$alldirs}[$i];
  		last;
- 	}