[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply |  138 +++++++++++++++++++++++++--------------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

New commits:
commit 99d9d2306d51d4ce39774c30b7ecd9995c5236f9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 15 12:54:58 2010 +0200

    Diff ordering to apply
    
    * patches/dev300/apply: move piece-*.diff after cws-buildverbosity.diff;
      docx-fixes02.diff after oox-chart-export-part1.diff; apply the two new diffs
      (unxsplash-install-bmp-intro.diff, sled10-splash.diff) only for ooo320-m14
      and above

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2088aa7..f7b929b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -690,9 +690,11 @@ unxsplash-3layer.diff, i#60696, jholesov
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
+[ QuickStarter >= ooo320-m14 ]
 # FIXME: we need to install also the intro.bmp because the splash supports only the bmp file format
 unxsplash-install-bmp-intro.diff, pmladek
 
+[ QuickStarter ]
 # enable -quistart option on Linux
 # cleaner solution by Caolan, i#108846
 desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
@@ -2274,7 +2276,6 @@ writerfilter-module-writer.diff
 writerfilter-source-dmapper-domainmapper-debug.diff
 docx-fixes01.diff, cbosdo
 docx-vml-import.diff, cbosdo
-docx-fixes02.diff, n#581604, cbosdo
 
 [ OOXML < ooo320-m14 ]
 writerfilter-docx-numbering-m13.diff, n#536407, cbosdo
@@ -2561,7 +2562,7 @@ binfilter-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
 # search also gij32, ..., so the 32-bit package works on 64-bit
 jvmfwk-gij32.diff, n#222708, pmladek
 
-[ SUSE101 ]
+[ SUSE101 >= ooo320-m14 ]
 sled10-splash.diff, i#123456, pmladek
 
 [ SUSE112 ]
@@ -3146,73 +3147,6 @@ es-fix-buleano.diff, deb#576842, i#110674, rengelha
 [ LocalizeFixes < ooo320-m13 ]
 i109407_BUSCAR.diff
 
-[ PieceBits ]
-# zipintro is not kind to us ...
-piece-desktop.diff
-
-[ PieceBits ]
-SectionOwner => michael
-# Experimental piece-wise source code split for build
-piece-build.diff
-piece-deliver.diff
-piece-checkdll.diff
-piece-binary-path.diff
-piece-target.diff
-piece-icons.diff
-piece-startup.diff
-piece-basic.diff
-piece-svx.diff
-# zipintro is not kind to us ...
-piece-scripting.diff
-piece-helpcontent2.diff
-piece-sdext.diff
-piece-swext.diff
-piece-writerfilter.diff
-piece-ridljar.diff
-piece-offapi.diff
-piece-offuh.diff
-piece-cppuhelper.diff
-piece-cpputools.diff
-piece-connectivity.diff
-piece-bridges.diff
-piece-saxon.diff
-piece-stoc.diff
-piece-unoil.diff
-piece-javaunohelper.diff
-piece-io.diff
-piece-l10n.diff
-piece-remotebridges.diff
-piece-rsc.diff
-piece-scp2.diff
-piece-solenv.diff
-piece-services.diff
-piece-ant.diff
-piece-extensions.diff
-[ NLPSolverBits and PieceBits ]
-piece-nlpsolver.diff
-[ PieceBits ]
-piece-setup_native.diff
-piece-jvmfwk.diff
-piece-forms.diff
-piece-apache-commons.diff
-piece-vbahelper.diff
-piece-sc.diff
-piece-sw.diff
-piece-xmerge.diff
-piece-packimages.diff
-piece-automation.diff
-piece-cli_ure.diff
-piece-transex3.diff
-piece-odk.diff
-
-# the noarch packages adds compat symlinks of the preset user configuration
-# the real files should be copied to the user configuration
-# the symlinker system files are read-only otherwise
-piece-desktop-avoid-user-conf-symlinks.diff, pmladek
-
-piece-jfreereport.diff
-piece-reportbuilder.diff
-
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, i#94086, thorsten
 
@@ -3671,6 +3605,7 @@ gnome-screen-saver.diff, i#106372, cmc
 [ OOXMLExport ]
 oox-pptx-export-update-to-ooo320.diff, rodo
 oox-chart-export-part1.diff, Fong
+docx-fixes02.diff, n#581604, cbosdo
 
 [ HPPA < dev300-m66 ]
 cws-linuxhppa1.diff, i#107051
@@ -3685,6 +3620,71 @@ libwpg-testing.diff
 libwps-testing.diff
 writerperfect-testing.diff
 
+[ PieceBits ]
+SectionOwner => michael
+# Experimental piece-wise source code split for build
+# zipintro is not kind to us ...
+piece-desktop.diff
+piece-build.diff
+piece-deliver.diff
+piece-checkdll.diff
+piece-binary-path.diff
+piece-target.diff
+piece-icons.diff
+piece-startup.diff
+piece-basic.diff
+piece-svx.diff
+# zipintro is not kind to us ...
+piece-scripting.diff
+piece-helpcontent2.diff
+piece-sdext.diff
+piece-swext.diff
+piece-writerfilter.diff
+piece-ridljar.diff
+piece-offapi.diff
+piece-offuh.diff
+piece-cppuhelper.diff
+piece-cpputools.diff
+piece-connectivity.diff
+piece-bridges.diff
+piece-saxon.diff
+piece-stoc.diff
+piece-unoil.diff
+piece-javaunohelper.diff
+piece-io.diff
+piece-l10n.diff
+piece-remotebridges.diff
+piece-rsc.diff
+piece-scp2.diff
+piece-solenv.diff
+piece-services.diff
+piece-ant.diff
+piece-extensions.diff
+[ NLPSolverBits and PieceBits ]
+piece-nlpsolver.diff
+[ PieceBits ]
+piece-setup_native.diff
+piece-jvmfwk.diff
+piece-forms.diff
+piece-apache-commons.diff
+piece-vbahelper.diff
+piece-sc.diff
+piece-sw.diff
+piece-xmerge.diff
+piece-packimages.diff
+piece-automation.diff
+piece-cli_ure.diff
+piece-transex3.diff
+piece-odk.diff
+
+# the noarch packages adds compat symlinks of the preset user configuration
+# the real files should be copied to the user configuration
+# the symlinker system files are read-only otherwise
+piece-desktop-avoid-user-conf-symlinks.diff, pmladek
+
+piece-jfreereport.diff
+piece-reportbuilder.diff
+
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32
 crosswin32-accessibility-nojava.diff