ooo-build r14664 - in branches/ooo-build-3-0: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Sun Nov 30 16:47:43 2008
New Revision: 14664
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14664&view=rev

Log:
2008-11-30  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/ooop-langpack-policy.diff
	* patches/dev300/apply: Small OOOP related fix.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/ooop-langpack-policy.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sun Nov 30 16:47:43 2008
@@ -2417,8 +2417,6 @@
 toolbars_sw.diff
 #Always use default iconset
 always_default_iconset.diff
-#Create langpack and full installers
-#ooop-langpack-policy.diff
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module
@@ -2750,3 +2748,8 @@
 # Make tooltips for the icon on the desktop and in the Start Menu on
 # Windows less lame
 win32-tooltips.diff, tml
+
+[ OxygenOfficeDefaultSettings ]
+#Create langpack and full installers
+ooop-langpack-policy.diff
+

Modified: branches/ooo-build-3-0/patches/dev300/ooop-langpack-policy.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/ooop-langpack-policy.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/ooop-langpack-policy.diff	Sun Nov 30 16:47:43 2008
@@ -4,10 +4,10 @@
  .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
  .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
  .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
 +ALLTAR : openoffice ooolanguagepack 
  .ELSE
-+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
 +ALLTAR : openoffice ooolanguagepack sdkoo_en-US ure_en-US
  .ENDIF
  .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""