ooo-build r11892 - in trunk: . patches/cairo patches/dev300 patches/ooxml patches/src680 patches/vba



Author: jholesovsky
Date: Thu Mar 13 13:45:25 2008
New Revision: 11892
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11892&view=rev

Log:
2008-03-13  Jan Holesovsky  <kendy suse cz>

        Remove everything older than m10:

        * patches/src680/buildfix-libformula-gcj-source.diff,
          patches/src680/sc-hyperlink-excel-a1-style.diff,
          patches/src680/sc-lotus123-import-sheetname.diff,
          patches/src680/cws-sdk24fix.diff,
          patches/src680/reportdesigner-no-license-m3.diff,
          patches/src680/cws-newportstl.diff,
          patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff,
          patches/src680/svx-sdr-contact-visibility.diff,
          patches/src680/Simplified_Traditional_Chinese_convertion_table_n200505.diff,
          patches/src680/sdk-remove-non-free.diff,
          patches/src680/cws-transogl02-slideshow.diff,
          patches/src680/sc-hyperlink-rename-sheet-name.diff,
          patches/src680/webdav-locking-m3.diff,
          patches/src680/cws-thiscomponent-basctl.diff,
          patches/src680/reportdesigner-fix-jarlist.diff,
          patches/src680/wizards-source-importwizard-filesmodul-xba-m3.diff,
          patches/src680/cws-thiscomponent-sfx2.diff,
          patches/src680/cws-transogl02-vcl.diff,
          patches/src680/libsn-removal.diff,
          patches/src680/wmf-pattern-brush-m3.diff,
          patches/src680/cws-mav28.diff,
          patches/src680/cws-unifysound01-vcl-m4.diff,
          patches/src680/cws-transogl02-officecfg.diff,
          patches/src680/buildfix-stl-anachronism.diff,
          patches/src680/scaddins-erf-crash-fix-065.diff,
          patches/src680/dmake-heap-corruption.diff,
          patches/src680/cws-transogl02-sd.diff,
          patches/src680/solaris-dont-depend-on-core10.diff,
          patches/src680/startup-wizard-speedup.diff,
          patches/src680/speed-text-search-performance-unotools.diff,
          patches/src680/psprint-do-not-substitute.diff,
          patches/src680/svx-delay-load-forms.diff,
          patches/src680/sw-my-mess.diff,
          patches/src680/sd-default-format-n285959.diff,
          patches/src680/sc-indirect-named-range.diff,
          patches/src680/warning-too-few-arguments-icc.diff,
          patches/src680/buildfix-sal-system.h-no-asm-sigcontext.h.diff,
          patches/src680/reportdesigner-no-license-m1.diff,
          patches/src680/unxsplash-rework-m1.diff,
          patches/src680/desktop-db-exception-visibility.diff,
          patches/src680/sw-export-empty-headers-footers.diff,
          patches/src680/sw-special-locales-date-string.diff,
          patches/src680/sc-export-shape-macro-bindings-m3.diff,
          patches/src680/speed-text-search-performance-i18npool.diff,
          patches/src680/build-java-target-m3.diff,
          patches/src680/cws-awtfixes1.diff,
          patches/src680/evoab2-adapt-to-new-api.diff,
          patches/src680/ucb-neon-0.24.diff,
          patches/src680/cws-unifysound01-vcl-m1.diff,
          patches/src680/sw-paste-czech-characters.diff,
          patches/src680/ooo84684.vcl.fixfontconfig.diff,
          patches/src680/i18npool-less-dependencies.diff,
          patches/cairo/cairo-canvas-fail-if-no-xrender.diff,
          patches/ooxml/gperf-3-is-needed-m5.diff,
          patches/ooxml/cws-xmlfilter02-sc-m3.diff,
          patches/vba/vba-brackets-params-fix-m5-m7.diff,
          patches/vba/vba-keep-codenames-in-sync-m3.diff: Bin
        * patches/dev300/webdav-locking-m3.diff,
          patches/dev300/vba-brackets-params-fix-m5-m7.diff,
          patches/dev300/svx-delay-load-forms.diff,
          patches/dev300/gperf-3-is-needed-m5.diff,
          patches/dev300/build-java-target-m3.diff,
          patches/dev300/sc-indirect-named-range.diff,
          patches/dev300/sw-my-mess.diff,
          patches/dev300/cws-xmlfilter02-sc-m3.diff,
          patches/dev300/Simplified_Traditional_Chinese_convertion_table_n200505.diff,
          patches/dev300/sc-export-shape-macro-bindings-m3.diff,
          patches/dev300/cws-transogl02-sd.diff,
          patches/dev300/cws-thiscomponent-basctl.diff,
          patches/dev300/cairo-canvas-fail-if-no-xrender.diff,
          patches/dev300/scaddins-erf-crash-fix-065.diff,
          patches/dev300/dmake-heap-corruption.diff,
          patches/dev300/buildfix-sal-system.h-no-asm-sigcontext.h.diff,
          patches/dev300/cws-unifysound01-vcl-m4.diff,
          patches/dev300/buildfix-libformula-gcj-source.diff,
          patches/dev300/reportdesigner-no-license-m1.diff,
          patches/dev300/reportdesigner-no-license-m3.diff,
          patches/dev300/sc-hyperlink-excel-a1-style.diff,
          patches/dev300/cws-thiscomponent-sfx2.diff,
          patches/dev300/cws-awtfixes1.diff,
          patches/dev300/unxsplash-rework-m1.diff,
          patches/dev300/cws-transogl02-vcl.diff,
          patches/dev300/sw-paste-czech-characters.diff,
          patches/dev300/libsn-removal.diff,
          patches/dev300/cws-newportstl.diff,
          patches/dev300/solaris-dont-depend-on-core10.diff,
          patches/dev300/sc-lotus123-import-sheetname.diff,
          patches/dev300/sd-default-format-n285959.diff,
          patches/dev300/solenv-really-use-unsinged-char-on-ppc-m1.diff,
          patches/dev300/vba-keep-codenames-in-sync-m3.diff,
          patches/dev300/warning-too-few-arguments-icc.diff,
          patches/dev300/evoab2-adapt-to-new-api.diff,
          patches/dev300/sdk-remove-non-free.diff,
          patches/dev300/svx-sdr-contact-visibility.diff,
          patches/dev300/cws-transogl02-slideshow.diff,
          patches/dev300/reportdesigner-fix-jarlist.diff,
          patches/dev300/ucb-neon-0.24.diff,
          patches/dev300/cws-sdk24fix.diff,
          patches/dev300/cws-unifysound01-vcl-m1.diff,
          patches/dev300/speed-text-search-performance-i18npool.diff,
          patches/dev300/sw-export-empty-headers-footers.diff,
          patches/dev300/cws-transogl02-officecfg.diff,
          patches/dev300/ooo84684.vcl.fixfontconfig.diff,
          patches/dev300/wizards-source-importwizard-filesmodul-xba-m3.diff,
          patches/dev300/sc-hyperlink-rename-sheet-name.diff,
          patches/dev300/i18npool-less-dependencies.diff,
          patches/dev300/wmf-pattern-brush-m3.diff,
          patches/dev300/startup-wizard-speedup.diff,
          patches/dev300/speed-text-search-performance-unotools.diff,
          patches/dev300/buildfix-stl-anachronism.diff,
          patches/dev300/sw-special-locales-date-string.diff,
          patches/dev300/psprint-do-not-substitute.diff: Move here.
        * patches/src680/apply: Apply the changes.


