GNOME.org
 

ooo-build r13131 - in trunk: . bin patches/dev300

Author: rengelhard
Date: Wed Jul  9 20:31:12 2008
New Revision: 13131
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13131&view=rev

Log:
2008-07-09  Rene Engelhard  <rene debian org>

        * configure.in: support BEB300_mX in addition to beb300-mX
        * bin/generate-bash-completion: add svg
        * patches/dev300/apply,
          patches/dev300/pdfimport-no-license-m23.diff,
          patches/dev300/pdfimport-no-license.diff,
          patches/dev300/odf-flatxml-import-export-m23.diff,
          patches/dev300/odf-flatxml-import-export.diff,
          patches/dev300/wiki-publisher-no-license-m23.diff,
          patches/dev300/wiki-publisher-no-license.diff,
          patches/dev300/presentation-minimizer-no-license-m23.diff,
          patches/dev300/presentation-minimizer-no-license.diff,
          patches/dev300/apply: beb300-m3 update (and parts of dev300-m24)


Added:
   trunk/patches/dev300/odf-flatxml-import-export-m23.diff
      - copied unchanged from r13120, /trunk/patches/dev300/odf-flatxml-import-export.diff
   trunk/patches/dev300/pdfimport-no-license-m23.diff   (props changed)
      - copied unchanged from r13120, /trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/presentation-minimizer-no-license-m23.diff
      - copied unchanged from r13120, /trunk/patches/dev300/presentation-minimizer-no-license.diff
   trunk/patches/dev300/wiki-publisher-no-license-m23.diff   (props changed)
      - copied unchanged from r13120, /trunk/patches/dev300/wiki-publisher-no-license.diff
Modified:
   trunk/ChangeLog
   trunk/bin/generate-bash-completion
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/odf-flatxml-import-export.diff
   trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/presentation-minimizer-no-license.diff
   trunk/patches/dev300/wiki-publisher-no-license.diff

Modified: trunk/bin/generate-bash-completion
==============================================================================
--- trunk/bin/generate-bash-completion	(original)
+++ trunk/bin/generate-bash-completion	Wed Jul  9 20:31:12 2008
@@ -11,7 +11,8 @@
 my @DRAWDOCS=("sxd", "std", "dxf", "emf", "eps", "met", "pct", "sgf", "sgv", "sda",
 	   "sdd", "vor", "svm", "wmf", "bmp", "gif", "jpg", "jpeg", "jfif", "fif",
 	   "jpe", "pcd", "pcx", "pgm", "png", "ppm", "psd", "ras", "tga", "tif",
-	   "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds", "wpg");
+	   "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds", 
+	   "wpg", "svg");
 
 my @IMPRESSDOCS=("sxi", "sti", "ppt", "pps", "pot", "sxd", "sda", "sdd", "sdp",
 	      "vor", "cgm", "odp", "otp", "fodp", "ppsm", "ppsx", "pptm", "pptx",

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jul  9 20:31:12 2008
@@ -437,7 +437,7 @@
    GREP=grep
 fi
 
-if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300|BEB300)'] >/dev/null 2>/dev/null ; then
    APPLY_DIR="$TOOLSDIR/patches/dev300"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul  9 20:31:12 2008
@@ -378,24 +378,32 @@
 [ FixesNotForUpstream < beb300-m1 < dev300-m23 ]
 reportdesigner-no-license-m22.diff
 
-[ FixesNotForUpstream ]
+[ FixesNotForUpstream < dev300-m24 < beb300-m3 ]
+presentation-minimizer-no-license-m23.diff
+pdfimport-no-license-m23.diff
+[ FixesNotForUpstream >= dev300-m24 >= beb300-m3 ]
 presentation-minimizer-no-license.diff
 pdfimport-no-license.diff
+
+[ FixesNotForUpstream ]
 presenterscreen-no-license.diff
 
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff
-[ swextFixes ]
+
+[ swextFixes < dev300-m24 < beb300-m3 ]
+wiki-publisher-no-license-m23.diff
+[ swextFixes >= dev300-m24 >= beb300-m3 ]
 wiki-publisher-no-license.diff
 
