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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Mar  4 21:47:44 2009
New Revision: 15466
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15466&view=rev

Log:
ooo310-m4 for novell-win32-agfa-monotype-fonts.diff

Added:
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m3.diff
      - copied unchanged from r15463, /trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar  4 21:47:44 2009
@@ -1168,9 +1168,12 @@
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 
-[ BuildBits ]
+[ BuildBits < ooo310-m4 ]
+novell-win32-agfa-monotype-fonts-m3.diff, tml
+[ BuildBits >= ooo310-m4 ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
+[ BuildBits ]
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek

Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	(original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	Wed Mar  4 21:47:44 2009
@@ -160,8 +160,8 @@
 --- postprocess/prj/build.lst	2005-11-23 05:56:34.703125000 +0200
 +++ postprocess/prj/build.lst	2005-11-23 05:56:48.812500000 +0200
 @@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter WRITER2LATEX:writer2latex oox NULL
-+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter WRITER2LATEX:writer2latex oox NULL
+-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter WRITER2LATEX:writer2latex oox NULL
++po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter WRITER2LATEX:writer2latex oox NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL