ooo-build r11339 - in trunk: . distro-configs patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Mon Jan 21 14:17:26 2008
New Revision: 11339
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11339&view=rev

Log:


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

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Mon Jan 21 14:17:26 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 3\"
+--with-build-version=\"OxygenOffice Professional 2.4.0 - OxygenOffice Build 5\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -16,6 +16,7 @@
 --enable-lockdown
 --enable-cairo
 --with-system-freetype
+--without-unix-wrapper
 --with-extra-gallery
 --with-extra-template
 --with-extra-sample
@@ -27,3 +28,4 @@
 --enable-dbus
 --enable-sdext
 --enable-ogltrans
+--enable-mono

Modified: trunk/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeWindows.conf.in	Mon Jan 21 14:17:26 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 1\"
+--with-build-version=\"OxygenOffice Professional 2.4.0 - OxygenOffice Build 5\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba

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	Mon Jan 21 14:17:26 2008
@@ -4,8 +4,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"; }
++						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories"; }
++						if ( $oneitem->{'Dir'} eq "gid_Dir_Template_Language" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Templates"; }
  					}
  				}
  
@@ -13,8 +13,8 @@
  		if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; } 
  		if ( ${$alldirs}[$i] =~ /-help/ ) { next; } 
  		if ( ${$alldirs}[$i] =~ /-res/ ) { next; } 
-+        	if ( ${$alldirs}[$i] =~ /-samples/ ) { next; } 
-+		if ( ${$alldirs}[$i] =~ /-templates/ ) { next; } 
++        	if ( ${$alldirs}[$i] =~ /-extra-samples/ ) { next; } 
++		if ( ${$alldirs}[$i] =~ /-extra-templates/ ) { next; } 
  	
  		$packagename = ${$alldirs}[$i];
  		last;

Modified: trunk/patches/src680/premium-splitted-language-packages.diff
==============================================================================
--- trunk/patches/src680/premium-splitted-language-packages.diff	(original)
+++ trunk/patches/src680/premium-splitted-language-packages.diff	Mon Jan 21 14:17:26 2008
@@ -11,11 +11,11 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Templates"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
 +solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
++provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-templates"
 +requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"
@@ -28,11 +28,11 @@
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Samples"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
 +solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
-+packagename = "%UNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
-+provides = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++packagename = "%UNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
++provides = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING-extra-samples"
 +requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
 +copyright = "1999-2008 by %PRODUCTNAME"
 +solariscopyright = "solariscopyrightfile"