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

[michael svn gnome org]

Author: michael
Date: Fri Jul  4 10:51:57 2008
New Revision: 13065
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13065&view=rev

Log:
2008-07-04  Michael Meeks  <michael meeks novell com>

        * patches/dev300/svx-import-basegfx.diff,
        * patches/dev300/cairo-canvas-cairo.diff,
        * patches/dev300/apply: drop for m22.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul  4 10:51:57 2008
@@ -1843,14 +1843,14 @@
 # Work in progress, but fairly usable already
 svg-import-filter.diff, thorsten
 
-svg-import-basegfx.diff, thorsten
-
 # like svg-import-filter.diff, but adds a graphic filter for SVG
 svg-import-filter-gfxfilter.diff, thorsten
 
 # standalone converter binary - for testing, etc.
 # svg-import-standalone-conv.diff
 
+[ SVGImport < dev300-m22 >= beb300-m1 ]
+svg-import-basegfx.diff, thorsten
 
 [ SharedWorksheets ]
 SectionOwner => jholesov
@@ -2257,7 +2257,6 @@
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 cairocanvas-fix-image-cache.diff, rodo
-vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
 
 sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
 sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
@@ -2297,6 +2296,7 @@
 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
@@ -2314,8 +2314,8 @@
 cairo-makefile-mk.diff
 cairo-prj-build-lst.diff
 cairo-prj-d-lst.diff
-cairo-canvas-cairo.diff
 [ InternalCairo < dev300-m22 >= beb300-m1 ]
+cairo-canvas-cairo.diff
 cairo-config_office-configure-in.diff