ooo-build r13464 - in trunk: . patches/cairo patches/dev300 patches/emf+ patches/evo2 patches/mono patches/ooxml patches/postgresql patches/unittesting



Author: rengelhard
Date: Sun Aug  3 22:18:09 2008
New Revision: 13464
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13464&view=rev

Log:
2008-08-04  Rene Engelhard  <rene debian org>

        * configure.in: default to dev300-m28
        * patches/dev300*,
          patches/evo2*,
          patches/mono,
          patches/postgresql,
          patches/unittesting,
          patches/ooxml,
          patches/dev300/apply*: remove everything < dev300-m28
        Doesn't build since some commits, but if people can't test whether
        their commits do build....


Added:
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff
      - copied unchanged from r13463, /trunk/patches/dev300/linkwarn-svtools-miscopts-bits-m26.diff
Removed:
   trunk/patches/cairo/cairo-canvas-cairo.diff
   trunk/patches/cairo/cairo-config_office-configure-in.diff
   trunk/patches/cairo/cairo-prj-build-lst-m21.diff
   trunk/patches/cairo/cairo-prj-d-lst-m21.diff
   trunk/patches/cairo/cairocanvas-image-borders.diff
   trunk/patches/dev300/ant-regexp-test.diff
   trunk/patches/dev300/basic-initialize-member.diff
   trunk/patches/dev300/build-java-target-m21.diff
   trunk/patches/dev300/build-java-target-m25.diff
   trunk/patches/dev300/build-java-target-swext-m25.diff
   trunk/patches/dev300/buildfix-system-jfreereport.diff
   trunk/patches/dev300/cairocanvas-alpha-pixmap-rewrite.diff
   trunk/patches/dev300/cairocanvas-fix-after-win32-removeval.diff
   trunk/patches/dev300/cairocanvas-fix-image-cache.diff
   trunk/patches/dev300/calc-xlsx-import-crash-free-cache.diff
   trunk/patches/dev300/cjk-punctuation-compress.diff
   trunk/patches/dev300/configures-explicit-arch-m24.diff
   trunk/patches/dev300/cws-cmcfixes47-extensions.diff
   trunk/patches/dev300/cws-cmcfixes47-sw.diff
   trunk/patches/dev300/cws-impress146.diff
   trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff
   trunk/patches/dev300/cws-npower10-m21.diff
   trunk/patches/dev300/cws-npower10.diff
   trunk/patches/dev300/cws-npower11-m25.diff
   trunk/patches/dev300/cws-scsheetprotection02-sc-m21.diff
   trunk/patches/dev300/debian-system-jfreereport-m21.diff
   trunk/patches/dev300/default-no-install-wizards.diff
   trunk/patches/dev300/fpicker-gtk-accel-n354447.diff
   trunk/patches/dev300/gui-insensitive.diff
   trunk/patches/dev300/helpcontent2-hungarian-fonts.diff
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits-m26.diff
   trunk/patches/dev300/lockfile-less-symbols-m21.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m24.diff
   trunk/patches/dev300/novell-win32-odma-m26.diff
   trunk/patches/dev300/odf-flatxml-import-export-m23.diff
   trunk/patches/dev300/ooo64508.vcl.honourfontconfighinting-m21.diff
   trunk/patches/dev300/pdfimport-no-license-m23.diff
   trunk/patches/dev300/presentation-minimizer-no-license-m23.diff
   trunk/patches/dev300/psprint_config-no-orig-m21.diff
   trunk/patches/dev300/reportdesigner-no-license-m22.diff
   trunk/patches/dev300/sc-middle-button-should-paste-text.diff
   trunk/patches/dev300/sc-sheet-name-special-chars.diff
   trunk/patches/dev300/sc-skip-pivot-charts.diff
   trunk/patches/dev300/scp2-3layer-nicer-paths-m24.diff
   trunk/patches/dev300/scp2-without-myspell-dicts.diff
   trunk/patches/dev300/scp2_accessories_templates_makefile-m26.diff
   trunk/patches/dev300/sd-accept-uri-list-drop.diff
   trunk/patches/dev300/sd-slidesorter-dead-ptr.diff
   trunk/patches/dev300/sd-text-shortcut-n352330.diff
   trunk/patches/dev300/sdk-gid-module-name-m24.diff
   trunk/patches/dev300/slideshow-animated-bmp-fix.diff
   trunk/patches/dev300/store-registry-m21.diff
   trunk/patches/dev300/svg-import-basegfx.diff
   trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML-m20.diff
   trunk/patches/dev300/svx-text-move-fix-i59061.diff
   trunk/patches/dev300/sw-hyperlinks-without-scheme.diff
   trunk/patches/dev300/system-lpsolve-rpath-m21.diff
   trunk/patches/dev300/system-lucene.diff
   trunk/patches/dev300/tango-icons-default-w32-m23.diff
   trunk/patches/dev300/tools-resmgr-expansion-fix.diff
   trunk/patches/dev300/transogl-dispose-fix-m21.diff
   trunk/patches/dev300/transogl-mesa-fallback-m21.diff
   trunk/patches/dev300/transogl-more-transitions-m21.diff
   trunk/patches/dev300/transogl-shader-transitions-1-m21.diff
   trunk/patches/dev300/transogl-shader-transitions-m21.diff
   trunk/patches/dev300/transogl-sync-fix-m21.diff
   trunk/patches/dev300/transogl-transitions-slideshow-m21.diff
   trunk/patches/dev300/transogl-vsync-m21.diff
   trunk/patches/dev300/ui-desktop-integration-m25.diff
   trunk/patches/dev300/unxsplash-rework-m25.diff
   trunk/patches/dev300/userform-scrollleftandtop.diff
   trunk/patches/dev300/uses-vfs-m25.diff
   trunk/patches/dev300/vcl-cairofont-multiscreen-fix.diff
   trunk/patches/dev300/vcl-cairofont-transform-fix.diff
   trunk/patches/dev300/vcl-limited-bmp-subset-fix.diff
   trunk/patches/dev300/vcl-linking-randr-m21.diff
   trunk/patches/dev300/vcl-png-import-fix.diff
   trunk/patches/dev300/vcl-virdev-missing-initialisation.diff
   trunk/patches/dev300/vcl-xinerama-64bit-fix.diff
   trunk/patches/dev300/wiki-publisher-no-license-m23.diff
   trunk/patches/dev300/zoom-combobox-m22.diff
   trunk/patches/emf+/emf+-canvas.diff
   trunk/patches/emf+/emf+-cppcanvas-emfplus-m21.diff
   trunk/patches/emf+/emf+-cppcanvas-polyaction.diff
   trunk/patches/emf+/emf+-cppcanvas.diff
   trunk/patches/emf+/emf+-dxcanvas.diff
   trunk/patches/emf+/emf+-offapi.diff
   trunk/patches/emf+/emf+-vcl-renderer-m21.diff
   trunk/patches/evo2/default-evo2-ab-m23.diff
   trunk/patches/mono/build-mono-link-m21.diff
   trunk/patches/mono/buildfix-climaker-disabled-m21.diff
   trunk/patches/mono/buildfix-use-climaker-in-unoil-m25.diff
   trunk/patches/mono/cli_ure-mono-bridge-m21.diff
   trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk-m21.diff
   trunk/patches/mono/climaker-csharp-win-m21.diff
   trunk/patches/mono/mono-build-keyfile-m21.diff
   trunk/patches/mono/mono-build-m21.diff
   trunk/patches/mono/mono-climaker-m21.diff
   trunk/patches/mono/mono-scp2-m21.diff
   trunk/patches/mono/mono-scp2-m25.diff
   trunk/patches/mono/mono-scp2-m27.diff
   trunk/patches/mono/mono-testtools-m21.diff
   trunk/patches/ooxml/sysui-desktop-ooxml.diff
   trunk/patches/postgresql/sdbc-postgresql-config_office-m22.diff
   trunk/patches/unittesting/unittesting-build-pl-m26.diff
   trunk/patches/unittesting/unittesting-forms-m24.diff
   trunk/patches/unittesting/unittesting-testtools-m21.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Aug  3 22:18:09 2008
