GNOME.org
 

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

Author: szalaik
Date: Tue Aug 19 06:45:22 2008
New Revision: 13616
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13616&view=rev

Log:
2008-08-19  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/pdfimport-no-license-m2.diff
	* patches/dev300/pdfimport-no-license.diff
	* patches/dev300/extensions_deliver-m2.diff
	* patches/dev300/extensions_deliver.diff

	* patches/dev300/apply:
	PDF Import Extension has moved to sdext module from filter.
	We try to follow it.



Added:
   trunk/patches/dev300/extensions_deliver-m2.diff
   trunk/patches/dev300/pdfimport-no-license-m2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions_deliver.diff
   trunk/patches/dev300/pdfimport-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 19 06:45:22 2008
@@ -366,13 +366,18 @@
 #solenv-no-extension-license.diff
 reportdesigner-no-license.diff
 presentation-minimizer-no-license.diff
-pdfimport-no-license.diff
 presenterscreen-no-license.diff
 offapi-typecheck-whitelist.diff, thorsten
 
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff
 
+[ FixesNotForUpstream < ooo300-m3 ]
+pdfimport-no-license-m2.diff
+
+[ FixesNotForUpstream >= ooo300-m3 ]
+pdfimport-no-license.diff
+
 [ swextFixes ]
 wiki-publisher-no-license.diff
 
@@ -2215,8 +2220,14 @@
 scp2_extensions.diff
 extensions_configure.diff
 extensions_packinfo.diff
+
+[ IntegrateExtensions < ooo300-m2 ]
+extensions_deliver-m2.diff
+
+[ IntegrateExtensions >= ooo300-m2 ]
 extensions_deliver.diff
 
+
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
 i27928-extended-tips-on.diff

Added: trunk/patches/dev300/extensions_deliver-m2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/extensions_deliver-m2.diff	Tue Aug 19 06:45:22 2008
@@ -0,0 +1,26 @@
+--- sdext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
++++ sdext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
+@@ -1,4 +1,6 @@
+ mkdir: %_DEST%\bin%_EXT%\minimizer
+ mkdir: %_DEST%\bin%_EXT%\presenter
++..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
++..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
+ ..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
+ ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
+--- filter/prj/d.lst.orig	2008-07-07 10:56:23.000000000 +0200
++++ filter/prj/d.lst	2008-08-18 10:24:48.000000000 +0200
+@@ -47,5 +47,6 @@
+ ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
+ ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
+ ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
++..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
+ ..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
+ ..\%COMMON_OUTDIR%\bin\fcfg_langpack_*.zip %_DEST%\pck%_EXT%\fcfg_langpack_*.zip
+--- swext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
++++ swext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
+@@ -1,3 +1,4 @@
+ mkdir: %_DEST%\bin%_EXT%\swext
+ ..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt
++..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt
+ ..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip
+

Modified: trunk/patches/dev300/extensions_deliver.diff
==============================================================================
--- trunk/patches/dev300/extensions_deliver.diff	(original)
+++ trunk/patches/dev300/extensions_deliver.diff	Tue Aug 19 06:45:22 2008
@@ -1,21 +1,13 @@
 --- sdext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
 +++ sdext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
-@@ -1,4 +1,6 @@
+@@ -1,4 +1,7 @@
  mkdir: %_DEST%\bin%_EXT%\minimizer
  mkdir: %_DEST%\bin%_EXT%\presenter
 +..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
 +..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
++..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
  ..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
  ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
---- filter/prj/d.lst.orig	2008-07-07 10:56:23.000000000 +0200
-+++ filter/prj/d.lst	2008-08-18 10:24:48.000000000 +0200
-@@ -47,5 +47,6 @@
- ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
- ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
- ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
-+..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
- ..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
- ..\%COMMON_OUTDIR%\bin\fcfg_langpack_*.zip %_DEST%\pck%_EXT%\fcfg_langpack_*.zip
 --- swext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
 +++ swext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
 @@ -1,3 +1,4 @@

Added: trunk/patches/dev300/pdfimport-no-license-m2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pdfimport-no-license-m2.diff	Tue Aug 19 06:45:22 2008
@@ -0,0 +1,20 @@
+Index: source/pdfimport/config/description.xml
+===================================================================
+RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v
+retrieving revision 1.1.4.2
+diff -u -u -r1.1.4.2 description.xml
+--- filter/source/pdfimport/config/description.xml	23 Jan 2008 15:16:33 -0000	1.1.4.2
++++ filter/source/pdfimport/config/description.xml	5 Apr 2008 14:26:25 -0000
+@@ -10,12 +10,6 @@
+         <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+     </dependencies>
+ 
+-    <registration>
+-        <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="0.3" />
+ 
+     <platform value="UPDATED_SUPPORTED_PLATFORM" />

Modified: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-no-license.diff	(original)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Tue Aug 19 06:45:22 2008
@@ -1,10 +1,10 @@
 Index: source/pdfimport/config/description.xml
 ===================================================================
-RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v
+RCS file: /cvs/framework/sdext/source/pdfimport/config/description.xml,v
 retrieving revision 1.1.4.2
 diff -u -u -r1.1.4.2 description.xml
---- filter/source/pdfimport/config/description.xml	23 Jan 2008 15:16:33 -0000	1.1.4.2
-+++ filter/source/pdfimport/config/description.xml	5 Apr 2008 14:26:25 -0000
+--- sdext/source/pdfimport/config/description.xml	23 Jan 2008 15:16:33 -0000	1.1.4.2
++++ sdext/source/pdfimport/config/description.xml	5 Apr 2008 14:26:25 -0000
 @@ -10,12 +10,6 @@
          <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
      </dependencies>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]