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

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12546 - in trunk: . patches/dev300
Date: Wed, 14 May 2008 13:48:16 +0100 (BST)
Author: rengelhard
Date: Wed May 14 12:48:15 2008
New Revision: 12546
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12546&view=rev

Log:
2008-05-14  Rene Engelhard  <rene debian org>

        * patches/dev300/split-binfilter-*.diff: move ...
        * patches/dev300/cws-native151-*.diff: ... to this and cws-extract
        * patches/dev300/apply: hsqldb16 is in dev300-m14; adapt for above.
          Reeanable the (formerly) split-binfilter patches


Added:
   trunk/patches/dev300/cws-native151-filter.diff
      - copied, changed from r12545, /trunk/patches/dev300/split-binfilter-filter.diff
   trunk/patches/dev300/cws-native151-scp2.diff
      - copied, changed from r12545, /trunk/patches/dev300/split-binfilter-scp2.diff
   trunk/patches/dev300/cws-native151-setup_native.diff
      - copied, changed from r12545, /trunk/patches/dev300/split-binfilter-setup_native.diff
Removed:
   trunk/patches/dev300/split-binfilter-filter.diff
   trunk/patches/dev300/split-binfilter-scp2.diff
   trunk/patches/dev300/split-binfilter-setup_native.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed May 14 12:48:15 2008
@@ -289,6 +289,7 @@
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+[ CWSBackports < dev300-m13 ]
 cws-hsqldb16.diff, i#85087
 
 
@@ -2189,9 +2190,9 @@
 
 # FIXME: apply at the end because there are some conflicts
 # split binfilter from core
-#split-binfilter-filter.diff, i#79800
-#split-binfilter-setup_native.diff, i#79800
-#split-binfilter-scp2.diff, i#79800
+cws-native151-filter.diff, i#79800
+cws-native151-setup_native.diff, i#79800
+cws-native151-scp2.diff, i#79800
 
 
 [ Win32Only ]

Copied: trunk/patches/dev300/cws-native151-filter.diff (from r12545, /trunk/patches/dev300/split-binfilter-filter.diff)
==============================================================================
--- /trunk/patches/dev300/split-binfilter-filter.diff	(original)
+++ trunk/patches/dev300/cws-native151-filter.diff	Wed May 14 12:48:15 2008
@@ -1,5 +1,25 @@
---- filter/source/config/fragments/fcfg_calc.mk.old	2007-07-17 21:12:07.000000000 +0200
-+++ filter/source/config/fragments/fcfg_calc.mk	2007-07-19 12:09:53.000000000 +0200
+cvs diff: Diffing filter
+cvs diff: Diffing filter/inc
+cvs diff: Diffing filter/inc/pch
+cvs diff: Diffing filter/prj
+cvs diff: Diffing filter/qa
+cvs diff: Diffing filter/qa/complex
+cvs diff: Diffing filter/qa/complex/filter
+cvs diff: Diffing filter/qa/complex/filter/detection
+cvs diff: Diffing filter/qa/complex/filter/detection/typeDetection
+cvs diff: Diffing filter/qa/complex/filter/misc
+cvs diff: Diffing filter/source
+cvs diff: Diffing filter/source/config
+cvs diff: Diffing filter/source/config/cache
+cvs diff: Diffing filter/source/config/fragments
+Index: filter/source/config/fragments/fcfg_calc.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_calc.mk,v
+retrieving revision 1.10
+retrieving revision 1.10.50.1
+diff -u -u -p -b -w -B -r1.10 -r1.10.50.1
+--- filter/source/config/fragments/fcfg_calc.mk	5 Mar 2008 17:15:18 -0000	1.10
++++ filter/source/config/fragments/fcfg_calc.mk	6 May 2008 15:55:26 -0000	1.10.50.1
 @@ -1,27 +1,5 @@
  all_fragments+=calc
  
@@ -62,8 +82,12 @@
  	StarOffice_XML__Calc__ui \
  	Text___txt___csv__StarCalc__ui \
  	calc_HTML_WebQuery_ui \
---- filter/source/config/fragments/fcfg_calc_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_calc_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_calc_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_calc_bf.mk
+diff -N filter/source/config/fragments/fcfg_calc_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_calc_bf.mk	6 May 2008 15:59:45 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +all_fragments+=calc_bf
 +
@@ -124,8 +148,14 @@
 +
 +ALL_PACKAGES+=calc_bf
 +
---- filter/source/config/fragments/fcfg_chart.mk.old	2007-05-22 17:23:08.000000000 +0200
-+++ filter/source/config/fragments/fcfg_chart.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_chart.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_chart.mk,v
+retrieving revision 1.8
+retrieving revision 1.8.182.1
+diff -u -u -p -b -w -B -r1.8 -r1.8.182.1
+--- filter/source/config/fragments/fcfg_chart.mk	22 May 2007 15:23:08 -0000	1.8
++++ filter/source/config/fragments/fcfg_chart.mk	6 May 2008 15:55:26 -0000	1.8.182.1
 @@ -1,30 +1,14 @@
  all_fragments+=chart
  
@@ -159,8 +189,12 @@
      StarOffice_XML__Chart_\
      chart8
      
---- filter/source/config/fragments/fcfg_chart_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_chart_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_chart_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_chart_bf.mk
+diff -N filter/source/config/fragments/fcfg_chart_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_chart_bf.mk	6 May 2008 16:03:57 -0000	1.1.2.1
 @@ -0,0 +1,47 @@
 +all_fragments+=chart_bf
 +
@@ -209,8 +243,14 @@
 +ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_chart_bf)
 +
 +ALL_PACKAGES+=chart_bf
---- filter/source/config/fragments/fcfg_draw.mk.old	2007-07-17 21:11:59.000000000 +0200
-+++ filter/source/config/fragments/fcfg_draw.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_draw.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_draw.mk,v
+retrieving revision 1.6
+retrieving revision 1.6.492.1
+diff -u -u -p -b -w -B -r1.6 -r1.6.492.1
+--- filter/source/config/fragments/fcfg_draw.mk	14 Jul 2005 15:02:56 -0000	1.6
++++ filter/source/config/fragments/fcfg_draw.mk	6 May 2008 15:55:26 -0000	1.6.492.1
 @@ -1,25 +1,8 @@
  all_fragments+=draw
  
@@ -237,7 +277,7 @@
      draw_StarOffice_XML_Draw \
      draw_StarOffice_XML_Draw_Template \
      pdf_Portable_Document_Format\
-@@ -30,7 +13,6 @@ T4_DRAW = \
+@@ -29,7 +12,6 @@ T4_DRAW = \
  # -----------------------------------------------
  # count = 9
  F4_DRAW = \
@@ -245,8 +285,8 @@
      StarOffice_XML__Draw_ \
      draw_StarOffice_XML_Draw_Template \
      draw_pdf_Export \