@@ -7,7 +7,7 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting
 
-OLDEST_SUPPORTED=dev300-m21 beb300-m0 ooo300-m0
+OLDEST_SUPPORTED=dev300-m28 ooo300-m0
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -251,17 +251,9 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
-[ TemporaryHacks < dev300-m25 ]
-# flatten the structure of the 3 layer OOo a bit
-scp2-3layer-nicer-paths-m24.diff, i#90430, jholesov
-[ TemporaryHacks >= dev300-m25 < beb300-m0 ]
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
-# fix build in cairo
-[ TemporaryHacks < dev300-m22 >= beb300-m1 ]
-cairocanvas-fix-after-win32-removeval.diff, rodo
-
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua
@@ -288,11 +280,6 @@
 # for mixed font set
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
-[ CJK < dev300-m22 >= beb300-m1 ]
-# FIXME - it looks like this went up-stream, but no issue !
-# text layout enhancement for better CJK support
-cjk-punctuation-compress.diff, Amelia Wang
-
 [ CWSBackports ]
 # MS Works import filter (following patches depend on each other) Fridrich
 wpsimport-config_office.diff
@@ -303,7 +290,6 @@
 libwps.diff
 
 [ CWSBackports < dev300-m25 > beb300-m0 ]
-
 # FIXME: port cws-webdavandgvfslocking1-ucb.diff for dev300-m25
 #        and enable all the patches again
 # WebDAV and gnome-vfs locking implementation
@@ -322,36 +308,17 @@
 #webdav-locking-refresh-lock.diff, n#403724, jholesov
 
 [ CWSBackports ]