Added:
   trunk/patches/dev300/Simplified_Traditional_Chinese_convertion_table_n200505.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/Simplified_Traditional_Chinese_convertion_table_n200505.diff
   trunk/patches/dev300/build-java-target-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/build-java-target-m3.diff
   trunk/patches/dev300/buildfix-libformula-gcj-source.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/buildfix-libformula-gcj-source.diff
   trunk/patches/dev300/buildfix-sal-system.h-no-asm-sigcontext.h.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/buildfix-sal-system.h-no-asm-sigcontext.h.diff
   trunk/patches/dev300/buildfix-stl-anachronism.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/buildfix-stl-anachronism.diff
   trunk/patches/dev300/cairo-canvas-fail-if-no-xrender.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/cairo/cairo-canvas-fail-if-no-xrender.diff
   trunk/patches/dev300/cws-awtfixes1.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-awtfixes1.diff
   trunk/patches/dev300/cws-newportstl.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-newportstl.diff
   trunk/patches/dev300/cws-sdk24fix.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-sdk24fix.diff
   trunk/patches/dev300/cws-thiscomponent-basctl.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-thiscomponent-basctl.diff
   trunk/patches/dev300/cws-thiscomponent-sfx2.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-thiscomponent-sfx2.diff
   trunk/patches/dev300/cws-transogl02-officecfg.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-transogl02-officecfg.diff
   trunk/patches/dev300/cws-transogl02-sd.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-transogl02-sd.diff
   trunk/patches/dev300/cws-transogl02-slideshow.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-transogl02-slideshow.diff
   trunk/patches/dev300/cws-transogl02-vcl.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-transogl02-vcl.diff
   trunk/patches/dev300/cws-unifysound01-vcl-m1.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-unifysound01-vcl-m1.diff
   trunk/patches/dev300/cws-unifysound01-vcl-m4.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/cws-unifysound01-vcl-m4.diff
   trunk/patches/dev300/cws-xmlfilter02-sc-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/ooxml/cws-xmlfilter02-sc-m3.diff
   trunk/patches/dev300/dmake-heap-corruption.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/dmake-heap-corruption.diff
   trunk/patches/dev300/evoab2-adapt-to-new-api.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/evoab2-adapt-to-new-api.diff
   trunk/patches/dev300/gperf-3-is-needed-m5.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/ooxml/gperf-3-is-needed-m5.diff
   trunk/patches/dev300/i18npool-less-dependencies.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/i18npool-less-dependencies.diff
   trunk/patches/dev300/libsn-removal.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/libsn-removal.diff
   trunk/patches/dev300/ooo84684.vcl.fixfontconfig.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff
   trunk/patches/dev300/psprint-do-not-substitute.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/psprint-do-not-substitute.diff
   trunk/patches/dev300/reportdesigner-fix-jarlist.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/reportdesigner-fix-jarlist.diff
   trunk/patches/dev300/reportdesigner-no-license-m1.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/reportdesigner-no-license-m1.diff
   trunk/patches/dev300/reportdesigner-no-license-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/reportdesigner-no-license-m3.diff
   trunk/patches/dev300/sc-export-shape-macro-bindings-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sc-export-shape-macro-bindings-m3.diff
   trunk/patches/dev300/sc-hyperlink-excel-a1-style.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sc-hyperlink-excel-a1-style.diff
   trunk/patches/dev300/sc-hyperlink-rename-sheet-name.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sc-hyperlink-rename-sheet-name.diff
   trunk/patches/dev300/sc-indirect-named-range.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sc-indirect-named-range.diff
   trunk/patches/dev300/sc-lotus123-import-sheetname.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sc-lotus123-import-sheetname.diff
   trunk/patches/dev300/scaddins-erf-crash-fix-065.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/scaddins-erf-crash-fix-065.diff
   trunk/patches/dev300/sd-default-format-n285959.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sd-default-format-n285959.diff
   trunk/patches/dev300/sdk-remove-non-free.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sdk-remove-non-free.diff
   trunk/patches/dev300/solaris-dont-depend-on-core10.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/solaris-dont-depend-on-core10.diff
   trunk/patches/dev300/solenv-really-use-unsinged-char-on-ppc-m1.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff
   trunk/patches/dev300/speed-text-search-performance-i18npool.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/speed-text-search-performance-i18npool.diff
   trunk/patches/dev300/speed-text-search-performance-unotools.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/speed-text-search-performance-unotools.diff
   trunk/patches/dev300/startup-wizard-speedup.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/startup-wizard-speedup.diff
   trunk/patches/dev300/svx-delay-load-forms.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/svx-delay-load-forms.diff
   trunk/patches/dev300/svx-sdr-contact-visibility.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/svx-sdr-contact-visibility.diff
   trunk/patches/dev300/sw-export-empty-headers-footers.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sw-export-empty-headers-footers.diff
   trunk/patches/dev300/sw-my-mess.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sw-my-mess.diff
   trunk/patches/dev300/sw-paste-czech-characters.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/sw-paste-czech-characters.diff
   trunk/patches/dev300/sw-special-locales-date-string.diff
      - copied unchanged from r11883, /trunk/patches/src680/sw-special-locales-date-string.diff
   trunk/patches/dev300/ucb-neon-0.24.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/ucb-neon-0.24.diff
   trunk/patches/dev300/unxsplash-rework-m1.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/unxsplash-rework-m1.diff
   trunk/patches/dev300/vba-brackets-params-fix-m5-m7.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/vba/vba-brackets-params-fix-m5-m7.diff
   trunk/patches/dev300/vba-keep-codenames-in-sync-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/vba/vba-keep-codenames-in-sync-m3.diff
   trunk/patches/dev300/warning-too-few-arguments-icc.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/warning-too-few-arguments-icc.diff
   trunk/patches/dev300/webdav-locking-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/webdav-locking-m3.diff
   trunk/patches/dev300/wizards-source-importwizard-filesmodul-xba-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/wizards-source-importwizard-filesmodul-xba-m3.diff
   trunk/patches/dev300/wmf-pattern-brush-m3.diff   (props changed)
      - copied unchanged from r11883, /trunk/patches/src680/wmf-pattern-brush-m3.diff