-@@ -40,10 +22,8 @@ F4_DRAW = \
- 
+@@ -37,10 +19,8 @@ F4_DRAW = \
+     draw8_template
  
  # -----------------------------------------------
 -# count = 6
@@ -257,8 +297,12 @@
      StarOffice_XML__Draw__ui \
      draw_StarOffice_XML_Draw_Template_ui \
      draw8_ui \
---- filter/source/config/fragments/fcfg_draw_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_draw_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_draw_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_draw_bf.mk
+diff -N filter/source/config/fragments/fcfg_draw_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_draw_bf.mk	6 May 2008 16:04:19 -0000	1.1.2.1
 @@ -0,0 +1,51 @@
 +all_fragments+=draw_bf
 +
@@ -311,8 +355,14 @@
 +ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_draw_bf)
 +
 +ALL_PACKAGES+=draw_bf
---- filter/source/config/fragments/fcfg_global.mk.old	2006-03-29 10:01:24.000000000 +0200
-+++ filter/source/config/fragments/fcfg_global.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_global.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_global.mk,v
+retrieving revision 1.10
+retrieving revision 1.10.362.1
+diff -u -u -p -b -w -B -r1.10 -r1.10.362.1
+--- filter/source/config/fragments/fcfg_global.mk	29 Mar 2006 08:01:24 -0000	1.10
++++ filter/source/config/fragments/fcfg_global.mk	6 May 2008 15:55:26 -0000	1.10.362.1
 @@ -1,28 +1,8 @@
  all_fragments+=global
  
@@ -359,8 +409,12 @@
  	Text__encoded___StarWriter_GlobalDocument__ui \
  	writer_globaldocument_StarOffice_XML_Writer_ui \
  	writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui \
---- filter/source/config/fragments/fcfg_global_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_global_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_global_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_global_bf.mk
+diff -N filter/source/config/fragments/fcfg_global_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_global_bf.mk	6 May 2008 15:59:34 -0000	1.1.2.1
 @@ -0,0 +1,55 @@
 +all_fragments+=global_bf
 +
@@ -417,8 +471,14 @@
 +    
 +ALL_PACKAGES+=global_bf
 +
---- filter/source/config/fragments/fcfg_impress.mk.old	2007-07-17 21:12:07.000000000 +0200
-+++ filter/source/config/fragments/fcfg_impress.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_impress.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_impress.mk,v
+retrieving revision 1.9
+retrieving revision 1.9.50.1
+diff -u -u -p -b -w -B -r1.9 -r1.9.50.1
+--- filter/source/config/fragments/fcfg_impress.mk	5 Mar 2008 17:15:32 -0000	1.9
++++ filter/source/config/fragments/fcfg_impress.mk	6 May 2008 15:55:26 -0000	1.9.50.1
 @@ -1,39 +1,11 @@
  all_fragments+=impress
  
@@ -480,8 +540,12 @@
      StarOffice_XML__Impress__ui \
      impress_StarOffice_XML_Impress_Template_ui \
      impress8_ui \
---- filter/source/config/fragments/fcfg_impress_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_impress_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_impress_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_impress_bf.mk
+diff -N filter/source/config/fragments/fcfg_impress_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_impress_bf.mk	6 May 2008 15:59:23 -0000	1.1.2.1
 @@ -0,0 +1,66 @@
 +all_fragments+=impress_bf
 +
@@ -549,8 +613,14 @@
 +
 +ALL_PACKAGES+=impress_bf
 +
---- filter/source/config/fragments/fcfg_math.mk.old	2005-07-14 17:03:43.000000000 +0200
-+++ filter/source/config/fragments/fcfg_math.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_math.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_math.mk,v
+retrieving revision 1.6
+retrieving revision 1.6.492.1
+diff -u -u -p -b -w -B -r1.6 -r1.6.492.1
+--- filter/source/config/fragments/fcfg_math.mk	14 Jul 2005 15:03:43 -0000	1.6
++++ filter/source/config/fragments/fcfg_math.mk	6 May 2008 15:55:26 -0000	1.6.492.1
 @@ -1,38 +1,20 @@
  all_fragments+=math
  
@@ -592,8 +662,12 @@
      StarOffice_XML__Math_ \
      math_pdf_Export \
  	math8
---- filter/source/config/fragments/fcfg_math_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_math_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_math_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_math_bf.mk
+diff -N filter/source/config/fragments/fcfg_math_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_math_bf.mk	6 May 2008 16:04:29 -0000	1.1.2.1
 @@ -0,0 +1,50 @@
 +all_fragments+=math_bf
 +
@@ -645,8 +719,14 @@
 +    
 +ALL_PACKAGES+=math_bf
 +    
---- filter/source/config/fragments/fcfg_web.mk.old	2005-07-14 17:03:56.000000000 +0200
-+++ filter/source/config/fragments/fcfg_web.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_web.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_web.mk,v
+retrieving revision 1.6
+retrieving revision 1.6.492.1
+diff -u -u -p -b -w -B -r1.6 -r1.6.492.1
+--- filter/source/config/fragments/fcfg_web.mk	14 Jul 2005 15:03:56 -0000	1.6
++++ filter/source/config/fragments/fcfg_web.mk	6 May 2008 15:55:26 -0000	1.6.492.1
 @@ -1,28 +1,9 @@
  all_fragments+=web
  
@@ -693,8 +773,12 @@
      Text__StarWriter_Web__ui \
      Text__encoded___StarWriter_Web__ui \
      writer_web_StarOffice_XML_Writer_ui \
---- filter/source/config/fragments/fcfg_web_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_web_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_web_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_web_bf.mk
+diff -N filter/source/config/fragments/fcfg_web_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_web_bf.mk	6 May 2008 16:04:07 -0000	1.1.2.1
 @@ -0,0 +1,54 @@
 +all_fragments+=web_bf
 +
@@ -750,8 +834,14 @@
 +    
 +ALL_PACKAGES+=web_bf
 +    
---- filter/source/config/fragments/fcfg_writer.mk.old	2007-07-17 21:12:07.000000000 +0200
-+++ filter/source/config/fragments/fcfg_writer.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_writer.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
+retrieving revision 1.12
+retrieving revision 1.12.50.1
+diff -u -u -p -b -w -B -r1.12 -r1.12.50.1
+--- filter/source/config/fragments/fcfg_writer.mk	6 Mar 2008 11:38:35 -0000	1.12
++++ filter/source/config/fragments/fcfg_writer.mk	6 May 2008 15:55:26 -0000	1.12.50.1
 @@ -1,32 +1,5 @@
  all_fragments+=writer
  
@@ -791,17 +881,17 @@
      writer_StarOffice_XML_Writer \
 -    $(T4_WRITER_BINFILTER) \
      writer_WordPerfect_Document \
-     writer_MS_Works_Document \
      writer_T602_Document \
