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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 21:53:46 2008
New Revision: 14961
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14961&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/reportdesigner-no-license-m36.diff:
	* patches/dev300/reportdesigner-no-license.diff:
	* patches/dev300/apply: re-enabled this patch; was formerly FIXME_m37.



Added:
   trunk/patches/dev300/reportdesigner-no-license-m36.diff
      - copied unchanged from r14946, /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	Mon Dec 29 21:53:46 2008
@@ -373,7 +373,7 @@
 reportdesigner-no-license.diff
 
 [ ExtensionFixes > dev300-m36 ]
-#FIXME_m37 reportdesigner-no-license.diff
+reportdesigner-no-license.diff
 
 [ ExtensionFixes ]
 presentation-minimizer-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	Mon Dec 29 21:53:46 2008
@@ -1,19 +1,16 @@
-Index: util/description.xml
-===================================================================
-RCS file: /cvs/dba/reportdesign/util/description.xml,v
-retrieving revision 1.4
-diff -u -u -r1.4 description.xml
---- reportdesign/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
-+++ reportdesign/util/description.xml	16 Jun 2008 15:02:24 -0000
+diff --git reportdesign/util/description.xml reportdesign/util/description.xml
+index 2ed058b..5ad0a26 100644
+--- reportdesign/util/description.xml
++++ reportdesign/util/description.xml
 @@ -6,11 +6,6 @@
      <name lang="en-US">Sunâ Report Builder</name>
      <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
    </display-name>
 -  <registration>
--    <simple-license accept-by="admin" default-license-id="en-US" >
+-    <simple-license accept-by="admin" default-license-id="lic-en-US" >
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -    </simple-license>
 -  </registration>
-   <version value="1.0.6"/>
+   <version value="#VERSION#"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>