Removed:
   trunk/patches/cairo/cairo-canvas-fail-if-no-xrender.diff
   trunk/patches/ooxml/cws-xmlfilter02-sc-m3.diff
   trunk/patches/ooxml/gperf-3-is-needed-m5.diff
   trunk/patches/src680/Simplified_Traditional_Chinese_convertion_table_n200505.diff
   trunk/patches/src680/build-java-target-m3.diff
   trunk/patches/src680/buildfix-libformula-gcj-source.diff
   trunk/patches/src680/buildfix-sal-system.h-no-asm-sigcontext.h.diff
   trunk/patches/src680/buildfix-stl-anachronism.diff
   trunk/patches/src680/cws-awtfixes1.diff
   trunk/patches/src680/cws-mav28.diff
   trunk/patches/src680/cws-newportstl.diff
   trunk/patches/src680/cws-sdk24fix.diff
   trunk/patches/src680/cws-thiscomponent-basctl.diff
   trunk/patches/src680/cws-thiscomponent-sfx2.diff
   trunk/patches/src680/cws-transogl02-officecfg.diff
   trunk/patches/src680/cws-transogl02-sd.diff
   trunk/patches/src680/cws-transogl02-slideshow.diff
   trunk/patches/src680/cws-transogl02-vcl.diff
   trunk/patches/src680/cws-unifysound01-vcl-m1.diff
   trunk/patches/src680/cws-unifysound01-vcl-m4.diff
   trunk/patches/src680/desktop-db-exception-visibility.diff
   trunk/patches/src680/dmake-heap-corruption.diff
   trunk/patches/src680/evoab2-adapt-to-new-api.diff
   trunk/patches/src680/i18npool-less-dependencies.diff
   trunk/patches/src680/libsn-removal.diff
   trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff
   trunk/patches/src680/psprint-do-not-substitute.diff
   trunk/patches/src680/reportdesigner-fix-jarlist.diff
   trunk/patches/src680/reportdesigner-no-license-m1.diff
   trunk/patches/src680/reportdesigner-no-license-m3.diff
   trunk/patches/src680/sc-export-shape-macro-bindings-m3.diff
   trunk/patches/src680/sc-hyperlink-excel-a1-style.diff
   trunk/patches/src680/sc-hyperlink-rename-sheet-name.diff
   trunk/patches/src680/sc-indirect-named-range.diff
   trunk/patches/src680/sc-lotus123-import-sheetname.diff
   trunk/patches/src680/scaddins-erf-crash-fix-065.diff
   trunk/patches/src680/sd-default-format-n285959.diff
   trunk/patches/src680/sdk-remove-non-free.diff
   trunk/patches/src680/solaris-dont-depend-on-core10.diff
   trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff
   trunk/patches/src680/speed-text-search-performance-i18npool.diff
   trunk/patches/src680/speed-text-search-performance-unotools.diff
   trunk/patches/src680/startup-wizard-speedup.diff
   trunk/patches/src680/svx-delay-load-forms.diff
   trunk/patches/src680/svx-sdr-contact-visibility.diff
   trunk/patches/src680/sw-export-empty-headers-footers.diff
   trunk/patches/src680/sw-my-mess.diff
   trunk/patches/src680/sw-paste-czech-characters.diff
   trunk/patches/src680/sw-special-locales-date-string.diff
   trunk/patches/src680/ucb-neon-0.24.diff
   trunk/patches/src680/unxsplash-rework-m1.diff
   trunk/patches/src680/warning-too-few-arguments-icc.diff
   trunk/patches/src680/webdav-locking-m3.diff
   trunk/patches/src680/wizards-source-importwizard-filesmodul-xba-m3.diff
   trunk/patches/src680/wmf-pattern-brush-m3.diff
   trunk/patches/vba/vba-brackets-params-fix-m5-m7.diff
   trunk/patches/vba/vba-keep-codenames-in-sync-m3.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 13 13:45:25 2008
