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

[szalaik svn gnome org]

Author: szalaik
Date: Tue Jan 15 14:07:01 2008
New Revision: 11268
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11268&view=rev

Log:


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

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Tue Jan 15 14:07:01 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 2\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -21,8 +21,7 @@
 --with-extra-sample
 --with-extra-font
 --with-extra-accessory
---with-lang=\"en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv\"
---enable-crashdump
+--with-lang=\"en-US hu\"
 --enable-opengl
 --enable-dbus
 --enable-sdext

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 15 14:07:01 2008
@@ -1920,9 +1920,9 @@
 scp2_directory_accessories.diff
 scp2_makefile_accessories.diff
 # Splitting new contents into new packages -- currently disabled
-#premium-splitted-language-packages.diff
-#premium-splitted-language-pack-solenv.diff
-#premium-splitted-packages.diff
+premium-splitted-language-packages.diff
+premium-splitted-language-pack-solenv.diff
+premium-splitted-packages.diff
 # Add configure options
 extras_configure.diff
 # Add environment variables base on new configure switches

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	Tue Jan 15 14:07:01 2008
@@ -1,41 +1,44 @@
---- instsetoo_native/inc_openoffice/unix/packagelist_language.txt.orig	2007-08-10 19:12:10.000000000 +0200
-+++ instsetoo_native/inc_openoffice/unix/packagelist_language.txt	2007-09-12 15:16:21.864700000 +0200
-@@ -75,3 +75,38 @@
+--- setup_native/source/packinfo/packinfo_office_lang.txt.orig	2007-09-06 12:02:24.000000000 +0200
++++ setup_native/source/packinfo/packinfo_office_lang.txt	2008-01-07 07:08:59.000000000 +0100
+@@ -75,3 +75,41 @@
  description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
  End
 +
-+# Package definitions for OpenOffice.org Premium - Language Packs
++# Language depended package definitions for OxygenOffice Professional
++
 +# 1/2 Templates
 +
 +Start
-+module = "gid_Module_Langpack_Accessories_Templates"
-+solarispackagename = "openofficeorg-%LANGUAGESTRING-premium-templates"
-+solarisrequires = "openofficeorg-%LANGUAGESTRING"
-+packagename = "openoffice.org-%LANGUAGESTRING-templates"
-+linuxreplaces = "openofficeorg-%LANGUAGESTRING-templates"
-+provides = "openofficeorg-%LANGUAGESTRING-templates"
-+requires = "openoffice.org-%LANGUAGESTRING"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Language Premium templates module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/openoffice.org%PRODUCTVERSION"
++module = "gid_Module_Optional_Accessories_Templates"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
++packagename = "%UNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++provides = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-templates"
++requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++copyright = "1999-2008 by %PRODUCTNAME"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Extra templates for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 +End
 +
 +# 2/2 Samples
 +
 +Start
-+module = "gid_Module_Langpack_Accessories_Samples"
-+solarispackagename = "openofficeorg-%LANGUAGESTRING-premium-samples"
-+solarisrequires = "openofficeorg-%LANGUAGESTRING"
-+packagename = "openoffice.org-%LANGUAGESTRING-samples"
-+linuxreplaces = "openofficeorg-%LANGUAGESTRING-samples"
-+provides = "openofficeorg-%LANGUAGESTRING-samples"
-+requires = "openoffice.org-%LANGUAGESTRING"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Language Premium samples module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/openoffice.org%PRODUCTVERSION"
++module = "gid_Module_Optional_Accessories_Samples"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-%LANGUAGESTRING"
++packagename = "%UNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++provides = "%WITHOUTDOTUNIXPRODUCTNAME-extra-%LANGUAGESTRING-samples"
++requires = "%UNIXPRODUCTNAME-%LANGUAGESTRING"
++copyright = "1999-2008 by %PRODUCTNAME"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Extra samples for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 +End
 +
-+# END OF Package definitions for OpenOffice.org Premium - Language Packs
++# END OF Language depended package definitions for OxygenOffice Professional

Modified: trunk/patches/src680/premium-splitted-packages.diff
==============================================================================
--- trunk/patches/src680/premium-splitted-packages.diff	(original)
+++ trunk/patches/src680/premium-splitted-packages.diff	Tue Jan 15 14:07:01 2008
@@ -1,73 +1,45 @@
---- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig	2007-08-10 19:12:10.000000000 +0200
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	2007-09-12 15:16:21.942826000 +0200
-@@ -487,3 +487,70 @@
+--- setup_native/source/packinfo/packinfo_office.txt.orig	2007-09-06 12:02:13.000000000 +0200
++++ setup_native/source/packinfo/packinfo_office.txt	2008-01-07 07:06:34.000000000 +0100
+@@ -457,3 +457,42 @@
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
  End
 +
-+# Package definitions for OpenOffice.org Premium
-+# 1/4 Gallery
++
++# Package definitions for OxygenOffice Professional
++# 1/2 Gallery
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Gallery"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-premium-gallery"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-gallery"
 +solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-premium-gallery"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-premium-gallery"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
++packagename = "%UNIXPRODUCTNAME-extra-gallery"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-gallery"
 +requires = "%UNIXPRODUCTNAME-core01"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Premium gallery for %PRODUCTNAME %PRODUCTVERSION"
++freebsdrequires = "%UNIXPRODUCTNAME-core01"
++copyright = "1999-2008 by %PRODUCTNAMEg"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
 +destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 +End
 +
-+# 2/4 Fonts
++# 2/2 Fonts
 +
 +Start
 +module = "gid_Module_Optional_Accessories_Fonts"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-premium-fonts"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extra-fonts"
 +solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-premium-fonts"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-premium-fonts"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
++packagename = "%UNIXPRODUCTNAME-extra-fonts"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extra-fonts"
 +requires = "%UNIXPRODUCTNAME-core01"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Premium fonts for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+End
-+
-+# 3/4 Templates
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Templates"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-premium-templates"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-premium-templates"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-premium-templates"
 +freebsdrequires = "%UNIXPRODUCTNAME-core01"
-+requires = "%UNIXPRODUCTNAME-core01"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Premium templates for %PRODUCTNAME %PRODUCTVERSION"
++copyright = "1999-2008 by %PRODUCTNAME"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
 +destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 +End
 +
-+# 4/4 Samples
-+
-+Start
-+module = "gid_Module_Optional_Accessories_Samples"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-premium-samples"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-premium-samples"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-premium-samples"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
-+requires = "%UNIXPRODUCTNAME-core01"
-+copyright = "1999-2007 by OpenOffice.org"
-+vendor = "OpenOffice.org"
-+description = "Premium samples for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+End
 +
-+# END OF Package definitions for OpenOffice.org Premium
++# END OF Package definitions for OxygenOffice Professional