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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun May 11 21:27:43 2008
New Revision: 12515
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12515&view=rev

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

        * patches/dev300/apply,
          patches/dev300/reportdesigner-no-license-m11.diff,
          patches/dev300/reportdesigner-no-license.diff: first part of
          dev300-m12 support


Added:
   trunk/patches/dev300/reportdesigner-no-license-m11.diff
      - copied unchanged from r12514, /trunk/patches/dev300/reportdesigner-no-license.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/reportdesigner-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun May 11 21:27:43 2008
@@ -216,10 +216,12 @@
 # until the internal compiler error is fixed
 # buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
 
+[ TemporaryHacks < dev300-m12 ]
 #Fix: no autocorrection when "!" (exclamation mark) was typed
 #This is timar's patch, will be fixed in 3.0 in the stream
 i86580-autocorr-exclamation.diff, i#86580, szalaik
 
+[ TemporaryHacks ]
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 
@@ -337,13 +339,15 @@
 redirect-extensions.diff
 
 # no bogus license question when registering these extensions
+[ FixesNotForUpstream < dev300-m12 ]
+reportdesigner-no-license-m11.diff
+[ FixesNotForUpstream >= dev300-m12 ]
 reportdesigner-no-license.diff
+[ FixesNotForUpstream ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
-
 [ FixesNotForUpstream < dev300-m11 ]
 pdfimport-no-license-m10.diff
-
 [ FixesNotForUpstream >= dev300-m11 ]
 pdfimport-no-license.diff
 

Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff	(original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff	Sun May 11 21:27:43 2008
@@ -57,7 +57,7 @@
 @@ -1,5 +1,3 @@
 -    </simple-license>
 -  </registration>
-   <version value="1.0.2"/>
+   <version value="1.0.3"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>
 Index: util/pre.xml