@@ -6,7 +6,7 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+
 
-OLDEST_SUPPORTED=ooh680-m1
+OLDEST_SUPPORTED=ooh680-m10
 
 # -------- Functional sub-sets --------
 Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -205,22 +205,6 @@
 #This is timar's patch, will be fixed in 3.0 in the stream
 i86580-autocorr-exclamation.diff, i86580, szalaik
 
-[ TemporaryHacks < ooh680-m5 ]
-# libspl680*so does not have to be loaded when we present no startup wizard
-startup-wizard-speedup.diff, i#84169, jholesov
-
-[ TemporaryHacks < ooh680-m4 ]
-# fixed for n#200505
-Simplified_Traditional_Chinese_convertion_table_n200505.diff, Fong Lin, n#200505
-
-# move gl_ES to localedata_es to save dependency & memory
-i18npool-less-dependencies.diff, i#84206, jholesov
-
-# dont initialize forms on the Writer startup, rather do it when the first form
-# control is created
-svx-delay-load-forms.diff, i#84259, jholesov
-
-[ TemporaryHacks ]
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 
@@ -286,38 +270,15 @@
 cws-unifysound01-solenv.diff
 cws-unifysound01-svx.diff
 cws-unifysound01-sw.diff
-
-[ CWSBackports < ooh680-m2 ]
-cws-unifysound01-vcl-m1.diff
-
-[ CWSBackports >= ooh680-m2 < ooh680-m5 ]
-cws-unifysound01-vcl-m4.diff
-
-[ CWSBackports >= ooh680-m5 ]
 cws-unifysound01-vcl.diff
 
