ooo-build r12695 - in branches/ooo-build-2-4-1: . distro-configs patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Thu May 29 08:26:52 2008
New Revision: 12695
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12695&view=rev

Log:
2008-05-29  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/premium-splitted-makeinstaller-solenv.diff
	* patches/dev300/extensions_shellscripts.diff: Removed extension
	installer for deb packages, because upstream now comes with this
	feature.

	* distro-configs/OxygenOfficeLinux.conf.in
	* distro-configs/OxygenOfficeWindows.conf.in: Preparing for
	2.4.1 version of OxygenOffice Professional.

	* patches/dev300/apply



Removed:
   branches/ooo-build-2-4-1/patches/src680/extensions_shellscripts.diff
   branches/ooo-build-2-4-1/patches/src680/premium-splitted-makeinstaller-solenv.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/distro-configs/OxygenOfficeLinux.conf.in
   branches/ooo-build-2-4-1/distro-configs/OxygenOfficeWindows.conf.in
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- branches/ooo-build-2-4-1/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ branches/ooo-build-2-4-1/distro-configs/OxygenOfficeLinux.conf.in	Thu May 29 08:26:52 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 M12 - OxygenOffice Build 14\"
+--with-build-version=\"OxygenOffice Professional 2.4.1 M17 - OxygenOffice Build 20\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba

Modified: branches/ooo-build-2-4-1/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- branches/ooo-build-2-4-1/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ branches/ooo-build-2-4-1/distro-configs/OxygenOfficeWindows.conf.in	Thu May 29 08:26:52 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 M12 - OxygenOffice Build 14\"
+--with-build-version=\"OxygenOffice Professional 2.4.1 M17 - OxygenOffice Build 20\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Thu May 29 08:26:52 2008
@@ -2276,7 +2276,6 @@
 scp2_extensions.diff
 extensions_configure.diff
 extensions_packinfo.diff
-extensions_shellscripts.diff
 extensions_deliver.diff
  
 [ OxygenOfficeDefaultSettings ]
@@ -2297,7 +2296,7 @@
 toolbars_sd.diff
 #for Writer
 toolbars_sw.diff
-#Always use default iconset
+#Always use default extensioniconset
 always_default_iconset.diff
 
 [ OxygenOfficeExtras ]
@@ -2316,7 +2315,6 @@
 # Splitting new contents into new packages
 premium-splitted-language-packages.diff
 premium-splitted-language-pack-solenv.diff
-premium-splitted-makeinstaller-solenv.diff
 premium-splitted-packages.diff
 # Add configure options
 extras_configure.diff