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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Mar  4 21:40:58 2009
New Revision: 15465
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15465&view=rev

Log:
2009-03-04  Rene Engelhard  <rene debian org>

        * bin/unpack: adapt CORE_PKGS for new tarball name names
        * patches/dev300/redirect-extensions.diff,
          patches/dev300/redirect-extensions-m3.diff,
          patches/dev300/apply: first ooo310-m4 things


Added:
   trunk/patches/dev300/redirect-extensions-m3.diff
      - copied unchanged from r15463, /trunk/patches/dev300/redirect-extensions.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/redirect-extensions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar  4 21:40:58 2009
@@ -209,9 +209,11 @@
 #for selection delete crash
 selection-crash-svx-svdmrkv.diff, i#76084, jianhua
 
+[ TemporaryHacks < ooo310-m4 ]
 #Fix a crash on linux for the new .doc tables export.
 sw-doc-tables-export-crash.diff, i#98465 cbosdo
 
+[ TemporaryHacks ]
 #Improve the behavior of input field dialog.
 #FIXME sw-input-field-dialog.diff, Zhang Yun
 
@@ -382,7 +384,11 @@
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions-m0.diff 
 
-[ FixesNotForUpstream  > dev300-m41 > ooo310-m0 ]
+[ FixesNotForUpstream <= dev300-m42 <= ooo310-m3 ]
+# re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions-m0.diff 
+
+[ FixesNotForUpstream  > dev300-m42 > ooo310-m3 ]
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 

Modified: trunk/patches/dev300/redirect-extensions.diff
==============================================================================
--- trunk/patches/dev300/redirect-extensions.diff	(original)
+++ trunk/patches/dev300/redirect-extensions.diff	Wed Mar  4 21:40:58 2009
@@ -16,8 +16,8 @@
          // open such URL in a browser
 Index: officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
 ===================================================================
---- reportdesign/registry/schema/org/openoffice/Office/ReportDesign.xcs
-+++ reportdesign/registry/schema/org/openoffice/Office/ReportDesign.xcs
+--- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
++++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
 @@ -55,7 +55,7 @@
                      <author>LLA</author>
                      <desc>Direct download URL to the Sun(tm) Report Builder extension.</desc>