-
 #basic runtime fixes
-[ CWSBackports == dev300-m22 < beb300-m0 ]
-cws-npower10.diff
-[ CWSBackports >= dev300-m22 < beb300-m0 ]
 basic-add-missing-includes-after-cws-npower10.diff
 
-[ CWSBackports < dev300-m22 >= beb300-m1 ]
-cws-npower10-m21.diff
-[ CWSBackports ]
 cws-pflin10.diff
 #api changes
-[ CWSBackports < dev300-m26 ]
-cws-npower11-m25.diff
-[ CWSBackports >= dev300-m26 ]
 cws-npower11.diff
 
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
-[ CWSBackports < dev300-m26 ]
-# fix mozilla plugin on 64bit
-cws-cmcfixes47-extensions.diff, i#82545
-
-cws-cmcfixes47-sw.diff, i#90306
-
-[ CWSBackports < dev300-m24 ]
-cws-impress146.diff
-
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
@@ -379,14 +346,9 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
-[ FixesNotForUpstream < dev300-m26 ]
-# Tell the desktop we support the VFS
-uses-vfs-m25.diff, i#43504, michael
-[ FixesNotForUpstream >= dev300-m26 < beb300-m0 ]
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
-[ FixesNotForUpstream ]
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
@@ -399,42 +361,26 @@
 
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
-[ FixesNotForUpstream >= beb300-m1 >= dev300-m23 ]
 reportdesigner-no-license.diff
-[ FixesNotForUpstream < beb300-m1 < dev300-m23 ]
-reportdesigner-no-license-m22.diff
-
-[ FixesNotForUpstream < dev300-m24 < beb300-m3 ]
-presentation-minimizer-no-license-m23.diff
-pdfimport-no-license-m23.diff
-[ FixesNotForUpstream >= dev300-m24 >= beb300-m3 ]
 presentation-minimizer-no-license.diff
 pdfimport-no-license.diff
-
-[ FixesNotForUpstream ]
 presenterscreen-no-license.diff
 offapi-typecheck-whitelist.diff, thorsten
 
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff
 
-[ swextFixes < dev300-m24 < beb300-m3 ]
-wiki-publisher-no-license-m23.diff
-[ swextFixes >= dev300-m24 >= beb300-m3 ]
+[ swextFixes ]
 wiki-publisher-no-license.diff
 
-[ swextFixes > dev300-m21 <= dev300-m25 < beb300-m0 ]
-build-java-target-swext-m25.diff
-
-[ swextFixes > dev300-m25 < beb300-m0 ]
 build-java-target-swext.diff
 
-[ Linux32OnlySwextFixes >= dev300-m22 < beb300-m0 ]
+[ Linux32OnlySwextFixes ]
 # originally part of build-java-target.diff, but had to split out
 # because of CR problems
 build-java-target-codec-patch-with-crs.diff, pmladek
 
-[ Win32OnlySwextFixes >= dev300-m22 < beb300-m0 ]
+[ Win32OnlySwextFixes ]
 # originally part of build-java-target.diff, but had to split out
 # because of CR problems
 build-java-target-codec-patch-without-crs.diff, pmladek
@@ -449,20 +395,10 @@
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
 build-ant-1.6.diff, i#90830, pmladek
 
