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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun Oct 19 18:31:58 2008
New Revision: 14340
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14340&view=rev

Log:
2008-10-19  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/no-latex-filter-without-writer2latex.diff: fix i93520



Added:
   branches/ooo-build-3-0/patches/dev300/no-latex-filter-without-writer2latex.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

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 Oct 19 18:31:58 2008
@@ -1269,6 +1269,8 @@
 pyuno-rpath-ooodir.diff
 system-python-ure-bootstrap.diff, deb#501028, i#90701
 
+no-latex-filter-without-writer2latex.diff, i#93520
+
 [ DejaVuFonts ]
 
 # Following the changed names of DejaVu fonts

Added: branches/ooo-build-3-0/patches/dev300/no-latex-filter-without-writer2latex.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/no-latex-filter-without-writer2latex.diff	Sun Oct 19 18:31:58 2008
@@ -0,0 +1,37 @@
+Index: source/config/fragments/fcfg_writer.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
+retrieving revision 1.14.20.1
+diff -u -r1.14.20.1 fcfg_writer.mk
+--- openoffice.org.orig/filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
++++ openoffice.org/filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
+@@ -29,9 +29,13 @@
+     writer_MS_Word_2003_XML \
+ 	writer_MS_Word_2007_XML \
+ 	writer_MS_Word_2007_XML_Template \
+-    MediaWiki_File \
++    MediaWiki_File
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++T4_WRITER += \
+ 	LaTeX \
+ 	BibTeX
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 39
+@@ -63,9 +67,13 @@
+     writer_web_MediaWiki_File \
+     MS_Word_2003_XML \
+ 	MS_Word_2007_XML \
+-	MS_Word_2007_XML_Template \
++	MS_Word_2007_XML_Template
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++F4_WRITER += \
+ 	LaTeX_Writer \
+ 	BibTeX_Writer
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 14