[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                    |    5 -----
 patches/dev300/build-ant-1.6-swext.diff |   17 -----------------
 2 files changed, 22 deletions(-)

New commits:
commit 9495522cb7c6549b71845a9f1a1071c850be9258
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 14:28:00 2011 +0200

    moved build-ant-1.6-swext.diff to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 31d17e2..4fc7eb8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -229,11 +229,6 @@ gui-sw-scroll.diff, i#20826, michael
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
-[ NovellOnlyExtensionFixes ]
-# allow build with ant-1.6
-# IMPORTANT: the second part of the patch is build-ant-1.6.diff
-build-ant-1.6-swext.diff, i#90830, pmladek
-
 [ NovellOnly ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
diff --git a/patches/dev300/build-ant-1.6-swext.diff b/patches/dev300/build-ant-1.6-swext.diff
deleted file mode 100644
index 9f877c5..0000000
--- a/patches/dev300/build-ant-1.6-swext.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- swext/mediawiki/build.xml.old	2009-10-08 09:05:35.000000000 +0200
-+++ swext/mediawiki/build.xml	2009-10-08 09:06:32.000000000 +0200
-@@ -143,10 +143,10 @@
-         <zip  destfile="${dist}/${name}.${ext}">
-             <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
-             <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
--            <file file="${commons-codec-jar}"/>
--            <file file="${commons-httpclient-jar}"/>
--            <file file="${commons-lang-jar}"/>
--            <file file="${commons-logging-jar}"/>
-+            <fileset file="${commons-codec-jar}" casesensitive="yes"/>
-+            <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
-+            <fileset file="${commons-lang-jar}" casesensitive="yes"/>
-+            <fileset file="${commons-logging-jar}" casesensitive="yes"/>
-             <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
-             <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
-             <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>