-[ Fixes < dev300-m24 < beb300-m3 ]
-# let sd accept uri-list drop, n#183719
-sd-accept-uri-list-drop.diff, n#183719, rodo
-
 [ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 
-[ Fixes < dev300-m23 ]
-# 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
-
-[ Fixes ]
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
 
@@ -492,11 +428,9 @@
 # lang code instead of en-US
 helpcontent2-auxiliary-cfg.diff, pmladek
 
-[ Fixes < dev300-m23 ]
 # Better Hungarian font setting
 helpcontent2-hungarian-fonts.diff, i#71452, n#244488, pmladek
 
-[ Fixes ]
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek
 
@@ -514,11 +448,9 @@
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
 
-[ Fixes < dev300-m24 ]
 # When there's no scheme in the hyperlink, it's probably a file
 sw-hyperlinks-without-scheme.diff, n#376389, i#91105, jholesov
 
-[ Fixes ]
 # handle hyperlinks to files better
 sw-hyperlinks-relative.diff, n#405712, i#91522, jholesov
 
@@ -549,25 +481,14 @@
 # prevent some array out of bounds in ww8 exporter
 sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, i#91396, fridrich
 
-[ Fixes < dev300-m23 ]
-# don't use freed memory in slidesorter
-sd-slidesorter-dead-ptr.diff, i#88002, thorsten
-
-# fix import of MSO Userform & Frame ( presence of scroll-top & scroll-left )
-# screws things up
-userform-scrollleftandtop.diff, i#87007, noelpwer
-
-[ Fixes ]
 # adds fixes for printing transparent content
 vcl-transparent-printing.diff, i#88536, thorsten
 
 localize-pl-cygwin-paths.diff, tml
 
-[ Fixes < dev300-m24 ]
 # init a bool member in SbUnoObject's ctor initializer.
 basic-initialize-member.diff, i#88930, kohei
 
-[ Fixes ]
 # import/export form control's visibility
 form-control-visibility.diff, i#88878, jianhua
 
@@ -588,21 +509,6 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
-[ Fixes < dev300-m24 < beb300-m3 ]
-# ensure that ant can do regexp matches.
-ant-regexp-test.diff, i#89383, michael
-
-[ Fixes < dev300-m0 >= beb300-m2 ]
-# fix installation with --without-myspell-dicts
-scp2-without-myspell-dicts.diff, i#91319, rengelha
-
-[ Fixes < dev300-m22 >= beb300-m1 ]
-# explicitely convert cwsid to integer
-# otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0
-solenv-cwsid.diff, i#90853, pmladek
-# init all members in VirDev's ctor
-vcl-virdev-missing-initialisation.diff, i#88535, thorsten
-
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.
@@ -638,14 +544,9 @@
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
-[ QuickStarter >= dev300-m26 < beb300-m0 ]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
-[ QuickStarter < dev300-m26 ]
-# External splash screen implementation / 2nd time accelerator
-unxsplash-rework-m25.diff, i#60696, michael/jholesov
 
-[ QuickStarter ]
 # FIXME: unxsplash-rework needs this function which was removed in m13
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
@@ -668,19 +569,12 @@
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 
 
-[ CalcFixes < dev300-m23 ]
-# Replace usability numb Zoom dialog with a Combo Box
-# FIXME: this conflicts with Sun's duplication of this work,
-# eg. print preview
-zoom-combobox-m22.diff, michael
-
-[ CalcFixes >= dev300-m23 < beb300-m0 ]
+[ CalcFixes ]
 # Replace usability numb Zoom dialog with a Combo Box
 # FIXME: this conflicts with Sun's duplication of this work,
 # eg. print preview
 zoom-combobox.diff, michael
 
-[ CalcFixes ]
 # make some symbols from sc visible when compiling with gcc4, necessary since m121
 gcc4-visibility-sc.diff, i#53261, pmladek
 # Fix for b.x.c 62193
@@ -775,12 +669,7 @@
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.  Also to support encryption on Excel file export.
-[ CalcFixes >= dev300-m25 ]
 cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei  
-[ CalcFixes < dev300-m25 ]
-cws-scsheetprotection02-sc-m21.diff,   i#60305, i#71468, i#84766, kohei  
-
-[ CalcFixes ]
 cws-scsheetprotection02-windowsfix.diff, noelp
 cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei  
 cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei   
@@ -818,12 +707,6 @@
 # Dynyamically resize filtered range when new data rows are present.
 sc-dbrange-dynamic-resize.diff, n#352662, i#85305, kohei
 
-[ CalcFixes < dev300-m23 ]
-# When importing an Excel file, skip un-supported pivot charts altogether
-# instead of importing them as an empty chart object.
-sc-skip-pivot-charts.diff, n#355300, i#85658, kohei
-
-[ CalcFixes ]
 # Have cell background paint over the gridlines.
 sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
 
@@ -926,12 +809,6 @@
 # Fix the system default fpicker
 default-system-fpicker.diff, michael
 
-[ NotDebian < dev300-m28 ]
-
-# don't display File->Wizards-> install dictionaries/fonts -
-# makes no sense on Linux n#74249
-default-no-install-wizards.diff, michael
-
 [ NotDebian ]
 
 # Disable the printer properties which are unused#583
@@ -1048,27 +925,13 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
-[ BuildBits >= dev300-m25 < beb300-m0 ]
+[ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml
-[ BuildBits < dev300-m25 ]
-novell-win32-agfa-monotype-fonts-m24.diff, tml
 
-[ BuildBits <= dev300-m21 ]
-# 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-m21.diff, pmladek
-
-[ BuildBits >= dev300-m22 < dev300-m26 < beb300-m0 ]
-# 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-m25.diff, pmladek
-
-[ BuildBits >= dev300-m26 < beb300-m0 ]
 # 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 ]
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
@@ -1090,14 +953,6 @@
 # even worse, the direcotry had the rights 444
 installer-get-path-correctly.diff, pmladek
 
-[ BuildBits < dev300-m23 < beb300-m1 ]
-# fix reportdesign build
-buildfix-system-jfreereport.diff, i#90952, rengelha
-
-[ BuildBits >= dev300-m22 < dev300-m24 < beb300-m0 ]
-# system lucene
-system-lucene.diff
-
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei
@@ -1176,11 +1031,6 @@
 # should use --with-system-openssl
 default-openssl-no-idea-alg.diff, pmladek
 
-[ DefaultSettings < dev300-m24 < beb300-m3 ]
-# load and save also odf documents in flat xml format as opposed to the
-# compressed ones (conforming to the odf specifications)
-odf-flatxml-import-export-m23.diff
-[ DefaultSettings >= dev300-m24 >= beb300-m3 ]
 # load and save also odf documents in flat xml format as opposed to the
 # compressed ones (conforming to the odf specifications)
 odf-flatxml-import-export.diff
@@ -1215,20 +1065,12 @@
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
-[ BuildBits < dev300-m25 ]
-# changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
-# of files does not conflict with the main package, i#64802
-sdk-gid-module-name-m24.diff, pmladek, i#64802
-[ BuildBits >= dev300-m25 < beb300-m0 ]
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
 
 # do not pack any potential .orig files with ppds
-[ CWSBackports >= dev300-m22 < beb300-m0 ]
 psprint_config-no-orig.diff, jholesov
-[ CWSBackports < dev300-m22 >= beb300-m1 ]
-psprint_config-no-orig-m21.diff, jholesov
 
 [ DebianOnly ]
 seamonkey-is-iceape.diff
@@ -1325,28 +1167,15 @@
 # enable vcl to load bitmaps when height it negative
 vcl-bitmap2-negative-height.diff
 
-[ VCL < dev300-m22 >= beb300-m1 ]
-# fixes non-usage of xinerama on 64bit
-vcl-xinerama-64bit-fix.diff, n#359955, rodo
-
 [ SystemBits ]
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
 
-[ Icons < dev300-m24 ]
-# Make insensitive toolbar icons look far nicer
-gui-insensitive.diff, i#35555, michael
-
 [ TangoIcons ]
 # default to large icons in the toolbar
 gui-toolbox-large-icons.diff, jholesov
 
-[ TangoIcons < dev300-m24 ]
-# use it by default under Win32
-tango-icons-default-w32-m23.diff, n#254855, pmladek
-
-[ TangoIcons >= dev300-m24 < beb300-m0 ]
 # use it by default under Win32
 tango-icons-default-w32.diff, n#254855, pmladek
 
@@ -1399,10 +1228,6 @@
 # Let the KDE and Gtk+ fpickers build and install FIXME IZ number
 fpicker-common-scp2.diff, jholesov
 
-[ Fpickers < dev300-m23 ]
-# Missing accel in Gtk+ fpicker. n#354447
-fpicker-gtk-accel-n354447.diff, n#354447, hub
-
 [ AddressBooks ]
 
 # Evolution should also be default database(n#66217).
@@ -1410,10 +1235,6 @@
 # Mailmerge column mapping by default (n#73627)
 default-evo-column-mapping.diff, michael
 
-[ AddressBooks < dev300-m24]
-# NB. when this cws goes up-stream we need to enable this
-default-evo2-ab-m23.diff, michael
-[ AddressBooks >= dev300-m24 < beb300-m0 ]
 # NB. when this cws goes up-stream we need to enable this
 default-evo2-ab.diff, michael
 
@@ -1513,20 +1334,11 @@
 cli_ure-source-bootstrap-managed_bootstrap-cs.diff
 cli_ure-source-bootstrap-native_glue-cxx.diff
 
-[ Mono >= dev300-m22 < beb300-m0 ]
 mono-testtools.diff
-[ Mono < dev300-m22 ]
-mono-testtools-m21.diff
 
 # The build
-[ Mono >= dev300-m22 < dev300-m26 < beb300-m0 ]
-mono-scp2-m25.diff, rodo
-[ Mono >= dev300-m26 < dev300-m28 < beb300-m0 ]
-mono-scp2-m27.diff, rodo
-[ Mono >= dev300-m28 < beb300-m0 ]
 mono-scp2.diff, rodo
 
-[ Mono >= dev300-m22 < beb300-m0 ]
 cli_ure-source-bootstrap-makefile-mk.diff, rodo
 cli_ure-mono-bridge.diff, rodo
 mono-build.diff, rodo
@@ -1539,25 +1351,8 @@
 buildfix-climaker-disabled.diff, rodo
 mono-bootstrap-config-and-policy.diff, rodo
 
-[ Mono >= dev300-m22 < dev300-m26 < beb300-m0 ]
-buildfix-use-climaker-in-unoil-m25.diff, rodo
-[ Mono >= dev300-m26 < beb300-m0 ]
 buildfix-use-climaker-in-unoil.diff, rodo
 
-[ Mono < dev300-m22 >= beb300-m1 ]
-mono-scp2-m21.diff
-cli_ure-source-bootstrap-makefile-mk-m21.diff, rodo
-cli_ure-mono-bridge-m21.diff, rodo
-mono-build-m21.diff, rodo
-build-mono-link-m21.diff, jholesov
-mono-build-keyfile-m21.diff, rodo
-mono-climaker-m21.diff, rodo
-climaker-csharp-win-m21.diff, rodo
-buildfix-climaker-disabled-m21.diff, rodo
-
-[ Mono ]
-SectionOwner => rodo
-
 cli_ure-prj-build-lst.diff
 
 # climaker rewritten in C#
@@ -1784,12 +1579,6 @@
 
 buildfix-oox-depends-on-unotools.diff
 
-[ OOXML < dev300-m26 ]
-# added the OOXML-related MIME types to the upstream desktop files
-# needed for the universal GO-OO build
-sysui-desktop-ooxml.diff, pmladek
-
-[ OOXML ]
 # fix build dependencies
 #FIXME still necessary? oox-token-deps.diff, pmladek
 
@@ -1801,11 +1590,6 @@
 
 sc-formula-syntax-ui.diff, n#358558, i#72191, kohei
 
-[ CalcFixes < dev300-m24 ]
-# allow special characters in a sheet name.
-sc-sheet-name-special-chars.diff, i#6087, kohei
-
-[ CalcFixes ]
 # Toggle gridline display per sheet.
 sc-sheet-gridline-toggle.diff, i#14893, kohei
 
@@ -1833,9 +1617,6 @@
 # to xls.
 chart-subtitle-xls-export.diff, i#92357, kohei
 
-[ CalcFixes < dev300-m27 ]
-calc-xlsx-import-crash-free-cache.diff, n#413456, kohei
-
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,
@@ -1846,13 +1627,7 @@
 [ PostgreSQL ]
 sdbc-postgresql.diff
 sdbc-postgresql-build-lst.diff
-
-[ PostgreSQL < dev300-m23 ]
-sdbc-postgresql-config_office-m22.diff
-[ PostgreSQL >= dev300-m23 < beb300-m0 ]
 sdbc-postgresql-config_office.diff
-
-[ PostgreSQL ]
 connectivity-workben-postgresql.diff
 gcc-4.3-postgresql.diff
 
@@ -1895,27 +1670,11 @@
 #debian-gccXXXXX.solenv.javaregistration.diff
 
 
-[ OpenGLTransitions <= dev300-m21 ]
-transogl-transitions-slideshow-m21.diff
-
-[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
-transogl-transitions-slideshow.diff
-
 [ OpenGLTransitions ]
+transogl-transitions-slideshow.diff
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
 transogl-transitions-scp2.diff
-
-[ OpenGLTransitions <= dev300-m21 ]
-transogl-more-transitions-m21.diff
-transogl-vsync-m21.diff
-transogl-shader-transitions-m21.diff
-transogl-mesa-fallback-m21.diff
-transogl-shader-transitions-1-m21.diff
-transogl-dispose-fix-m21.diff
-transogl-sync-fix-m21.diff
-
-[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
 transogl-more-transitions.diff
 transogl-vsync.diff
 transogl-shader-transitions.diff
@@ -1924,11 +1683,7 @@
 transogl-dispose-fix.diff
 transogl-sync-fix.diff
 transogl-transitions-newsflash.diff, thorsten
-
-[ OpenGLTransitions ]
 transogl-detect-fix.diff
-
-[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
 transogl-buildfix.diff
 
 [ Experimental ]
@@ -1939,11 +1694,7 @@
 [ DebianSidOnly ]
 static-libs-use-_pic.diff, rengelha
 # link dynamically with liblpsolve55.so
-
-[ DebianSidOnly >= dev300-m22 < beb300-m0 ]
 system-lpsolve-rpath.diff, rengelha
-[ DebianSidOnly < dev300-m22 ]
-system-lpsolve-rpath-m21.diff, rengelha
 
 [ UbuntuOnly ]
 human-icons-add.diff, mklose
@@ -1998,10 +1749,7 @@
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
 
-[ FedoraLinuxOnlyFixes <= dev300-m21 ]
-ooo64508.vcl.honourfontconfighinting-m21.diff
-
-[ FedoraLinuxOnlyFixes >= dev300-m22 < beb300-m0 ]
+[ FedoraLinuxOnlyFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
 
 [ FedoraCommonFixes ]
@@ -2017,10 +1765,6 @@
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
 
-[ CairoFonts < dev300-m28 ]
-vcl-cairofont-multiscreen-fix.diff, thorsten
-vcl-cairofont-transform-fix.diff, i#90037, caolan
-
 [ GStreamer ]
 SectionOwner => rodo
 SectionIssue => i#68717
@@ -2060,16 +1804,11 @@
 # warning: comparison with string literal results in unspecified results
 warning-string-comparsion-sw.diff, i#86880, i#86772, pmladek
 
-[ Shrink > dev300-m20 ]
+[ Shrink ]
 
 # don't export trivial strings in svtools, increases linking time, bloats size
 svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
 
-[ Shrink <= dev300-m20 ]
-
-# don't export trivial strings in svtools, increases linking time, bloats size
-svtools-dont-extern-sRTF-sHTML-m20.diff, i#86772, jholesov
-
 
 [ BFShrink ]
 # don't export trivial strings in svtools, increases linking time, bloats size
@@ -2092,9 +1831,6 @@
 # fixes some nastiness with viewbox
 svg-import-viewbox-fix.diff, thorsten
 
-[ SVGImport < dev300-m22 >= beb300-m1 ]
-svg-import-basegfx.diff, thorsten
-
 [ SharedWorksheets ]
 SectionOwner => jholesov
 # Implementation of shared worksheets
@@ -2138,10 +1874,6 @@
 #FIXME src680: in store-install.diff, instsetoo_native part was commented out
 store-install.diff
 
-[ Store <= dev300-m21 ]
-store-registry-m21.diff
-
-[ Store >= dev300-m22 < beb300-m0 ]
 store-registry.diff
 
 [ Store ]
@@ -2160,13 +1892,7 @@
 
 cws-layoutdialogs-offapi.diff
 cws-layoutdialogs-scp2.diff
-
-[ LayoutDialogs >= dev300-m26 < dev300-m29 < beb300-m0 ]
 cws-layoutdialogs-svx.diff
-[ LayoutDialogs < dev300-m26 ]
-cws-layoutdialogs-svx-m25.diff
-
-[ LayoutDialogs < dev300-m29 ]
 cws-layoutdialogs-sw.diff
 cws-layoutdialogs-toolkit.diff
 cws-layoutdialogs-toolkit-remove-paragraph.diff
@@ -2224,10 +1950,6 @@
 # FIXME: file more issuses when ready
 
 # teach build.pl what to do with prj/tests.lst's
-[ Store <= dev300-m26 ]
-unittesting-build-pl-m26.diff
-
-[ Store > dev300-m26 ]
 unittesting-build-pl.diff
 
 # the tests
@@ -2249,17 +1971,7 @@
 unittesting-embeddedobj.diff
 unittesting-extensions.diff
 unittesting-filter.diff
-
-[ UnitTesting > dev300-m24 < beb300-m0 ]
-
 unittesting-forms.diff
-
-[ UnitTesting <= dev300-m24 >= beb300-m0 ]
-
-unittesting-forms-m24.diff
-
-[ UnitTesting ]
-
 unittesting-fpicker.diff
 unittesting-framework.diff
 unittesting-chart2.diff
@@ -2293,14 +2005,7 @@
 unittesting-svx.diff
 unittesting-sw.diff
 unittesting-testshl2.diff
-
-[ UnitTesting <= dev300-m21 ]
-unittesting-testtools-m21.diff
-
-[ UnitTesting >= dev300-m22 < beb300-m0 ]
 unittesting-testtools.diff
-
-[ UnitTesting ]
 unittesting-toolkit.diff
 unittesting-tools.diff
 unittesting-ucbhelper.diff
@@ -2329,10 +2034,7 @@
 # disable automatic spellchecking by default
 reduced-disable-auto-spellcheck.diff
 
-[ Features <= dev300-m26]
-novell-win32-odma-m26.diff, i#6885, i#32741, tml
-
-[ Features > dev300-m27]
+[ Features ]
 novell-win32-odma.diff, i#6885, i#32741, tml
 
 [ VOSremoval ]
@@ -2399,60 +2101,28 @@
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseSystemJFreeReport >= dev300-m22 < beb300-m0 ]
+[ DebianBaseSystemJFreeReport  ]
 debian-system-jfreereport.diff
-[ DebianBaseSystemJFreeReport < dev300-m22 ]
-debian-system-jfreereport-m21.diff
 [ DebianBaseSystemApacheCommons ]
 debian-system-apache-commons.diff
-
-# FIXME: needs new stuff for redland
-[ DebianBaseOnly >= dev300-m25 < beb300-m0]
-configures-explicit-arch.diff
-[ DebianBaseOnly < dev300-m25 ]
-configures-explicit-arch-m24.diff
-
-[ DebianBaseSystemLucene >= dev300-m22 ]
+[ DebianBaseSystemLucene ]
 debian-system-lucene.diff
 
-[ Fixes < dev300-m22 ]
-cairocanvas-image-borders.diff, n#340142, rodo
+[ DebianBaseOnly ]
+configures-explicit-arch.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
 
-[ EMFPlus < dev300-m22 >= beb300-m1 ]
-SectionOwner => rodo
-emf+-canvas.diff
-emf+-cppcanvas.diff
-emf+-cppcanvas-polyaction.diff
-cairocanvas-alpha-pixmap-rewrite.diff, rodo
-
 [ EMFPlus ]
 SectionOwner => rodo
 emf+-cppcanvas-renderer.diff
-
-[ EMFPlus < dev300-m22 >= beb300-m1 ]
-emf+-cppcanvas-emfplus-m21.diff
-emf+-offapi.diff
-
-[ EMFPlus >= dev300-m22 ]
 emf+-cppcanvas-emfplus.diff
-
-[ EMFPlus ]
 emf+-offapi-renderer.diff
 emf+-vcl-bitmap.diff
-
-[ EMFPlus < dev300-m22 >= beb300-m1 ]
-emf+-vcl-renderer-m21.diff
-emf+-dxcanvas.diff
-
-[ EMFPlus >= dev300-m22 ]
 emf+-vcl-renderer.diff
-
-[ EMFPlus ]
 emf+-svtools.diff
 emf+-scp2-renderer.diff
 emf+-crash-fix.diff, n#361534, rodo
@@ -2466,11 +2136,6 @@
 linkwarn-dlg-in-apps.diff, n#348149, thorsten
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten
 
-[ LinkWarningDlg <= dev300-m26 ]
-linkwarn-svtools-miscopts-bits-m26.diff
-[ LinkWarningDlg >= dev300-m28 ]
-linkwarn-svtools-miscopts-bits-m26.diff
-[ LinkWarningDlg == dev300-m27 ]
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 
 [ LinkWarningDlg ]
@@ -2521,14 +2186,8 @@
 scp2_directory_accessories.diff
 scp2_makefile_accessories.diff
 scp2_accessories_templates.diff
-
-[ OxygenOfficeExtras <= dev300-m26]
-scp2_accessories_templates_makefile-m26.diff
-
-[ OxygenOfficeExtras > dev300-m26]
 scp2_accessories_templates_makefile.diff
 
-[ OxygenOfficeExtras ]
 # Splitting new contents into new packages
 premium-splitted-language-packages.diff
 premium-splitted-language-pack-solenv.diff
@@ -2578,11 +2237,6 @@
 [ Fixes ]
 sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
 
-[ Fixes < dev300-m23 ]
-# Fix pasting with middle button in Calc
-sc-middle-button-should-paste-text.diff, n#282767, i#86734, jholesov
-
-
 [ Glib2 ]
 external-package-glib2.diff
 scp2-package-glib2.diff
@@ -2595,9 +2249,6 @@
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 
-[ Fixes < dev300-m22 ]
-cairocanvas-fix-image-cache.diff, rodo
-
 [ Fixes ]
 sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
 sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
@@ -2633,11 +2284,7 @@
 lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
 # and don't expose unnecessary symbols
 # TODO file up-stream
-[ Fixes >= dev300-m22 < beb300-m0 ]
 lockfile-less-symbols.diff, jholesov
-[ Fixes < dev300-m22 >= beb300-m1 ]
-lockfile-less-symbols-m21.diff, jholesov
-vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
 
 [ InternalMesaHeaders ]
 internal-mesa-headers-config_office.diff, fridrich
@@ -2645,30 +2292,16 @@
 internal-mesa-headers-mesa.diff, fridrich
 
 
-[ Lockdown < dev300-m26 ]
-# Disable UI [toolbars, menus] customization
-ui-desktop-integration-m25.diff, michael
-[ Lockdown >= dev300-m26 < beb300-m0 ]
+[ Lockdown ]
 # Disable UI [toolbars, menus] customization
 ui-desktop-integration.diff, michael
 
 
-[ InternalCairo <= dev300-m21 ]
-cairo-prj-build-lst-m21.diff
-cairo-prj-d-lst-m21.diff
-
-[ InternalCairo >= dev300-m22 < dev300-m26 < beb300-m0 ]
+[ InternalCairo ]
 cairo-prj-build-lst.diff
-
-[ InternalCairo >= dev300-m22 < beb300-m0 ]
 cairo-prj-d-lst.diff
-
-[ InternalCairo ]
 cairo-cairo-1-4-10-diff.diff
 cairo-makefile-mk.diff
-[ InternalCairo < dev300-m22 >= beb300-m1 ]
-cairo-canvas-cairo.diff
-cairo-config_office-configure-in.diff
 
 
 [ WWInProgress ]
@@ -2686,22 +2319,12 @@
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
 
-[ Fixes <= dev300-m21 ]
-vcl-linking-randr-m21.diff, i#89718, n#398244, thorsten
-
-[ Fixes >= dev300-m22 < beb300-m0 ]
 vcl-linking-randr.diff, i#90809, n#398244, thorsten
 
-[ Fixes <= dev300-m22 ]
-vcl-png-import-fix.diff, n#397128, i#90913, thorsten
-
-[ Fixes ]
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 
-[ Fixes < dev300-m24 ]
 slideshow-animated-bmp-fix.diff, i#73914, jlcheng
 
-[ Fixes ]
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
 config_office-msvc-compat.diff, thorsten
@@ -2715,10 +2338,6 @@
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 
-[ Fixes < dev300-m28 ]
-tools-resmgr-expansion-fix.diff, i#90178, caolan
-
-[ Fixes >= dev300-m23 ]
 unoxml-boost-workaround.diff, thorsten
 
 [ LocalizeFixes ]



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