ooo-build r14666 - in trunk: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Sun Nov 30 16:53:27 2008
New Revision: 14666
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14666&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:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ooop-langpack-policy.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Nov 30 16:53:27 2008
@@ -2394,8 +2394,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
@@ -2785,9 +2783,14 @@
 cws-hb10.diff
 cws-hb11.diff
 
+[ OxygenOfficeDefaultSettings ]
+#Create langpack and full installers
+ooop-langpack-policy.diff
+
 [ UnusedMethodsRemoval ]
 # Patches in this section remove unused methods identified by callcatcher.
 
 # NOTE! This section should always be at the bottom so that no other patches would
 # depend on it.
 
+

Modified: trunk/patches/dev300/ooop-langpack-policy.diff
==============================================================================
--- trunk/patches/dev300/ooop-langpack-policy.diff	(original)
+++ trunk/patches/dev300/ooop-langpack-policy.diff	Sun Nov 30 16:53:27 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)"==""