ooo-build r14667 - in branches/ooo-build-3-0-1: . patches/dev300 patches/gstreamer patches/vba

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14667 - in branches/ooo-build-3-0-1: . patches/dev300 patches/gstreamer patches/vba
Date: Sun, 30 Nov 2008 16:59:48 +0000 (UTC)
Author: rengelhard
Date: Sun Nov 30 16:59:48 2008
New Revision: 14667
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14667&view=rev

Log:
2008-11-30  Rene Engelhard  <rene debian org>

        * patches/dev300/apply, patches/dev300/*, patches/vba/*,
          patches/gstreamer/*: remove obsolete patches


Added:
   branches/ooo-build-3-0-1/patches/dev300/cws-layoutdialogs-transex3.diff
      - copied unchanged from r14623, /branches/ooo-build-3-0-1/patches/dev300/cws-layoutdialogs-transex3-ooo300.diff
Removed:
   branches/ooo-build-3-0-1/patches/dev300/buildfix-connectivity-evoab2.diff
   branches/ooo-build-3-0-1/patches/dev300/buildfix-enable-reportdesign-check.diff
   branches/ooo-build-3-0-1/patches/dev300/config_office-disable-atl.diff
   branches/ooo-build-3-0-1/patches/dev300/config_office-msvc-compat-m28.diff
   branches/ooo-build-3-0-1/patches/dev300/configures-explicit-arch-m29.diff
   branches/ooo-build-3-0-1/patches/dev300/controls-with-images-import-m4.diff
   branches/ooo-build-3-0-1/patches/dev300/cppuhelper-findsofficepath-realpath-buffer-size.diff
   branches/ooo-build-3-0-1/patches/dev300/cws-layoutdialogs-transex3-ooo300.diff
   branches/ooo-build-3-0-1/patches/dev300/debian-splash.diff
   branches/ooo-build-3-0-1/patches/dev300/desktop-builddep.diff
   branches/ooo-build-3-0-1/patches/dev300/desktop-config-migration-m28.diff
   branches/ooo-build-3-0-1/patches/dev300/dialog-groupname-persist-m4.diff
   branches/ooo-build-3-0-1/patches/dev300/extensions_deliver-m2.diff
   branches/ooo-build-3-0-1/patches/dev300/gcj-workaround-serializer.diff
   branches/ooo-build-3-0-1/patches/dev300/i92072-textgrid-fix.diff
   branches/ooo-build-3-0-1/patches/dev300/lucene-no-java.diff
   branches/ooo-build-3-0-1/patches/dev300/msvs9-temporary-fix-m28.diff
   branches/ooo-build-3-0-1/patches/dev300/novell-win32-agfa-monotype-fonts-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/novell-win32-msi-patchability-m1.diff
   branches/ooo-build-3-0-1/patches/dev300/nsplugin-path-m28.diff
   branches/ooo-build-3-0-1/patches/dev300/officecfg-missing-greek.diff
   branches/ooo-build-3-0-1/patches/dev300/pdfimport-lax-restrictions-m29.diff
   branches/ooo-build-3-0-1/patches/dev300/pdfimport-no-license-m2.diff
   branches/ooo-build-3-0-1/patches/dev300/pdfimport-no-license-m5.diff
   branches/ooo-build-3-0-1/patches/dev300/pdfimport-system-poppler-m29.diff
   branches/ooo-build-3-0-1/patches/dev300/pdfimport-system-poppler-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/piece-desktop-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/redirect-extensions-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/redirect-extensions-m7.diff
   branches/ooo-build-3-0-1/patches/dev300/reportdesign-useless-jfreereport-dep.diff
   branches/ooo-build-3-0-1/patches/dev300/reportdesigner-no-license-m3.diff
   branches/ooo-build-3-0-1/patches/dev300/reportdesigner-no-license-m5.diff
   branches/ooo-build-3-0-1/patches/dev300/sd-builddep.diff
   branches/ooo-build-3-0-1/patches/dev300/stax-saxon-no-java.diff
   branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/uses-vfs-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/vcl-gtk-slideshow-crash.diff
   branches/ooo-build-3-0-1/patches/dev300/vcl-linking-randr.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-mergemodule-pm-m30.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-multi-lang-installer-m28.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-prebuilt-writingaids-zip-m1.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-prebuilt-writingaids-zip-m2.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m1.diff
   branches/ooo-build-3-0-1/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m2.diff
   branches/ooo-build-3-0-1/patches/dev300/xalan-serializer-jar-more.diff
   branches/ooo-build-3-0-1/patches/gstreamer/gstreamer-slideshow-m6.diff
   branches/ooo-build-3-0-1/patches/vba/bytearray-string-fix.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Sun Nov 30 16:59:48 2008
@@ -162,18 +162,11 @@
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
 
-[ TemporaryHacks < dev300-m29 < ooo300-m1  ]
-
-# Detect MSVS9 if available
-msvs9-temporary-fix-m28.diff, i#88945, tml
-
-[ TemporaryHacks >= dev300-m29 >= ooo300-m1  ]
+[ TemporaryHacks ]
 
 # Detect MSVS9 if available
 msvs9-temporary-fix.diff, i#88945, tml
 
-[ TemporaryHacks ]
-
 # fix the smoketest
 smoketest-fix.diff, michael, i#84720
 
@@ -280,9 +273,6 @@
 # insert Chinese forbidden characters at start or end of line into i18npool module
 cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
 
-[ CJK < ooo300-m12 ]
-i92072-textgrid-fix.diff, i#92072, Fong
-
 #[ CJKTemporaryHacks ]
 # the following patch is disabled temporary.
 # default value of tab stop for Chinese version
@@ -328,10 +318,6 @@
 # JDKs too
 buildfix-qadevOOo-java-encoding.diff, brosenk
 
-[ GCJ < ooo300-m2 < dev300-m30 ]
-# Seems that bug #69026 is back
-gcj-workaround-serializer.diff
-
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
 # Make debugging nicer under unix
@@ -342,10 +328,6 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
-[ FixesNotForUpstream < dev300-m31 < ooo300-m5 ]
-# Tell the desktop we support the VFS
-uses-vfs-m30.diff, i#43504, michael
-[ FixesNotForUpstream >= dev300-m31 >= ooo300-m5 ]
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
@@ -353,16 +335,9 @@
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
-[ FixesNotForUpstream <= dev300-m30 <= ooo300-m3 ]
-redirect-extensions-m30.diff
-[ FixesNotForUpstream > dev300-m30 > ooo300-m3 < ooo300-m8 ]
-# re-direct to plugins via http://extensions.go-oo.org/
-redirect-extensions-m7.diff
-[ FixesNotForUpstream >= ooo300-m8 ]
+[ FixesNotForUpstream }
 redirect-extensions.diff
 
-[ BuildBits >= ooo300-m4 < ooo300-m7 ]
-reportdesign-useless-jfreereport-dep.diff
 
 [ FixesNotForUpstream ]
 #upload a new libwpd + fix an exception with condensed paragraphs
@@ -374,33 +349,17 @@
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff
 
-[ FixesNotForUpstream ]
+[ ExtensionFixes ]
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
-[ FixesNotForUpstream < ooo300-m4 ]
-reportdesigner-no-license-m3.diff
-[ FixesNotForUpstream < ooo300-m6 ]
-reportdesigner-no-license-m5.diff
-[ ExtensionFixes >= ooo300-m6 ]
 reportdesigner-no-license.diff
-[ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
 # extensions: fix & unbundle system java
 extensions-system-java.diff, hmth
 # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
 apache-commons-build-fix-invalid-chars.diff, kami
-
-[ FixesNotForUpstream < ooo300-m3 ]
-pdfimport-no-license-m2.diff
-
-[ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
-pdfimport-no-license-m5.diff
-
-[ ExtensionFixes >= ooo300-m6 ]
 pdfimport-no-license.diff
-
-[ ExtensionFixes ]
 wiki-publisher-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 
@@ -414,20 +373,10 @@
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
 build-ant-1.6.diff, i#90830, pmladek
 
-# FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
-[ Fixes >= dev300-m30 >= ooo300-m1 ]
+[ Fixes ]
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
-[ Fixes < dev300-m30 < ooo300-m1 ]
-# more intelligent nsplugin seeking
-nsplugin-path-m28.diff, i#49590, michael
 
-[ Fixes < dev300-m31 < ooo300-m4 ]
-sd-builddep.diff, i#92662, michael
-# fix parallel build in desktop
-desktop-builddep.diff, i#92818, michael
-
-[ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 
@@ -539,10 +488,6 @@
 
 pythonloader-no-DEBUG.diff, i#90653
 
-[ Fixes < dev300-m31 < ooo300-m5 ]
-# fixes the realpath buffer size to avoid crash when detecting soffice path
-cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
-
 [ SELinux ]
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
@@ -589,12 +534,9 @@
 gnome-vfs-late-init.diff, i#84137, jholesov
 
 
-[ QuickStarter <= dev300-m30 <= ooo300-m3 ]
-unxsplash-rework-m30.diff, i#60696, michael/jholesov
-[ QuickStarter > dev300-m30 > ooo300-m3 ]
+[ QuickStarter ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
-[ QuickStarter ]
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
@@ -810,10 +752,6 @@
 # Don't insert drill-down sheet in read-only mode.
 calc-dp-no-drilldown-when-readonly.diff, i#90402, kohei
 
-[ CalcFixes < ooo300-m3 ]
-# Fix a regression on filtering by page field.
-calc-fix-datapilot-date-filter.diff, i#90022, kohei
-
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...
@@ -919,18 +857,11 @@
 # Swap the delete and backspace key bindings but leave the menus alone.
 sc-default-delete-backspace-key.diff, i#17965, kohei
 
-[ CustomUserConfig < dev300-m29 < ooo300-m1 ]
-
-# migrate keyboard shortcuts & reset character set for CSV import dialog.
-desktop-config-migration-m28.diff n#367160, n#376473, kohei
-
-[ CustomUserConfig >= dev300-m29 >= ooo300-m1 ]
+[ CustomUserConfig ]
 
 # migrate keyboard shortcuts & reset character set for CSV import dialog.
 desktop-config-migration.diff n#367160, n#376473, n#421070, kohei/jholesov
 
-[ CustomUserConfig ]
-
 # To make CSV Text Import settings persistent.
 sc-preserve-imp-opts.diff, i#3687, muthusub
 
@@ -957,14 +888,10 @@
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
-[ DebianOnly >= dev300-m20 >= ooo300-m1]
+[ DebianOnly ]
 SectionOwner => rengelha
 # fix the splash progressbar colors
 debian-splash.diff
-[ DebianOnly < dev300-m30 < ooo300-m1 ]
-SectionOwner => rengelha
-# fix the splash progressbar colors
-debian-splash-m29.diff
 
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine
@@ -1025,19 +952,9 @@
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 
-[ BuildBits < dev300-m39 < ooo300-m1 ]
-# fix the --enable-reportdesign configure check to work
-buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-
-# fix evo2 driver build
-buildfix-connectivity-evoab2.diff, i#91025, pmladek
-
-[ BuildBits <= dev300-m30 <= ooo300-m3 ]
-novell-win32-agfa-monotype-fonts-m30.diff, tml
-[ BuildBits > dev300-m30 > ooo300-m3 ]
+[ BuildBits ]
 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
@@ -1072,9 +989,6 @@
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei
-[ Gcc43 < dev300-m30 < ooo300-m3 ]
-buildfix-filter-memcmp-header.diff, i#89803, kohei
-[ Gcc43 >= dev300-m30 >= ooo300-m3 ]
 buildfix-sdext-memcmp-header.diff, i#89803, kohei
 
 [ Java14 ]
@@ -1093,19 +1007,7 @@
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
-[ NovellOnlyWin32 < dev300m30 < ooo300-m2 ]
-SectionOwner => tml
-
-win32-prebuilt-writingaids-zip-m1.diff
-win32-prebuilt-writingaids-zip-scp2-m1.diff
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 < ooo300-m3]
-SectionOwner => tml
-
-win32-prebuilt-writingaids-zip-m2.diff
-win32-prebuilt-writingaids-zip-scp2-m2.diff
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m3 ]
+[ NovellOnlyWin32 ]
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip.diff
@@ -1219,11 +1121,6 @@
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
-[ BuildBits < ooo300-m7 ]
-lucene-no-java.diff
-[ BuildBits < ooo300-m8 ]
-stax-saxon-no-java.diff
-
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
@@ -1257,11 +1154,6 @@
 SectionOwner => arekm
 
 
-[ BuildBits < ooo300-m2 < dev300-m30 ]
-# add automatical detection of serializer.jar into the configure
-# add it to classpath on one more place
-xalan-serializer-jar-more.diff, pmladek
-
 [ BuildBits ]
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 svx-customshapes-NOOPTFILES.diff, martink
@@ -1427,18 +1319,9 @@
 # This enables building scsolver on Win32
 boost-patch.diff, tml
 
-[ Win32Only < dev300-m29 < ooo300-m1 ]
-
-# Multi-language installer stuff
-win32-multi-lang-installer-m28.diff, i#66062, i#88638, i#88639, tml
-
-[ Win32Only >= dev300-m29 >= ooo300-m1 ]
-
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
 
-[ Win32Only ]
-
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
 
@@ -1624,11 +1507,7 @@
 vba-support-properties-inmodules.diff
 controls-with-images-in-document.diff, i#38215, noelpwer 
 # import graphic for image control
-[ VBAObjects < ooo300-m7 ]
-controls-with-images-import-m4.diff, Fong
-[ VBAObjects >= ooo300-m7 ]
 controls-with-images-import.diff, Fong
-[ VBAObjects ]
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for 
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
@@ -1733,10 +1612,6 @@
 vba-worksheet-fix-n403974.diff, n#403974, Fong
 vba-range-find-fix.diff, n#417312, Fong
 
-[ VBAObjects < ooo300-m3 ]
-bytearray-string-fix.diff, i#91911, Fong
-
-
 [ Features ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
@@ -2011,11 +1886,7 @@
 gstreamer-sd.diff
 gstreamer-scp2.diff
 gstreamer-config-office.diff
-[ GStreamer < ooo300-m7 ]
-gstreamer-slideshow-m6.diff
-[ GStreamer >= ooo300-m7 ]
 gstreamer-slideshow.diff
-[ GStreamer ]
 gstreamer-solenv.diff
 gstreamer-svtools-content-types.diff
 gstreamer-avmedia-file-types.diff
@@ -2085,10 +1956,7 @@
 modal-changes-dialog.diff
 shared-worksheets.diff
 
-[ NovellOnlyWin32  < dev300m30 < ooo300-m2 ]
-novell-win32-msi-patchability-m1.diff, tml
-
-[ NovellOnlyWin32  >= dev300m30 >= ooo300-m2 ]
+[ NovellOnlyWin32 ]
 novell-win32-msi-patchability.diff, tml
 
 [ MacOSXOnly ]
@@ -2127,7 +1995,7 @@
 wmf-pattern-brush.diff, n#232232, rodo
 
 
-[ LayoutDialogs < dev300-m29 >= ooo300-m0 ]
+[ LayoutDialogs ]
 SectionOwner => jannieuw
 
 cws-layoutdialogs-offapi.diff
@@ -2136,13 +2004,8 @@
 cws-layoutdialogs-sw.diff
 cws-layoutdialogs-toolkit.diff
 cws-layoutdialogs-toolkit-remove-paragraph.diff
-
-[ LayoutDialogs < dev300-m29 < ooo300-m0 ]
 cws-layoutdialogs-transex3.diff
-[ LayoutDialogs < dev300-m0 >= ooo300-m1 ]
-cws-layoutdialogs-transex3-ooo300.diff
 
-[ LayoutDialogs ]
 # make it build with dev300-m19 - Janneke, please check :-)
 #buildfix-layoutdialogs-transex3.diff
 
@@ -2345,10 +2208,8 @@
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseOnly >= dev300-m30 >= ooo300-m1 ]
+[ DebianBaseOnly ]
 configures-explicit-arch.diff
-[ DebianBaseOnly < dev300-m30 < ooo300-m1 ]
-configures-explicit-arch-m29.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
@@ -2388,15 +2249,10 @@
 scp2_extensions.diff
 extensions_configure.diff
 extensions_packinfo.diff
+extensions_deliver.diff
 # Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
 premium-splitted-language-packages.diff
 
-[ IntegrateExtensions < ooo300-m2 ]
-extensions_deliver-m2.diff
-
-[ IntegrateExtensions >= ooo300-m2 ]
-extensions_deliver.diff
-
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
@@ -2481,10 +2337,7 @@
 # depends on forms-radio-button-group-names.diff,
 xl-import-formradiobutton.diff, noelpwer, i#30823
 # persist the groupname for basic dialogs also
-[ RadioButtons >= ooo300-m7 ]
 dialog-groupname-persist.diff, noelpwer, i#30823
-[ RadioButtons < ooo300-m7 ]
-dialog-groupname-persist-m4.diff, noelpwer, i#30823
 
 [ NovellOnly ]
 #only enable enhanced field work in Novell OOo by default
@@ -2576,29 +2429,16 @@
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
 
-[ Fixes < dev300-m29 < ooo300-m1 ]
-vcl-linking-randr.diff, i#90809, n#398244, thorsten
-vcl-gtk-slideshow-crash.diff, i#91496, thorsten
-
-[ Fixes ]
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
 
-[ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-msvc-compat-m28.diff, i#93332, thorsten
-
-[ Fixes >= dev300-m29 >= ooo300-m1]
 config_office-msvc-compat.diff, i#93332, thorsten
 
 # support msvc 2008 express in oowintool
 buildfix-msvc2008-express.diff, i#93332, jholesov
 
-[ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-disable-atl.diff, thorsten
-
-[ Fixes ]
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan
 cairocanvas-colorspace-fix.diff, thorsten
@@ -2627,9 +2467,6 @@
 
 math-draw-generic-name-localize.diff, i#93909, rengelha
 
-[ LocalizeFixes < ooo300-m8 ] 
-officecfg-missing-greek.diff, i#94317
-
 [ KDE4 ]
 SectionOwner => jholesov
 SectionIssue => i#90618
@@ -2652,19 +2489,14 @@
 libwps-testing.diff
 writerperfect-testing.diff
 
-[ PieceBits <= dev300-m30 <= ooo300-m3 ]
-# zipintro is not kind to us ...
-piece-desktop-m30.diff
-[ PieceBits > dev300-m30 > ooo300-m3 ]
-# 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
+# zipintro is not kind to us ...
+piece-desktop.diff
 piece-target.diff
 piece-rsc.diff
 piece-startup.diff
@@ -2710,12 +2542,8 @@
 # See what breaks if we build with more optimizations
 testing-more-optimizations-ark.diff
 
-[ Fixes <= dev300-m30 <= ooo300-m3 ]
-win32-mergemodule-pm-m30.diff, tml
-[ Fixes > dev300-m30 > ooo300-m3 < ooo300-m6 ]
-win32-mergemodule-pm.diff, tml
-
 [ Fixes ]
+win32-mergemodule-pm.diff, tml
 svtools-update-ole.diff, n#411855, thorsten
 vcl-logical-bmp-size.diff, i#92902, thorsten
 sdext-presenterview-thread-suicide.diff, n#425072, thorsten
@@ -2727,13 +2555,7 @@
 solenv-silent-mac-build.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
 
-[ Fixes < dev300-m30 < ooo300-m3 ]
-pdfimport-system-poppler-m29.diff, i#92920, cmc
-pdfimport-lax-restrictions-m29.diff, i#90468, thorsten
-[ Fixes == dev300-m30 == ooo300-m3 ]
-pdfimport-system-poppler-m30.diff, i#92920, cmc
-pdfimport-lax-restrictions.diff, i#90468, thorsten
-[ ExtensionFixes >= dev300-m31 >= ooo300-m4 ]
+[ ExtensionFixes ]
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]