-@@ -82,7 +54,6 @@ F4_WRITER = \
+     writer_Text \
+@@ -80,7 +52,6 @@ F4_WRITER = \
  	MS_Word_97_Vorlage \
  	Rich_Text_Format \
  	StarOffice_XML__Writer_ \
 -	$(F4_WRITER_BINFILTER) \
  	WordPerfect \
- 	MS_Works \
  	T602Document \
-@@ -111,9 +82,6 @@ F4_UI_WRITER = \
+ 	Text \
+@@ -107,9 +78,6 @@ F4_UI_WRITER = \
  	MS_Word_95_Vorlage_ui \
  	MS_Word_97_Vorlage_ui \
  	StarOffice_XML__Writer__ui \
@@ -811,8 +901,12 @@
  	Text_ui \
  	Text__encoded__ui \
  	writer_JustSystem_Ichitaro_10_template_ui \
---- filter/source/config/fragments/fcfg_writer_bf.mk.old	2007-07-19 12:09:53.000000000 +0200
-+++ filter/source/config/fragments/fcfg_writer_bf.mk	2007-07-19 12:09:53.000000000 +0200
+Index: filter/source/config/fragments/fcfg_writer_bf.mk
+===================================================================
+RCS file: filter/source/config/fragments/fcfg_writer_bf.mk
+diff -N filter/source/config/fragments/fcfg_writer_bf.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ filter/source/config/fragments/fcfg_writer_bf.mk	6 May 2008 15:59:56 -0000	1.1.2.1
 @@ -0,0 +1,63 @@
 +all_fragments+=writer_bf
 +
@@ -877,9 +971,15 @@
 +
 +ALL_PACKAGES+=writer_bf
 +
---- filter/source/config/fragments/makefile.mk.old	2007-05-10 15:13:05.000000000 +0200
-+++ filter/source/config/fragments/makefile.mk	2007-07-19 12:09:53.000000000 +0200
-@@ -72,6 +72,18 @@ REALFILTERPACKAGES_TYPES_FLAG = \
+Index: filter/source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.21
+retrieving revision 1.21.26.1
+diff -u -u -p -b -w -B -r1.21 -r1.21.26.1
+--- filter/source/config/fragments/makefile.mk	11 Apr 2008 05:28:01 -0000	1.21
++++ filter/source/config/fragments/makefile.mk	6 May 2008 15:55:26 -0000	1.21.26.1
+@@ -68,6 +68,18 @@ REALFILTERPACKAGES_TYPES_FLAG = \
      $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.types_flag       \
      $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.types_flag
  
@@ -898,7 +998,7 @@
  REALFILTERPACKAGES_FILTERS_FLAG = \
      $(DIR_FILTERCFGOUT)$/fcfg_base.filters_flag               \
      $(DIR_FILTERCFGOUT)$/fcfg_writer.filters_flag             \
-@@ -91,6 +103,18 @@ REALFILTERPACKAGES_FILTERS_FLAG = \
+@@ -87,6 +99,18 @@ REALFILTERPACKAGES_FILTERS_FLAG = \
      $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.filters_flag       \
      $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.filters_flag
  
@@ -917,7 +1017,7 @@
  REALFILTERPACKAGES_FILTERS_UI_MERGE = \
      $(DIR_LOCMERGE)$/filter_ui.xcu
  
-@@ -119,6 +143,18 @@ REALFILTERPACKAGES_OTHERS_FLAG = \
+@@ -115,6 +139,18 @@ REALFILTERPACKAGES_OTHERS_FLAG = \
      $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.others_flag       \
      $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.others_flag
  
@@ -936,9 +1036,15 @@
  INTERNALFILTERPACKAGES_TYPES_FLAG = \
      $(DIR_FILTERCFGOUT)$/fcfg_internalgraphics.types_flag
  
---- filter/source/config/fragments/packagedef.mk.old	2006-11-08 13:02:01.000000000 +0100
-+++ filter/source/config/fragments/packagedef.mk	2007-07-19 12:09:53.000000000 +0200
-@@ -64,4 +64,16 @@ INCLUDE_FRAGMENTS = \
+Index: filter/source/config/fragments/packagedef.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/packagedef.mk,v
+retrieving revision 1.8
+retrieving revision 1.8.26.1
+diff -u -u -p -b -w -B -r1.8 -r1.8.26.1
+--- filter/source/config/fragments/packagedef.mk	11 Apr 2008 05:28:13 -0000	1.8
++++ filter/source/config/fragments/packagedef.mk	6 May 2008 15:55:26 -0000	1.8.26.1
+@@ -60,4 +60,16 @@ INCLUDE_FRAGMENTS = \
  	 $(PRJ)$/source$/config$/fragments$/fcfg_impressgraphics.mk \
  	 $(PRJ)$/source$/config$/fragments$/fcfg_internalgraphics.mk
  
@@ -955,3 +1061,56 @@
 +.ENDIF
 +
  .INCLUDE: $(INCLUDE_FRAGMENTS)
+cvs diff: Diffing filter/source/config/fragments/contenthandlers
+cvs diff: Diffing filter/source/config/fragments/filters
+cvs diff: Diffing filter/source/config/fragments/frameloaders
+cvs diff: Diffing filter/source/config/fragments/internalgraphicfilters
+cvs diff: Diffing filter/source/config/fragments/types
+cvs diff: Diffing filter/source/config/tools
+cvs diff: Diffing filter/source/config/tools/merge
+cvs diff: Diffing filter/source/config/tools/split
+cvs diff: Diffing filter/source/config/tools/utils
+cvs diff: Diffing filter/source/docbook
+cvs diff: Diffing filter/source/filtertracer
+cvs diff: Diffing filter/source/flash
+cvs diff: Diffing filter/source/msfilter
+cvs diff: Diffing filter/source/msfilter/powerpoint
+cvs diff: Diffing filter/source/pdf
+cvs diff: Diffing filter/source/pdfimport
+cvs diff: Diffing filter/source/pdfimport/config
+cvs diff: Diffing filter/source/pdfimport/dialogs
+cvs diff: Diffing filter/source/pdfimport/inc
+cvs diff: Diffing filter/source/pdfimport/misc
+cvs diff: Diffing filter/source/pdfimport/odf
+cvs diff: Diffing filter/source/pdfimport/pdfparse
+cvs diff: Diffing filter/source/pdfimport/sax
+cvs diff: Diffing filter/source/pdfimport/test
+cvs diff: Diffing filter/source/pdfimport/test/testdocs
+cvs diff: Diffing filter/source/pdfimport/tree
+cvs diff: Diffing filter/source/pdfimport/wrapper
+cvs diff: Diffing filter/source/placeware
+cvs diff: Diffing filter/source/svg
+cvs diff: Diffing filter/source/t602
+Index: filter/source/t602/localize.sdf
+===================================================================
+RCS file: filter/source/t602/localize.sdf
+diff -N filter/source/t602/localize.sdf
+cvs diff: Diffing filter/source/xmlfilteradaptor
+cvs diff: Diffing filter/source/xmlfilterdetect
+cvs diff: Diffing filter/source/xslt
+cvs diff: Diffing filter/source/xslt/common
+cvs diff: Diffing filter/source/xslt/export
+cvs diff: Diffing filter/source/xslt/export/common
+cvs diff: Diffing filter/source/xslt/export/common/styles
+cvs diff: Diffing filter/source/xslt/export/common/table
+cvs diff: Diffing filter/source/xslt/export/spreadsheetml
+cvs diff: Diffing filter/source/xslt/export/wiki
+cvs diff: Diffing filter/source/xslt/export/wordml
+cvs diff: Diffing filter/source/xslt/export/xhtml
+cvs diff: Diffing filter/source/xslt/import
+cvs diff: Diffing filter/source/xslt/import/common
+cvs diff: Diffing filter/source/xslt/import/spreadsheetml
+cvs diff: Diffing filter/source/xslt/import/wordml
+cvs diff: Diffing filter/source/xsltdialog
+cvs diff: Diffing filter/source/xsltfilter
+cvs diff: Diffing filter/source/xsltvalidate

