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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 21 17:07:27 2008
New Revision: 13330
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13330&view=rev

Log:
revert r13328

Added:
   trunk/patches/dev300/build-ant-1.6-swext.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-ant-1.6.diff
   trunk/patches/dev300/debian-system-apache-commons.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 17:07:27 2008
@@ -423,7 +423,13 @@
 
 [ swextFixes ]
 # allow build with ant-1.6
-build-ant-1.6.diff, i#90830, pmladek
+# IMPORTANT: the second part of the patch is build-ant-1.6.diff
+#FIXME: make NovellOnly 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
+#FIXME: make "build-ant-1.6-swext.diff" NovellOnly  build-ant-1.6.diff, i#90830, pmladek
 
 [ Fixes < dev300-m24 < beb300-m3 ]
 # let sd accept uri-list drop, n#183719

Added: trunk/patches/dev300/build-ant-1.6-swext.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-ant-1.6-swext.diff	Mon Jul 21 17:07:27 2008
@@ -0,0 +1,17 @@
+--- swext/mediawiki/build.xml.old	2008-07-15 11:55:31.000000000 +0200
++++ swext/mediawiki/build.xml	2008-07-15 16:39:54.000000000 +0200
+@@ -140,10 +140,10 @@
+             <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
+             <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
+             <fileset dir="." includes="images/**,templates/**" 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 dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
+             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
+             <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>

Modified: trunk/patches/dev300/build-ant-1.6.diff
==============================================================================
--- trunk/patches/dev300/build-ant-1.6.diff	(original)
+++ trunk/patches/dev300/build-ant-1.6.diff	Mon Jul 21 17:07:27 2008
@@ -11,20 +11,3 @@
    ant_minminor1=`echo $ant_minver | cut -d"." -f2`
  
    AC_MSG_CHECKING([whether ant is >= $ant_minver])
---- swext/mediawiki/build.xml.old	2008-07-15 11:55:31.000000000 +0200
-+++ swext/mediawiki/build.xml	2008-07-15 16:39:54.000000000 +0200
-@@ -140,10 +140,10 @@
-             <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
-             <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
-             <fileset dir="." includes="images/**,templates/**" 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 dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
-             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
-             <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>

Modified: trunk/patches/dev300/debian-system-apache-commons.diff
==============================================================================
--- trunk/patches/dev300/debian-system-apache-commons.diff	(original)
+++ trunk/patches/dev300/debian-system-apache-commons.diff	Mon Jul 21 17:07:27 2008
@@ -15,14 +15,14 @@
                  <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
              </manifest>            
          </jar>
-@@ -140,10 +139,6 @@
+@@ -141,10 +141,6 @@
              <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
              <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
              <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
--            <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"/>
+-            <file file="${commons-codec-jar}"/>
+-            <file file="${commons-httpclient-jar}"/>
+-            <file file="${commons-lang-jar}"/>
+-            <file file="${commons-logging-jar}"/>
              <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
              <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
              <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>