-[ CWSBackports < ooh680-m4 ]
-# Use stlport just on the archs where it is needed from historical reasons
-cws-newportstl.diff
-
-[ CWSBackports == ooh680-m7 ]
-cws-mav28.diff
-
-[ CWSBackports ]
 #dialog refactor
 cws-npower9.diff
 #basic runtime fixes
 cws-npower10.diff
 #api changes
 cws-npower11.diff
-[ CWSBackports < ooh680-m2 ]
-buildfix-stl-anachronism.diff, i#83519
 
-[ CWSBackports < ooh680-m3 ]
-cws-thiscomponent-basctl.diff
-cws-thiscomponent-sfx2.diff
-
-[ CWSBackports ]
 cws-ia64port01.diff, i#84999
 cws-s390port01.diff, i#86425
 # not for upstreaming: don't disable the entire visibility, just
@@ -327,9 +288,9 @@
 # fix build with neon 0.28
 cws-cmcfixes42-ucb.diff, i#86123
 
-[ CWSBackports >= ooh680-m4 ]
 cws-hsqldb16.diff, i#85087
 
+
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
@@ -352,8 +313,6 @@
 # JDKs too
 buildfix-qadevOOo-java-encoding.diff, brosenk
 
-[ GCJ >= ooh680-m2 < ooh680-m4 ]
-buildfix-libformula-gcj-source.diff, i#85249
 
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
@@ -381,18 +340,10 @@
 
 sdext-no-license.diff
 
-[ FixesNotForUpstream < ooh680-m2 ]
-# no bogus license question when registering this extension
-reportdesigner-no-license-m1.diff
-
-[ FixesNotForUpstream >= ooh680-m2 < ooh680-m4 ]
-# no bogus license question when registering this extension
-reportdesigner-no-license-m3.diff
-
-[ FixesNotForUpstream >= ooh680-m4 ]
 # no bogus license question when registering this extension
 reportdesigner-no-license.diff
 