Copied: trunk/patches/dev300/cws-native151-scp2.diff (from r12545, /trunk/patches/dev300/split-binfilter-scp2.diff)
==============================================================================
--- /trunk/patches/dev300/split-binfilter-scp2.diff	(original)
+++ trunk/patches/dev300/cws-native151-scp2.diff	Wed May 14 12:48:15 2008
@@ -1,6 +1,16 @@
---- scp2/prj/build.lst.old	2006-12-12 17:17:06.000000000 +0100
-+++ scp2/prj/build.lst	2007-07-19 13:12:54.000000000 +0200
-@@ -3,6 +3,7 @@ cp    scp2    :    setup_native transex3
+cvs diff: Diffing scp2
+cvs diff: Diffing scp2/inc
+cvs diff: Diffing scp2/macros
+cvs diff: Diffing scp2/prj
+Index: scp2/prj/build.lst
+===================================================================
+RCS file: /cvs/installation/scp2/prj/build.lst,v
+retrieving revision 1.27
+retrieving revision 1.27.62.1
+diff -u -u -p -b -w -B -r1.27 -r1.27.62.1
+--- scp2/prj/build.lst	18 Mar 2008 13:23:47 -0000	1.27
++++ scp2/prj/build.lst	6 May 2008 15:50:10 -0000	1.27.62.1
+@@ -3,6 +3,7 @@ cp    scp2                        usr1  
  cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
  cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
  cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros cp_langtemplates NULL
@@ -8,14 +18,22 @@
  cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_langtemplates NULL
  cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
  cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
-@@ -25,4 +25,4 @@ cp    scp2\source\winexplorerext  nmake 
+@@ -25,4 +26,4 @@ cp    scp2\source\base            nmake 
  cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
  cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
 -cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
