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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 28 16:46:28 2009
New Revision: 15215
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15215&view=rev

Log:
2009-01-28  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/reportdesigner-no-license.diff,
          patches/dev300/reportdesigner-no-license-m38.diff,
          patches/dev300/presenterscreen-no-license.diff,
          patches/dev300/presenterscreen-no-license-m39.diff: m4


Added:
   trunk/patches/dev300/presenterscreen-no-license-m39.diff   (props changed)
      - copied unchanged from r15214, /trunk/patches/dev300/presenterscreen-no-license.diff
   trunk/patches/dev300/reportdesign-mention-package-m38.diff   (props changed)
      - copied unchanged from r15210, /trunk/patches/dev300/reportdesign-mention-package.diff
   trunk/patches/dev300/reportdesigner-no-license-m38.diff
      - copied unchanged from r15214, /trunk/patches/dev300/reportdesigner-no-license.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/presenterscreen-no-license.diff
   trunk/patches/dev300/reportdesigner-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 16:46:28 2009
@@ -422,14 +422,22 @@
 #solenv-no-extension-license.diff
 
 [ ExtensionFixes <= dev300-m36 ]
-reportdesigner-no-license.diff
+reportdesigner-no-license-m36.diff
+
+[ ExtensionFixes > dev300-m36 < dev300-m38 ]
+reportdesigner-no-license-m38.diff
 
-[ ExtensionFixes > dev300-m36 ]
+[ ExtensionFixes >= dev300-m38 ]
 reportdesigner-no-license.diff
 
+[ ExtensionFixes < dev300-m40 ]
+presenterscreen-no-license-m39.diff
+
+[ ExtensionFixes >= dev300-m40 ]
+presenterscreen-no-license.diff
+
 [ ExtensionFixes ]
 presentation-minimizer-no-license.diff
-presenterscreen-no-license.diff
 # 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
 

Modified: trunk/patches/dev300/presenterscreen-no-license.diff
==============================================================================
--- trunk/patches/dev300/presenterscreen-no-license.diff	(original)
+++ trunk/patches/dev300/presenterscreen-no-license.diff	Wed Jan 28 16:46:28 2009
@@ -15,7 +15,7 @@
 -    </simple-license>
 -  </registration>
 -
-   <version value="1.0" />
+   <version value="1.0.2" />
  
    <platform value="UPDATED_PLATFORM" />
 Index: makefile.mk

Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff	(original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff	Wed Jan 28 16:46:28 2009
@@ -11,6 +11,6 @@
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -    </simple-license>
 -  </registration>
-   <version value="#VERSION#"/>
+   <version value="1.0.9"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>