+
 [ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
@@ -400,21 +351,12 @@
 # let sd accept uri-list drop, n#183719
 sd-accept-uri-list-drop.diff, n#183719, rodo
 
-[ Fixes < ooh680-m10 ]
-# berkeley db exception handling
-desktop-db-exception-visibility.diff, i#86268
-
 # support the groupwise mail client
 shell-senddoc-support-groupwise.diff, n#368044, i#86886, pmladek
 
 # allow to send documents with a space in the name via sylpheed-claws
 shell-senddoc-sylpheed-filenames.diff, n#362773, i#86887, pmladek
 
-[ Fixes < ooh680-m4 ]
-# default formatting PPT export bug n#285959
-sd-default-format-n285959.diff, i#81395, n#285959, hub
-
-[ Fixes ]
 # add some shortcuts to Impress + needed fixes. bug n#352330
 sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
 svx-text-move-fix-i59061.diff, i#59061, hub
@@ -432,15 +374,9 @@
 # disable font management dialog in padmin
 padmin-nofontconfig.diff, michael
 
-[ Fixes < ooh680-m4 ]
-# Fix for n#113235
-wizards-source-importwizard-filesmodul-xba-m3.diff, i#56633, noelpwer
-
-[ Fixes >= ooh680-m4 ]
 # Fix for n#113235
 wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
 
-[ Fixes ]
 # testtool doesn't like oobuild basic compatability defaults
 # ooo-build only fix n#145906#
 automation-testtool-oobuildfix.diff, n#145906, noelpwer
@@ -479,11 +415,6 @@
 # allow dmake create_patch produce diffable patches
 solenv-dmake-create_patch.diff, i#68917, fridrich
 
-[ Fixes < ooh680-m4 ] 
-# fix visibility for controls
-svx-sdr-contact-visibility.diff, i#83611. noelpwer
-
-[ Fixes ]
 # look for libmawt.so on x86_64 too
 sun-java-amd64-jreextralibdir.diff
 
@@ -509,29 +440,10 @@
 # convert kind of correctly nested positioned tables
 sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
 
-[ Fixes < ooh680-m7 ]
-# fix a regression created by my header/footer patch
-sw-my-mess.diff, fridrich
-
-[ Fixes < ooh680-m4 ]
-#fix conversion of date/time strings in Dutch Word documents
-sw-special-locales-date-string.diff, i#84469, n#344306, fridrich
-
-#fix bug in export to WW8 of page styles without headers/footers
-#that follow sections with headers/footers
-sw-export-empty-headers-footers.diff, i#84747, n#178981, fridrich
-
-# Fix pasting Czech characters (UTF-8 html was not treated as UTF-8)
-sw-paste-czech-characters.diff, i#84642, n#334930, jholesov
-
-[ Fixes == ooh680-m3 ]
-# not REPRORTJARFILES
-reportdesigner-fix-jarlist.diff, i#85359
-
-[ Fixes ]
 # make path detection look for VC2005er dlls, too
 config_office-msvc8-compat.diff, thorsten
 
+
 [ SELinux ]
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
@@ -593,7 +505,6 @@
 # Show the file size in the Properties dialog
 gnome-vfs-properties.diff, n#264585, jholesov
 
-[ GnomeVFS >= ooh680-m4 ]
 # WebDAV locking
 # It is in this section because it needs part of the gvfs-related patches
 webdav-locking.diff, n#346711, i#29152, jholesov
@@ -622,30 +533,17 @@
 # ne_lockstore_add() must be called _after_ ne_lock()
 webdav-locking-lockstore.diff, i#29152, jholesov
 
-[ GnomeVFS < ooh680-m4 ]
-# WebDAV locking
-# It is in this section because it needs part of the gvfs-related patches
-webdav-locking-m3.diff, n#346711, i#29152, jholesov
-
-[ QuickStarter < ooh680-m2 ]
-# External splash screen implementation / 2nd time accelerator
-unxsplash-rework-m1.diff, i#60696, michael/jholesov
 
-[ QuickStarter >= ooh680-m2 ]
+[ QuickStarter ]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
 
-[ QuickStarter ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
 # when OOo fails during startup, don't loop endlessly
 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
 
-[ QuickStarter < ooh680-m5 ]
-# libstartup-notification is not necessary with oosplash.bin
-libsn-removal.diff, i#84179, jholesov
-
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.
@@ -738,11 +636,6 @@
 # Add extra padding so that the cell height is larger -- increases legibility.
 sc-extra-cell-margins.diff, n#361358, jonp
 
-[ CalcFixes < ooh680-m4 ]
-# Add named range support for INDIRECT and INDIRECT_XL
-sc-indirect-named-range.diff, i#4695, n#274387, kohei
-
-[ CalcFixes ]
 # Change default numbering scheme of x-y plot chart from Row 1, Row2, ... to
 # 1, 2, 3... when the X labels are not explicitly given.  This is what Excel
 # does.
@@ -766,19 +659,6 @@
 # the block selection, not the end.
 sc-move-from-origin.diff, n#364351, jonp
 
-[ CalcFixes < ooh680-m4 ]
-# allow Excel A1 style format (e.g. #Sheet2!A2) in hyperlink destination.
-sc-hyperlink-excel-a1-style.diff, i#80448, kohei
-
-# rename sheet name in URL on import when invalid characters are used (such as
-# '&').
-sc-hyperlink-rename-sheet-name.diff, n#246629, i#81154, kohei
-
-# Speed up recalculation of SEARCH function when thousands of cells use it.
-speed-text-search-performance-unotools.diff, i#80981, kohei
-speed-text-search-performance-i18npool.diff, i#80981, kohei
-
-[ CalcFixes ]
 # Allow biffdump.cxx to compile on 64-bit platforms
 sc-biffdump.diff, i#82184, jonp
 
@@ -799,14 +679,6 @@
 # Launch navigator when double-clicking the leftmost status area box.
 sc-status-bar-launch-navigator.diff, i#49491, kohei
 
-[ CalcFixes < ooh680-m4 ]
-# Fix crashes on erf(0.65).  This is fixed in dr58 CWS upstream.
-scaddins-erf-crash-fix-065.diff, i#84395, kohei
-
-# Import sheet names properly from Lotus 1-2-3 document.
-sc-lotus123-import-sheetname.diff, i#84496, kohei
-
-[ CalcFixes ]
 # Enhance FREQUENCY function to make it behave like Excel (ODFF).
 sc-openformula-frequency.diff, i#8946, kohei
 
@@ -875,11 +747,6 @@
 sfx2-always-allow-save-document.diff, n#347423, i#5226, kohei
 
 
-[ Misc < ooh680-m5 ]
-# Don't substitute downloadable fonts with resident fonts.
-psprint-do-not-substitute.diff, i#84481, kohei
-
-
 [ EasterEgg ]
 # go-oo.org people active in this release
 go-oo-team.diff, michael
@@ -892,16 +759,9 @@
 # Some Novell colors ...
 novell-palette.diff, michael
 
-[ NovellOnly > ooh680-m1 ]
-
 # finally disable -fsigned-char on pcc
 solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 
-[ NovellOnly <= ooh680-m1 ]
-
-# finally disable -fsigned-char on pcc
-solenv-really-use-unsinged-char-on-ppc-m1.diff, i#81127, n#169875, pmladek
-
 
 [ NotDebian ]
 
@@ -932,9 +792,6 @@
 desktop-keyconfig-migration.diff n#367160, kohei
 
 
-[ DebianBaseOnly < ooh680-m4 ]
-sdk-remove-non-free.diff
-
 [ DebianBaseOnly ]
 SectionOwner => rengelha
 
@@ -1018,31 +875,13 @@
 [ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
-[ BuildBits < ooh680-m4 ]
-# allow to define java target, so the build is usable with the JVM 1.4
-# even when it is built with JDK 1.5
-build-java-target-m3.diff, pmladek
-
-[ BuildBits >= ooh680-m4 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
 
-[ BuildBits < ooh680-m5 ]
-# don't include asm/sigcontext.h, see Debian Bug #442418
-buildfix-sal-system.h-no-asm-sigcontext.h.diff
-
-[ BuildBits ]
 # fix build with gcc-4.2.1 and -fvisibility-hidden
 buildfix-xmloff-exportxforms.diff, i#84965
 
-[ BuildBits < ooh680-m2 ]
-# fix building with system neon-0.24
-ucb-neon-0.24.diff, pmladek, i#85265
-
-[ BuildBits == ooh680-m4 ]
-# fix evoab2 build
-evoab2-adapt-to-new-api.diff, i#85487
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml
@@ -1216,18 +1055,11 @@
 # fix build with vba as extension
 buildfix-vba-as-extn.diff, i#86937, hmth
 
-[ BuildBits >= ooh680-m5 ]
-
 # fix build with gcc-4.3 on x86_64
 gcc-4.3-icc.diff, i#85771, pmladek
 # fix build with gcc-4.3 on ix86
 gcc-4.3-bridges.diff, i#86551, pmladek
 
-[ BuildBits >= ooh680-m5 < ooh680-m6  ]
-
-# fixes missing sprintf argument
-warning-too-few-arguments-icc.diff. i#85736, pmladek
-
 
 [ BFBuildBits ]
 SectionOwner => pmladek
@@ -1236,8 +1068,6 @@
 binfilter-stl.diff, i#63770, hmth
 cws-gcc430two-binfilter.diff, i#83276, pmladek
 
-[ SdkFixes >= ooh680-m4 < ooh680-m8]
-cws-sdk24fix.diff
 
 [ SystemBuildBits ]
 SectionOwner => fridrich
@@ -1493,28 +1323,15 @@
 vba-workbook-worksheet-events.diff
 vba-workbook-worksheet-events-buildfix.diff
 
-[ VBAObjects < ooh680-m4 ]
-vba-keep-codenames-in-sync-m3.diff
-
-[ VBAObjects >= ooh680-m4 ]
 vba-keep-codenames-in-sync.diff
 
 [ VBAObjects ]
 #associating sheet and codename when insert a sheet
 # sc-insert-sheet-codename.diff, i#80869, jianhua
 
-[ VBAObjects < ooh680-m4 ]
-vba-brackets-params-fix.diff, i#79918, n#292861
-vba-negnumber-inparam-withoutbrackets.diff, n#294302
-
-[ VBAObjects > ooh680-m7 ]
 vba-brackets-params-fix.diff, i#79918, n#292861
 vba-negnumber-inparam-withoutbrackets.diff, n#294302
 
-[ VBAObjects >= ooh680-m4 < ooh680-m8 ]
-vba-brackets-params-fix-m5-m7.diff
-
-[ VBAObjects ]
 # hack for when resolving a symbol in the module ThisWorkbook
 vba-symbol-searchhack-for-thisworkbook.diff
 vba-allow-ranges-for-cell-functions.diff
@@ -1543,15 +1360,9 @@
 # core changes not yet upstream
 sc-source-ui-vba-makefile-mk.diff
 
-[ VBAObjects < ooh680-m4 ]
-# export of macro bindings for shapes
-sc-export-shape-macro-bindings-m3.diff, n#304739, noelpwer
-
-[ VBAObjects >= ooh680-m4 ]
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer
 
-[ VBAObjects ]
 # export of hlink bindings for shapes
 sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
 
@@ -1576,6 +1387,8 @@
 # fix for n#365557. missing APIs of XInterior
 vba-interior.diff, n#365557, Jianhua
 vba-stringtodouble.diff, n#359943, noelpwer
+
+
 [ VBAUntested ]
 SectionOwner => noelpwer
 # start LCL hacks
@@ -1680,13 +1493,8 @@
 #scsolver-enable-extension.diff
 
 
-[ OOXML < ooh680-m4 ]
-cws-xmlfilter02-sc-m3.diff
-
-[ OOXML >= ooh680-m4 ]
-cws-xmlfilter02-sc.diff
-
 [ OOXML ]
+cws-xmlfilter02-sc.diff
 cws-xmlfilter02-config_office.diff
 cws-xmlfilter02-filter.diff
 cws-xmlfilter02-goodies.diff
@@ -1711,12 +1519,9 @@
 
 writerfilter-source-dmapper-domainmapper-debug.diff
 
-[ OOXML < ooh680-m6 ]
-gperf-3-is-needed-m5.diff
-
-[ OOXML >= ooh680-m6 ]
 gperf-3-is-needed.diff
 
+
 [ CalcFixes ]
 
 # Allow comma as a cell separators in functions
@@ -1794,20 +1599,9 @@
 cairo-config_office-configure-in.diff, i#70519, tml
 cairo-cairo-1-4-10-diff.diff, i#70519, tml
 
-[ cairocanvas < ooh680-m4 ]
-# don't crash if xrender extension is not present
-cairo-canvas-fail-if-no-xrender.diff, i#84049, fridrich
-
-[ cairocanvas ]
 # Additional diffs for cairocanvas on Win32
 cairo-canvas-win32.diff, i#70519, n#300398, tml
 
-[ OpenGLTransitions < ooh680-m4 ]
-cws-transogl02-officecfg.diff
-cws-transogl02-sd.diff
-cws-transogl02-slideshow.diff
-cws-transogl02-vcl.diff
-
 [ OpenGLTransitions ]
 transogl-transitions-slideshow.diff
 transogl-transitions-sd.diff
@@ -1884,10 +1678,6 @@
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
 
-[ FedoraFixes < ooh680-m5 ]
-ooo84684.vcl.fixfontconfig.diff
-
-[ FedoraFixes ]
 ooo67658.sfx2.reloadcrash.diff
 
 oooXXXXX.vcl.x86_64.impressatk.diff
@@ -2019,16 +1809,10 @@
 novell-win32-avoid-premature-shutdown.diff
 
 
-[ WMF < ooh680-m4 ]
-wmf-pattern-brush-m3.diff, n#232232, rodo
-[ WMF >= ooh680-m4 ]
+[ WMF ]
 wmf-pattern-brush.diff, n#232232, rodo
 
 
-[ Layout < ooh680-m2]
-SectionOwner => janniew
-cws-awtfixes1.diff, i#78291, i#80754
-
 [ Layout ]
 SectionOwner => janniew
 cws-layout-svtools.diff
@@ -2228,8 +2012,6 @@
 cairocanvas-image-borders.diff, n#340142, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 
-[ Fixes < ooh680-m3 ]
-solaris-dont-depend-on-core10.diff, fridrich
 
 [ EMFPlus ]
 emf+-canvas.diff
@@ -2332,8 +2114,6 @@
 # Fix pasting with middle button in Calc
 sc-middle-button-should-paste-text.diff, n#282767, i#86734, jholesov
 
-[ Fixes < ooh680-m6 ]
-dmake-heap-corruption.diff, i#85381, tml
 
 [ Glib2 ]
 external-package-glib2.diff



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]