---- scp2/source/binfilter/file_binfilter.scp.old	2007-07-19 13:12:54.000000000 +0200
-+++ scp2/source/binfilter/file_binfilter.scp	2007-07-19 13:12:54.000000000 +0200
+cvs diff: Diffing scp2/source
+cvs diff: Diffing scp2/source/activex
+cvs diff: Diffing scp2/source/base
+cvs diff: Diffing scp2/source/binfilter
+Index: scp2/source/binfilter/file_binfilter.scp
+===================================================================
+RCS file: scp2/source/binfilter/file_binfilter.scp
+diff -N scp2/source/binfilter/file_binfilter.scp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/binfilter/file_binfilter.scp	6 May 2008 15:52:06 -0000	1.1.2.1
 @@ -0,0 +1,195 @@
 +/*************************************************************************
 + *
@@ -212,8 +230,12 @@
 +STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
 +STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
 +STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
---- scp2/source/binfilter/localize.sdf.old	2007-07-19 13:12:54.000000000 +0200
-+++ scp2/source/binfilter/localize.sdf	2007-07-19 13:12:54.000000000 +0200
+Index: scp2/source/binfilter/localize.sdf
+===================================================================
+RCS file: scp2/source/binfilter/localize.sdf
+diff -N scp2/source/binfilter/localize.sdf
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/binfilter/localize.sdf	6 May 2008 15:51:25 -0000	1.1.2.1
 @@ -0,0 +1,43 @@
 +#
 +#    ####    ###     #   #   ###   #####    #####  ####   #####  #####  
@@ -258,8 +280,12 @@
 +#     MA  02111-1307  USA
 +#
 +#*************************************************************************
---- scp2/source/binfilter/makefile.mk.old	2007-07-19 13:12:54.000000000 +0200
-+++ scp2/source/binfilter/makefile.mk	2007-07-19 13:12:54.000000000 +0200
+Index: scp2/source/binfilter/makefile.mk
+===================================================================
+RCS file: scp2/source/binfilter/makefile.mk
+diff -N scp2/source/binfilter/makefile.mk
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/binfilter/makefile.mk	6 May 2008 15:51:56 -0000	1.1.2.1
 @@ -0,0 +1,58 @@
 +#*************************************************************************
 +#
@@ -319,8 +345,12 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
---- /dev/null	2007-04-20 17:59:41.000000000 +0200
-+++ scp2/source/binfilter/module_binfilter.scp	2008-04-23 18:29:55.000000000 +0200
+Index: scp2/source/binfilter/module_binfilter.scp
+===================================================================
+RCS file: scp2/source/binfilter/module_binfilter.scp
+diff -N scp2/source/binfilter/module_binfilter.scp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/binfilter/module_binfilter.scp	6 May 2008 15:51:36 -0000	1.1.2.1
 @@ -0,0 +1,98 @@
 +/*************************************************************************
 + *
@@ -420,8 +450,12 @@
 +End
 +
 +#include "alllangmodules_binfilter.inc"
---- scp2/source/binfilter/module_binfilter.ulf.old	2007-07-19 13:12:54.000000000 +0200
-+++ scp2/source/binfilter/module_binfilter.ulf	2007-07-19 13:12:54.000000000 +0200
+Index: scp2/source/binfilter/module_binfilter.ulf
+===================================================================
+RCS file: scp2/source/binfilter/module_binfilter.ulf
+diff -N scp2/source/binfilter/module_binfilter.ulf
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/binfilter/module_binfilter.ulf	6 May 2008 15:51:46 -0000	1.1.2.1
 @@ -0,0 +1,40 @@
 +/*************************************************************************
 + *
@@ -463,9 +497,16 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_BINFILTER]
 +en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
---- scp2/source/calc/file_calc.scp.old	2008-04-22 19:59:55.000000000 +0200
-+++ scp2/source/calc/file_calc.scp	2008-04-23 17:18:40.000000000 +0200
-@@ -74,19 +74,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
+cvs diff: Diffing scp2/source/calc
+Index: scp2/source/calc/file_calc.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/calc/file_calc.scp,v
+retrieving revision 1.42
+retrieving revision 1.42.2.1
+diff -u -u -p -b -w -B -r1.42 -r1.42.2.1
+--- scp2/source/calc/file_calc.scp	24 Apr 2008 17:11:37 -0000	1.42
++++ scp2/source/calc/file_calc.scp	6 May 2008 15:50:10 -0000	1.42.2.1
+@@ -53,19 +53,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
  
  STD_LIB_FILE( gid_File_Lib_Tfu, tfu)
  
@@ -485,9 +526,15 @@
  STD_RES_FILE( gid_File_Res_Solver, solver)
  
  STD_RES_FILE( gid_File_Res_Analysis, analysis)
---- scp2/source/calc/makefile.mk.old	2005-09-09 03:21:34.000000000 +0200
-+++ scp2/source/calc/makefile.mk	2008-04-23 20:34:18.000000000 +0200
-@@ -45,10 +45,6 @@ TARGETTYPE=CUI
+Index: scp2/source/calc/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/calc/makefile.mk,v
+retrieving revision 1.8
+retrieving revision 1.8.2.1
+diff -u -u -p -b -w -B -r1.8 -r1.8.2.1
+--- scp2/source/calc/makefile.mk	24 Apr 2008 17:11:51 -0000	1.8
++++ scp2/source/calc/makefile.mk	6 May 2008 15:50:10 -0000	1.8.2.1
+@@ -41,10 +41,6 @@ TARGETTYPE=CUI
  
  .INCLUDE :	settings.mk
  
@@ -498,17 +545,23 @@
  .IF "$(SYSTEM_LPSOLVE)" == "YES"
  SCPDEFS+=-DSYSTEM_LPSOLVE
  .ENDIF
---- scp2/source/calc/module_calc.scp.old	2008-01-15 20:44:19.000000000 +0100
-+++ scp2/source/calc/module_calc.scp	2008-01-16 20:06:26.000000000 +0100
-@@ -43,7 +43,6 @@ Module gid_Module_Prg_Calc
+Index: scp2/source/calc/module_calc.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/calc/module_calc.scp,v
+retrieving revision 1.23
+retrieving revision 1.23.34.1
+diff -u -u -p -b -w -B -r1.23 -r1.23.34.1
+--- scp2/source/calc/module_calc.scp	15 Apr 2008 14:55:45 -0000	1.23
++++ scp2/source/calc/module_calc.scp	6 May 2008 15:50:10 -0000	1.23.34.1
+@@ -37,7 +37,6 @@ Module gid_Module_Prg_Calc
      Styles =(APPLICATIONMODULE);
  End
  
 -// #110743# Added gid_File_Lib_Bf_Sc and gid_File_Res_Bf_Sc for binfilter
  Module gid_Module_Prg_Calc_Bin
+     PackageInfo = "packinfo_office.txt";
      MOD_NAME_DESC ( MODULE_PRG_CALC_BIN );
-     ParentID = gid_Module_Prg_Calc;
-@@ -54,7 +53,7 @@ Module gid_Module_Prg_Calc_Bin
+@@ -52,7 +51,7 @@ Module gid_Module_Prg_Calc_Bin
      gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
      gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
      gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
@@ -517,7 +570,7 @@
  End
  
  // Module gid_Module_Prg_Calc_Help
-@@ -92,7 +92,6 @@ Module gid_Module_Langpack_Calc_Template
+@@ -98,7 +97,6 @@ Module gid_Module_Langpack_Calc_Template
      Styles = (TEMPLATEMODULE);
      Files = (gid_File_Help_Scalc_Zip,
               gid_File_Res_Analysis,
@@ -525,9 +578,26 @@
               gid_File_Res_Date,
               gid_File_Res_Sc,
               gid_File_Res_Solver);
---- scp2/source/math/file_math.scp.old	2007-08-02 19:20:28.000000000 +0200
-+++ scp2/source/math/file_math.scp	2008-01-16 20:03:03.000000000 +0100
-@@ -57,19 +57,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Smd
+cvs diff: Diffing scp2/source/canvas
+cvs diff: Diffing scp2/source/crashrep
+cvs diff: Diffing scp2/source/draw
+cvs diff: Diffing scp2/source/gnome
+cvs diff: Diffing scp2/source/graphicfilter
+cvs diff: Diffing scp2/source/impress
+cvs diff: Diffing scp2/source/javafilter
+cvs diff: Diffing scp2/source/kde
+cvs diff: Diffing scp2/source/layout
+cvs diff: Diffing scp2/source/lingu
+cvs diff: Diffing scp2/source/math
+Index: scp2/source/math/file_math.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/math/file_math.scp,v
+retrieving revision 1.37
+retrieving revision 1.37.34.1
+diff -u -u -p -b -w -B -r1.37 -r1.37.34.1
+--- scp2/source/math/file_math.scp	15 Apr 2008 10:44:51 -0000	1.37
++++ scp2/source/math/file_math.scp	6 May 2008 15:50:11 -0000	1.37.34.1
+@@ -52,19 +52,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd
  
  STD_RES_FILE( gid_File_Res_Sm, sm )
  
@@ -547,9 +617,15 @@
  File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
      TXT_FILE_BODY;
      Styles = (PACKED);
---- scp2/source/math/makefile.mk.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/source/math/makefile.mk	2007-07-19 13:12:54.000000000 +0200
-@@ -45,10 +45,6 @@ TARGETTYPE=CUI
+Index: scp2/source/math/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/math/makefile.mk,v
+retrieving revision 1.9
+retrieving revision 1.9.36.1
+diff -u -u -p -b -w -B -r1.9 -r1.9.36.1
+--- scp2/source/math/makefile.mk	10 Apr 2008 09:29:03 -0000	1.9
++++ scp2/source/math/makefile.mk	6 May 2008 15:50:11 -0000	1.9.36.1
+@@ -41,10 +41,6 @@ TARGETTYPE=CUI
  
  .INCLUDE :	settings.mk
  
@@ -560,18 +636,24 @@
  SCP_PRODUCT_TYPE=osl
  PARFILES= \
          module_math.par              \
---- scp2/source/math/module_math.scp.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/source/math/module_math.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -43,7 +43,6 @@ Module gid_Module_Prg_Math
+Index: scp2/source/math/module_math.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/math/module_math.scp,v
+retrieving revision 1.19
+retrieving revision 1.19.34.1
+diff -u -u -p -b -w -B -r1.19 -r1.19.34.1
+--- scp2/source/math/module_math.scp	15 Apr 2008 14:56:24 -0000	1.19
++++ scp2/source/math/module_math.scp	6 May 2008 15:50:11 -0000	1.19.34.1
+@@ -37,7 +37,6 @@ Module gid_Module_Prg_Math
      Styles =(APPLICATIONMODULE);
  End
  
 -// #110743# Added gid_File_Lib_Bf_Sm, gid_File_Res_Bf_Sm
  Module gid_Module_Prg_Math_Bin
+     PackageInfo = "packinfo_office.txt";
      MOD_NAME_DESC ( MODULE_PRG_MATH_BIN );
-     ParentID = gid_Module_Prg_Math;
-@@ -52,7 +51,7 @@ Module gid_Module_Prg_Math_Bin
-     Default = YES;
+@@ -50,7 +49,7 @@ Module gid_Module_Prg_Math_Bin
+   #endif
      Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
      gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
 -    gid_File_Lib_Bf_Sm, gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
@@ -579,7 +661,7 @@
  	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
      gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf);
  End
-@@ -83,8 +83,7 @@ Module gid_Module_Langpack_Math_Template
+@@ -85,8 +84,7 @@ Module gid_Module_Langpack_Math_Template
      Description = "gid_Module_Langpack_Math_Template";
      Styles = (TEMPLATEMODULE);
      Files = (gid_File_Help_Smath_Zip,
@@ -589,9 +671,17 @@
  End
  
  #include "alllangmodules_math.inc"
---- scp2/source/ooo/file_library_ooo.scp.old	2008-01-15 20:44:17.000000000 +0100
-+++ scp2/source/ooo/file_library_ooo.scp	2008-01-16 19:42:08.000000000 +0100
-@@ -1630,32 +1630,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
+cvs diff: Diffing scp2/source/onlineupdate
+cvs diff: Diffing scp2/source/ooo
+Index: scp2/source/ooo/file_library_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
+retrieving revision 1.286
+retrieving revision 1.286.32.1
+diff -u -u -p -b -w -B -r1.286 -r1.286.32.1
+--- scp2/source/ooo/file_library_ooo.scp	15 Apr 2008 12:08:24 -0000	1.286
++++ scp2/source/ooo/file_library_ooo.scp	6 May 2008 15:50:11 -0000	1.286.32.1
+@@ -1542,32 +1542,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox
  
  STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
  
@@ -624,9 +714,15 @@
  STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
  
  File gid_File_Lib_Scriptframe
---- scp2/source/ooo/file_ooo.scp.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/source/ooo/file_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -2915,15 +2915,6 @@ File gid_File_Txt_Patchfiles
+Index: scp2/source/ooo/file_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
+retrieving revision 1.240
+retrieving revision 1.240.22.1
+diff -u -u -p -b -w -B -r1.240 -r1.240.22.1
+--- scp2/source/ooo/file_ooo.scp	18 Apr 2008 08:30:53 -0000	1.240
++++ scp2/source/ooo/file_ooo.scp	6 May 2008 15:50:11 -0000	1.240.22.1
+@@ -2678,15 +2678,6 @@ File gid_File_Txt_Patchfiles
  End
  #endif
  
@@ -642,9 +738,15 @@
  File gid_Starregistry_Services_Rdb
      TXT_FILE_BODY;
      Name = "services.rdb";
---- scp2/source/ooo/file_resource_ooo.scp.old	2007-07-17 21:11:57.000000000 +0200
-+++ scp2/source/ooo/file_resource_ooo.scp	2007-07-19 13:12:54.000000000 +0200
-@@ -90,24 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
+Index: scp2/source/ooo/file_resource_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_resource_ooo.scp,v
+retrieving revision 1.64
+retrieving revision 1.64.34.1
+diff -u -u -p -b -w -B -r1.64 -r1.64.34.1
+--- scp2/source/ooo/file_resource_ooo.scp	15 Apr 2008 10:46:26 -0000	1.64
++++ scp2/source/ooo/file_resource_ooo.scp	6 May 2008 15:50:11 -0000	1.64.34.1
+@@ -85,24 +85,6 @@ STD_RES_FILE( gid_File_Res_San, san )
  
  #endif
  
@@ -669,9 +771,15 @@
  STD_RES_FILE( gid_File_Res_Sd, sd )
  
  STD_RES_FILE( gid_File_Res_Sfx, sfx )
---- scp2/source/ooo/makefile.mk.old	2007-07-17 21:12:03.000000000 +0200
-+++ scp2/source/ooo/makefile.mk	2007-07-19 13:12:54.000000000 +0200
-@@ -143,10 +143,6 @@ SCPDEFS+=-DSYSTEM_CURL
+Index: scp2/source/ooo/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
+retrieving revision 1.66
+retrieving revision 1.66.36.1
+diff -u -u -p -b -w -B -r1.66 -r1.66.36.1
+--- scp2/source/ooo/makefile.mk	10 Apr 2008 09:41:26 -0000	1.66
++++ scp2/source/ooo/makefile.mk	6 May 2008 15:50:11 -0000	1.66.36.1
+@@ -135,10 +135,6 @@ SCPDEFS+=-DWITH_LDAP
  SCPDEFS+=-DSYSTEM_CURL
  .ENDIF
  
@@ -682,9 +790,15 @@
  .IF "$(SYSTEM_STDLIBS)" == "YES"
  SCPDEFS+=-DSYSTEM_STDLIBS
  .ENDIF
---- scp2/source/ooo/module_hidden_ooo.scp.old	2008-01-15 20:44:16.000000000 +0100
-+++ scp2/source/ooo/module_hidden_ooo.scp	2008-01-16 19:46:03.000000000 +0100
-@@ -134,7 +134,6 @@ Module gid_Module_Root_Files_3
+Index: scp2/source/ooo/module_hidden_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/module_hidden_ooo.scp,v
+retrieving revision 1.94
+retrieving revision 1.94.24.1
+diff -u -u -p -b -w -B -r1.94 -r1.94.24.1
+--- scp2/source/ooo/module_hidden_ooo.scp	18 Apr 2008 08:31:12 -0000	1.94
++++ scp2/source/ooo/module_hidden_ooo.scp	6 May 2008 15:50:12 -0000	1.94.24.1
+@@ -131,7 +131,6 @@ Module gid_Module_Root_Files_3
  	gid_File_Jar_Xmerge,
  	gid_File_Jar_Xmergebridge,
      gid_File_Rdb_Offapi,
@@ -692,15 +806,15 @@
  	gid_Starregistry_Services_Rdb);
  End
  
-@@ -200,7 +199,6 @@ Module gid_Module_Root_Files_4
- 	gid_File_Lib_Lnth,
+@@ -196,7 +195,6 @@ Module gid_Module_Root_Files_4
+ 	gid_File_Lib_Lng,
  	gid_File_Lib_Offacc,
  	gid_File_Lib_Oox,
 -	gid_File_Lib_Bindet,
  	gid_File_Lib_Pcr,
  	gid_File_Lib_Pdffilter,
  	gid_File_Lib_Pk,
-@@ -325,22 +323,6 @@ Module gid_Module_Root_Files_5
+@@ -320,22 +318,6 @@ Module gid_Module_Root_Files_5
  	gid_File_Lib_Officebean,
  	gid_File_Lib_Openssl,
  	gid_File_Lib_Package2,
@@ -723,9 +837,15 @@
  	gid_File_Lib_Deployment,
  	gid_File_Lib_DeploymentGui,
  	gid_File_Lib_Sax_Uno,
---- scp2/source/ooo/module_lang_template.scp.old	2008-03-18 14:31:30.000000000 +0100
-+++ scp2/source/ooo/module_lang_template.scp	2008-04-23 17:51:28.000000000 +0200
-@@ -90,14 +90,6 @@ Module gid_Module_Langpack_Resource_Temp
+Index: scp2/source/ooo/module_lang_template.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/module_lang_template.scp,v
+retrieving revision 1.12
+retrieving revision 1.12.34.1
+diff -u -u -p -b -w -B -r1.12 -r1.12.34.1
+--- scp2/source/ooo/module_lang_template.scp	15 Apr 2008 14:57:17 -0000	1.12
++++ scp2/source/ooo/module_lang_template.scp	6 May 2008 15:50:12 -0000	1.12.34.1
+@@ -86,14 +86,6 @@ Module gid_Module_Langpack_Resource_Temp
               gid_File_Res_Pdffilter,
               gid_File_Res_Preload,
               gid_File_Res_San,
@@ -740,9 +860,19 @@
               gid_File_Res_Productregistration,
               gid_File_Res_Sb,
               gid_File_Res_Sd,
---- scp2/source/templates/makefile.mk.old	2008-03-18 14:38:09.000000000 +0100
-+++ scp2/source/templates/makefile.mk	2008-04-23 19:09:42.000000000 +0200
-@@ -48,7 +48,7 @@ TARGET=templates
+cvs diff: Diffing scp2/source/python
+cvs diff: Diffing scp2/source/quickstart
+cvs diff: Diffing scp2/source/sdkoo
+cvs diff: Diffing scp2/source/templates
+Index: scp2/source/templates/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/templates/makefile.mk,v
+retrieving revision 1.4
+retrieving revision 1.4.36.1
+diff -u -u -p -b -w -B -r1.4 -r1.4.36.1
+--- scp2/source/templates/makefile.mk	10 Apr 2008 09:54:19 -0000	1.4
++++ scp2/source/templates/makefile.mk	6 May 2008 15:50:12 -0000	1.4.36.1
+@@ -44,7 +44,7 @@ TARGET=templates
  COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
  .EXPORT : COMPLETELANGISO_VAR
  
@@ -751,7 +881,7 @@
  
  .PHONY $(INCCOM)$/alllangmodules.inc:
  	@@-$(RENAME) $@ $  tmp
-@@ -82,6 +82,10 @@ ALLTAR : $(INCCOM)$/alllangmodules.inc $
+@@ -78,6 +78,10 @@ ALLTAR : $(INCCOM)$/alllangmodules.inc $
  	@@-$(RENAME) $@ $  tmp
  	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_writer.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
  
@@ -762,18 +892,22 @@
  .PHONY $(INCCOM)$/alllangmodules_onlineupdate.inc:
  	@@-$(RENAME) $@ $  tmp
  	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_onlineupdate.sct -o $  tmp && $(RENAME:s/+//) $  tmp $@
---- /dev/null	2007-04-20 17:59:41.000000000 +0200
-+++ scp2/source/templates/module_langpack_binfilter.sct	2008-04-23 18:31:55.000000000 +0200
+Index: scp2/source/templates/module_langpack_binfilter.sct
+===================================================================
+RCS file: scp2/source/templates/module_langpack_binfilter.sct
+diff -N scp2/source/templates/module_langpack_binfilter.sct
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ scp2/source/templates/module_langpack_binfilter.sct	6 May 2008 15:53:51 -0000	1.1.2.1
 @@ -0,0 +1,45 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
 + *
-+ *  $RCSfile: module_langpack_onlineupdate.sct,v $
++ *  $RCSfile$
 + *
-+ *  $Revision: 1.2 $
++ *  $Revision$
 + *
-+ *  last change: $Author: vg $ $Date: 2008/03/18 13:39:27 $
++ *  last change: $Author$ $Date$
 + *
 + *  The Contents of this file are made available subject to
 + *  the terms of GNU Lesser General Public License Version 2.1.
@@ -810,9 +944,20 @@
 +    PackageInfo = "packinfo_office_lang.txt";
 +    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 +End
---- scp2/util/makefile.mk.old	2007-07-17 21:12:01.000000000 +0200
-+++ scp2/util/makefile.mk	2007-07-19 13:12:54.000000000 +0200
-@@ -97,6 +97,12 @@ SCP1FILES  = installation_ooo.par       
+cvs diff: Diffing scp2/source/testtool
+cvs diff: Diffing scp2/source/winexplorerext
+cvs diff: Diffing scp2/source/writer
+cvs diff: Diffing scp2/source/xsltfilter
+cvs diff: Diffing scp2/util
+Index: scp2/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/util/makefile.mk,v
+retrieving revision 1.46
+retrieving revision 1.46.36.1
+diff -u -u -p -b -w -B -r1.46 -r1.46.36.1
+--- scp2/util/makefile.mk	10 Apr 2008 10:04:24 -0000	1.46
++++ scp2/util/makefile.mk	6 May 2008 15:50:12 -0000	1.46.36.1
+@@ -93,6 +93,12 @@ SCP1FILES  = installation_ooo.par       
               common_brand_readme.par       \
               ooo_brand.par
  
@@ -825,13 +970,13 @@
  .IF "$(SOLAR_JAVA)"!=""
  SCP1FILES +=                               \
               module_javafilter.par         \
-@@ -245,6 +251,12 @@ SCP2FILES  = installation_ooo.par       
+@@ -240,6 +246,12 @@ SCP2FILES  = installation_ooo.par       
               common_brand_readme.par       \
               ooo_brand.par
  
 +.IF "$(WITH_BINFILTER)" != "NO"
 +SCP2FILES +=                               \
-+             module_binfilter.par         \
++             module_binfilter.par          \
 +             file_binfilter.par
 +.ENDIF
 +

Copied: trunk/patches/dev300/cws-native151-setup_native.diff (from r12545, /trunk/patches/dev300/split-binfilter-setup_native.diff)
==============================================================================
--- /trunk/patches/dev300/split-binfilter-setup_native.diff	(original)
+++ trunk/patches/dev300/cws-native151-setup_native.diff	Wed May 14 12:48:15 2008
@@ -1,48 +1,92 @@
---- setup_native/source/packinfo/packinfo_office.txt	2007-05-25 16:35:43.000000000 +0200
-+++ setup_native/source/packinfo/packinfo_office.txt	2007-07-19 11:50:07.000000000 +0200
-@@ -158,6 +158,21 @@ destpath = "/opt/%UNIXPRODUCTNAME%PRODUC
+cvs diff: Diffing setup_native
+cvs diff: Diffing setup_native/inc
+cvs diff: Diffing setup_native/inc/setup_native
+cvs diff: Diffing setup_native/prj
+cvs diff: Diffing setup_native/registry
+cvs diff: Diffing setup_native/registry/data
+cvs diff: Diffing setup_native/registry/data/org
+cvs diff: Diffing setup_native/registry/data/org/openoffice
+cvs diff: Diffing setup_native/registry/data/org/openoffice/Office
+cvs diff: Diffing setup_native/scripts
+cvs diff: Diffing setup_native/scripts/source
+cvs diff: Diffing setup_native/source
+cvs diff: Diffing setup_native/source/java
+cvs diff: Diffing setup_native/source/linux
+cvs diff: Diffing setup_native/source/packinfo
+Index: setup_native/source/packinfo/packinfo_office.txt
+===================================================================
+RCS file: /cvs/installation/setup_native/source/packinfo/packinfo_office.txt,v
+retrieving revision 1.13
+retrieving revision 1.13.8.1
+diff -u -u -p -b -w -B -r1.13 -r1.13.8.1
+--- setup_native/source/packinfo/packinfo_office.txt	21 Apr 2008 09:04:45 -0000	1.13
++++ setup_native/source/packinfo/packinfo_office.txt	6 May 2008 15:54:29 -0000	1.13.8.1
+@@ -160,6 +160,21 @@ packageversion = "%OOOPACKAGEVERSION"
  End
  
  Start
 +module = "gid_Module_Optional_Binfilter"
-+solarispackagename = "openofficeorg-binfilter"
-+solarisrequires = "openofficeorg-core01"
-+packagename = "openoffice.org-binfilter"
-+linuxreplaces = "openofficeorg-binfilter"
-+freebsdrequires = "openoffice.org-calc,openoffice.org-draw,openoffice.org-impress,openoffice.org-math,openoffice.org-writer"
-+requires = "openoffice.org-calc,openoffice.org-draw,openoffice.org-impress,openoffice.org-math,openoffice.org-writer"
++solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-binfilter"
++solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-core01"
++packagename = "ooobasis%OOOBASEVERSION-binfilter"
++freebsdrequires = "ooobasis%OOOBASEVERSION-calc,ooobasis%OOOBASEVERSION-draw,ooobasis%OOOBASEVERSION-impress,ooobasis%OOOBASEVERSION-math,ooobasis%OOOBASEVERSION-writer"
++requires = "ooobasis%OOOBASEVERSION-calc,ooobasis%OOOBASEVERSION-draw,ooobasis%OOOBASEVERSION-impress,ooobasis%OOOBASEVERSION-math,ooobasis%OOOBASEVERSION-writer"
 +copyright = "1999-2007 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"
 +description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
 +destpath = "/opt"
++packageversion = "%OOOPACKAGEVERSION"
 +End
 +
 +Start
  module = "gid_Module_Optional_Grfflt"
- solarispackagename = "openofficeorg-graphicfilter"
- solarisrequires = "openofficeorg-core01"
---- setup_native/source/packinfo/packinfo_office_lang.txt.old1	2008-03-18 13:51:25.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office_lang.txt	2008-04-23 18:40:39.000000000 +0200
-@@ -167,6 +167,21 @@ destpath = "/opt"
+ solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-graphicfilter"
+ solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-core01"
+Index: setup_native/source/packinfo/packinfo_office_lang.txt
+===================================================================
+RCS file: /cvs/installation/setup_native/source/packinfo/packinfo_office_lang.txt,v
+retrieving revision 1.6
+retrieving revision 1.6.8.1
+diff -u -u -p -b -w -B -r1.6 -r1.6.8.1
+--- setup_native/source/packinfo/packinfo_office_lang.txt	18 Apr 2008 10:36:23 -0000	1.6
++++ setup_native/source/packinfo/packinfo_office_lang.txt	6 May 2008 15:54:29 -0000	1.6.8.1
+@@ -167,6 +167,21 @@ packageversion = "%OOOPACKAGEVERSION"
  End
  
  Start
 +module = "gid_Module_Langpack_Binfilter"
-+solarispackagename = "openofficeorg-%LANGUAGESTRING-binfilter"
-+solarisrequires = "openofficeorg-%LANGUAGESTRING"
-+packagename = "openoffice.org-%LANGUAGESTRING-binfilter"
-+linuxreplaces = "openofficeorg-%LANGUAGESTRING-binfilter"
-+provides = "openofficeorg-%LANGUAGESTRING-binfilter"
-+requires = "openoffice.org-%LANGUAGESTRING"
++solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
++solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
++packagename = "ooobasis%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
++provides = "ooobasis%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
++requires = "ooobasis%OOOBASEVERSION-%LANGUAGESTRING"
 +copyright = "1999-2007 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"
 +description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
 +destpath = "/opt"
++packageversion = "%OOOPACKAGEVERSION"
 +End
 +
 +Start
  module = "gid_Module_Langpack_Onlineupdate"
- solarispackagename = "openofficeorg-%LANGUAGESTRING-onlineupd"
- solarisrequires = "openofficeorg-%LANGUAGESTRING"
+ solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+ solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+cvs diff: Diffing setup_native/source/ulfconv
+cvs diff: Diffing setup_native/source/win32
+cvs diff: Diffing setup_native/source/win32/customactions
+cvs diff: Diffing setup_native/source/win32/customactions/indexingfilter
+cvs diff: Diffing setup_native/source/win32/customactions/javafilter
+cvs diff: Diffing setup_native/source/win32/customactions/languagepacks
+cvs diff: Diffing setup_native/source/win32/customactions/patch
+cvs diff: Diffing setup_native/source/win32/customactions/quickstarter
+cvs diff: Diffing setup_native/source/win32/customactions/reg4msdoc
+cvs diff: Diffing setup_native/source/win32/customactions/regactivex
+cvs diff: Diffing setup_native/source/win32/customactions/regpatchactivex
+cvs diff: Diffing setup_native/source/win32/customactions/regpython
+cvs diff: Diffing setup_native/source/win32/customactions/relnotes
+cvs diff: Diffing setup_native/source/win32/customactions/shellextensions
+cvs diff: Diffing setup_native/source/win32/customactions/tools
+cvs diff: Diffing setup_native/source/win32/nsis
+cvs diff: Diffing setup_native/source/win32/stwrapper
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]