ooo-build r13302 - in trunk: . patches/dev300
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13302 - in trunk: . patches/dev300
- Date: Fri, 18 Jul 2008 18:35:08 +0000 (UTC)
Author: strba
Date: Fri Jul 18 18:35:08 2008
New Revision: 13302
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13302&view=rev
Log:
Add in the patch of the patch some <cr> characters in right places so that it actually applies
Modified:
trunk/ChangeLog
trunk/patches/dev300/build-java-target.diff
Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff (original)
+++ trunk/patches/dev300/build-java-target.diff Fri Jul 18 18:35:08 2008
@@ -36,18 +36,18 @@
+++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000 +0100
-@@ -90,14 +90,12 @@
+@@ -54,7 +54,7 @@ limitations under the License.
-+ </copy>
-+ </target>
-+ <target name="compile" depends="static" description="Compile shareable components">
-+- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
-++ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${java.source.ver}" target="${java.target.ver}" optimize="${compile.optimize}">
-+ <classpath refid="compile.classpath"/>
-+ </javac>
-+ <copy todir="${build.home}/classes" filtering="on">
++ </copy>
++ </target>
++ <target name="compile" depends="static" description="Compile shareable components">
++- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
+++ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${java.source.ver}" target="${java.target.ver}" optimize="${compile.optimize}">
++ <classpath refid="compile.classpath"/>
++ </javac>
++ <copy todir="${build.home}/classes" filtering="on">
+@@ -90,14 +90,12 @@ limitations under the License.
- </target>
- <target name="dist" depends="compile,javadoc" description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
+ </target>
+ <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+ <mkdir dir="${dist.home}"/>
--- apache-commons/patches/httpclient.patch.javatarget~ 2008-07-07 20:04:44.672095625 +0200
+++ apache-commons/patches/httpclient.patch 2008-07-07 20:04:44.672095625 +0200
@@ -0,0 +1,29 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]