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

[szalaik svn gnome org]

Author: szalaik
Date: Sun Jul 27 09:07:17 2008
New Revision: 13406
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13406&view=rev

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

	* patches/dev300/apply
	* patches/dev300/scp2_accessories_templates_makefile-m26.diff
	* patches/dev300/scp2_accessories_templates_makefile.diff
	
	scp2_accessories_templates_makefile.diff does not apply on 
dev300-m27 - fixed.



Added:
   trunk/patches/dev300/scp2_accessories_templates_makefile-m26.diff
      - copied unchanged from r13401, /trunk/patches/dev300/scp2_accessories_templates_makefile.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/scp2_accessories_templates_makefile.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Jul 27 09:07:17 2008
@@ -2495,7 +2495,14 @@
 scp2_directory_accessories.diff
 scp2_makefile_accessories.diff
 scp2_accessories_templates.diff
+
+[ OxygenOfficeExtras <= dev300-m26]
+scp2_accessories_templates_makefile-m26.diff
+
+[ OxygenOfficeExtras > dev300-m26]
 scp2_accessories_templates_makefile.diff
+
+[ OxygenOfficeExtras ]
 # Splitting new contents into new packages
 premium-splitted-language-packages.diff
 premium-splitted-language-pack-solenv.diff

Modified: trunk/patches/dev300/scp2_accessories_templates_makefile.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories_templates_makefile.diff	(original)
+++ trunk/patches/dev300/scp2_accessories_templates_makefile.diff	Sun Jul 27 09:07:17 2008
@@ -4,15 +4,15 @@
  COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
  .EXPORT : COMPLETELANGISO_VAR
  
--ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_onlineupdate.inc
-+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_onlineupdate.inc $(INCCOM)$/alllangmodules_accessories_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc
+-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
++ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc
  
  .PHONY $(INCCOM)$/alllangmodules.inc:
  	@@-$(RENAME) $@ $  tmp
 @@ -85,3 +85,15 @@
- .PHONY $(INCCOM)$/alllangmodules_onlineupdate.inc:
+ .PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
  	@@-$(RENAME) $@ $  tmp
- 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_onlineupdate.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
+ 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_root.inc:
 +	@@-$(RENAME) $@ $  tmp