+[ Fixes < dev300-m24 < beb300-m3 ]
+# let sd accept uri-list drop, n#183719
+sd-accept-uri-list-drop.diff, n#183719, rodo
 
 [ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 
-# let sd accept uri-list drop, n#183719
-sd-accept-uri-list-drop.diff, n#183719, rodo
-
 # add some shortcuts to Impress + needed fixes. bug n#352330
 sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
 svx-text-move-fix-i59061.diff, i#59061, hub
@@ -946,7 +954,7 @@
 [ BuildBits <= dev300-m21 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
-build-java-target-m21.diff, pmladek
+#build-java-target-m21.diff, pmladek
 
 [ BuildBits >= dev300-m22 < beb300-m0 ]
 # allow to define java target, so the build is usable with the JVM 1.4
@@ -1061,6 +1069,11 @@
 # should use --with-system-openssl
 default-openssl-no-idea-alg.diff, pmladek
 
+[ DefaultSettings < dev300-m24 < beb300-m3 ]
+# load and save also odf documents in flat xml format as opposed to the
+# compressed ones (conforming to the odf specifications)
+odf-flatxml-import-export-m23.diff
+[ DefaultSettings >= dev300-m24 >= beb300-m3 ]
 # load and save also odf documents in flat xml format as opposed to the
 # compressed ones (conforming to the odf specifications)
 odf-flatxml-import-export.diff
@@ -2153,10 +2166,12 @@
 [ DebianBaseOnly ]
 debian-system-jfreereport.diff
 debian-system-apache-commons.diff
-#debian-system-lucene.diff
 # FIXME: does this need more for DEV300s new external modules?
 configures-explicit-arch.diff
 
+[ DebianBaseOnly >= dev300-m22 ]
+#debian-system-lucene.diff
+
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 cairocanvas-image-borders.diff, n#340142, rodo

Modified: trunk/patches/dev300/odf-flatxml-import-export.diff
==============================================================================
--- trunk/patches/dev300/odf-flatxml-import-export.diff	(original)
+++ trunk/patches/dev300/odf-flatxml-import-export.diff	Wed Jul  9 20:31:12 2008
@@ -8,14 +8,14 @@
  mkdir: %_DEST%\xml%_EXT%\registry
  mkdir: %_DEST%\xml%_EXT%\registry\spool
  ..\source\xslt\common\*.xsl %_DEST%\bin%_EXT%\xslt\common\*.xsl
-@@ -32,6 +33,7 @@
+@@ -42,6 +42,7 @@
  ..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
  ..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
  ..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
 +..\source\odfflatxml\*.xsl %_DEST%\bin%_EXT%\xslt\odfflatxml\*.xsl
- ..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
  ..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
  ..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
+ ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
 --- filter/source/config/fragments/fcfg_xslt.mk	21 Mar 2005 11:48:40 -0000	1.7
 +++ filter/source/config/fragments/fcfg_xslt.mk	2 Jul 2007 09:34:15 -0000
 @@ -3,7 +3,11 @@

Modified: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-no-license.diff	(original)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Wed Jul  9 20:31:12 2008
@@ -5,14 +5,16 @@
 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,10 +10,5 @@
- 	  <dependencies>
- 		<OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
-   </dependencies>
--	<registration>
+@@ -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"/>
+-        <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -        </simple-license>
 -    </registration>
-   <platform value="UPDATED_SUPPORTED_PLATFORM" />
- </description>
+-
+     <version value="0.3" />
+ 
+     <platform value="UPDATED_SUPPORTED_PLATFORM" />

Modified: trunk/patches/dev300/presentation-minimizer-no-license.diff
==============================================================================
--- trunk/patches/dev300/presentation-minimizer-no-license.diff	(original)
+++ trunk/patches/dev300/presentation-minimizer-no-license.diff	Wed Jul  9 20:31:12 2008
@@ -5,13 +5,16 @@
 diff -u -u -r1.4.4.1 description.xml
 --- sdext/source/minimizer/description.xml	15 Nov 2007 16:24:05 -0000	1.4.4.1
 +++ sdext/source/minimizer/description.xml	16 Nov 2007 15:00:27 -0000
-@@ -6,9 +6,4 @@
-        <dependencies>
-                <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
-        </dependencies>
--       <registration>
+@@ -11,12 +11,6 @@
+         <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
+     </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>
- </description>
+-
+     <version value="1.0"/>
+ 
+     <platform value="UPDATED_SUPPORTED_PLATFORM"/>

Modified: trunk/patches/dev300/wiki-publisher-no-license.diff
==============================================================================
--- trunk/patches/dev300/wiki-publisher-no-license.diff	(original)
+++ trunk/patches/dev300/wiki-publisher-no-license.diff	Wed Jul  9 20:31:12 2008
@@ -45,14 +45,14 @@
      <display-name>
          <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
      </display-name>
--	<registration>
--        <simple-license accept-by="user" default-license-id="lic-en-US">
+-    <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>
- 	<dependencies>
- 		<OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
- 	</dependencies>
+     <dependencies>
+         <OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
+     </dependencies>
 --- swext/mediawiki/build.xml-old	2008-04-30 23:55:39.000000000 +0200
 +++ swext/mediawiki/build.xml	2008-04-30 23:56:30.000000000 +0200
 @@ -141,7 +141,6 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]