This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mpj.
commit 4329d599c8af38176db2db259219cc81da542bb5 Author: Andreas Tille <[email protected]> Date: Wed May 11 09:32:16 2016 +0200 Refresh patch, TODO: lib/org.mortbay.jetty.jar --- debian/patches/use_debian_packaged_jars.patch | 126 ++++++++++++++++---------- 1 file changed, 76 insertions(+), 50 deletions(-) diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch index fab7951..15bde44 100644 --- a/debian/patches/use_debian_packaged_jars.patch +++ b/debian/patches/use_debian_packaged_jars.patch @@ -7,33 +7,53 @@ Description: Use Debian packaged libraries --- a/build.xml +++ b/build.xml -@@ -82,7 +82,7 @@ +@@ -73,10 +73,10 @@ depends="generateJava"> <javac srcdir="${src.dir}" -- classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar:lib/commons-cli-1.2.jar:lib\commons-codec-1.8.jar:lib\commons-io-2.4.jar" -+ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-io.jar" - sourcepath="${src.dir}" - debug="true" - /> -@@ -94,35 +94,35 @@ - includes="mpi/*.class mpjbuf/*.class mpjdev/*.class mpjdev/javampjdev/*.class xdev/*.class mpjdev/natmpjdev/*.class - xdev/niodev/*.class xdev/mxdev/*.class xdev/hybdev/*.class"> +- classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar: +- lib/log4j-1.2.11.jar:lib/commons-cli-1.2.jar: +- lib\commons-codec-1.8.jar: +- lib\commons-io-2.4.jar" ++ classpath="/usr/share/java/wrapper.jar:lib/org.mortbay.jetty.jar: ++ /usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli.jar: ++ /usr/share/java/commons-codec.jar: ++ /usr/share/java/commons-io.jar" + sourcepath="${src.dir}" + debug="true"> + <exclude name="runtime/starter/MPJAppMaster.java"/> +@@ -92,9 +92,9 @@ + <classpath> + <fileset dir="lib"> + <include name="wrapper.jar org.mortbay.jetty.jar +- log4j-1.2.11.jar commons-cli-1.2.jar +- commons-codec-1.8.jar +- commons-io-2.4.jar" /> ++ log4j-1.2.jar commons-cli.jar ++ commons-codec.jar ++ commons-io.jar" /> + </fileset> + + <fileset dir="${hadoop_home}/share/hadoop/yarn"> +@@ -150,7 +150,7 @@ + xdev/mxdev/*.class + xdev/hybdev/*.class"> <manifest> - <attribute name="Class-path" value="log4j-1.2.11.jar"/> + <attribute name="Class-path" value="log4j-1.2.jar"/> </manifest> </jar> - <jar destfile="${lib.dir}/mpiExp.jar" basedir="src" - includes="mpi/MPIException.class,mpjdev/MPJDevException.class,mpjdev/Request.class,mpjdev/Request$WaitanyQue.class,mpjdev/Status.class,mpjdev/CompletionHandler.class, mpjdev/Constants.class"> +@@ -162,21 +162,21 @@ + mpjdev/CompletionHandler.class, + mpjdev/Constants.class"> <manifest> - <attribute name="Class-path" value="log4j-1.2.11.jar"/> + <attribute name="Class-path" value="log4j-1.2.jar"/> </manifest> </jar> - <!-- includes="mpi/MPIException.class,mpjdev/MPJDevException.class,mpjdev/Status.class,mpjdev/Group.class,mpjdev/MPJDev.class,mpjdev/Request.class,mpjdev/Comm.class,mpjdev/Request$WaitanyQue.class,mpjdev/Comm$1.class"> --> - <jar destfile="${lib.dir}/mpi.jar" basedir="src" + + <jar destfile="${lib.dir}/mpi.jar" basedir="src" includes="mpi/*.class" excludes="mpi/MPIException.class"> <manifest> - <attribute name="Class-path" value="log4j-1.2.11.jar"/> @@ -49,15 +69,15 @@ Description: Use Debian packaged libraries </manifest> </jar> - <jar destfile="${lib.dir}/mpjdev.jar" basedir="src" - includes="mpjdev/*.class mpjdev/javampjdev/*.class mpjdev/natmpjdev/*.class" excludes="mpjdev/MPJDevException.class,mpjdev/Request.class,mpjdev/Request$WaitanyQue.class,mpjdev/Status.class,mpjdev/CompletionHandler.class, mpjdev/Constants.class"> +@@ -191,42 +191,42 @@ + mpjdev/CompletionHandler.class, + mpjdev/Constants.class"> <manifest> - <attribute name="Class-path" value="log4j-1.2.11.jar"/> + <attribute name="Class-path" value="log4j-1.2.jar"/> </manifest> </jar> -@@ -133,35 +133,35 @@ <jar destfile="${lib.dir}/xdev.jar" basedir="src" includes="xdev/*.class"> <manifest> @@ -92,49 +112,55 @@ Description: Use Debian packaged libraries <jar destfile="${lib.dir}/hybdev.jar" basedir="src" includes="xdev/hybdev/*.class"> - <manifest> + <manifest> - <attribute name="Class-path" value="log4j-1.2.11.jar"/> + <attribute name="Class-path" value="log4j-1.2.jar"/> - </manifest> + </manifest> </jar> -@@ -173,7 +173,7 @@ - <attribute name="Main-class" - value="runtime.daemon.MPJDaemon" /> - <attribute name="Class-path" -- value="log4j-1.2.11.jar commons-codec-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> -+ value="log4j-1.2.jar commons-codec.jar commons-io.jar runtimecommon.jar "/> - </manifest> - </jar> - -@@ -183,7 +183,7 @@ +@@ -238,9 +238,9 @@ + <attribute name="Main-class" + value="runtime.daemon.MPJDaemon" /> + <attribute name="Class-path" +- value="log4j-1.2.11.jar +- commons-codec-1.8.jar +- commons-io-2.4.jar ++ value="log4j-1.2.jar ++ commons-codec.jar ++ commons-io.jar + runtimecommon.jar "/> + </manifest> + </jar> +@@ -269,7 +269,7 @@ + <attribute name="Main-class" value="runtime.starter.MPJRun" /> + <attribute name="Class-path" + value="org.mortbay.jetty.jar +- log4j-1.2.11.jar ++ log4j-1.2.jar + runtimecommon.jar"/> + </manifest> + </jar> +@@ -280,7 +280,7 @@ <attribute name="Main-class" - value="runtime.daemon.Wrapper" /> - <!-- <attribute name="Class-path" -- value="wrapper.jar log4j-1.2.11.jar mpj.jar"/> --> -+ value="wrapper.jar log4j-1.2.jar mpj.jar"/> --> - </manifest> + value="runtime.daemonmanager.MPJDaemonManager" /> + <attribute name="Class-path" +- value="commons-cli-1.2.jar runtimecommon.jar"/> ++ value="commons-cli.jar runtimecommon.jar"/> + </manifest> </jar> -@@ -193,7 +193,7 @@ - <attribute name="Main-class" - value="runtime.daemon.ThreadedWrapper" /> - <!-- <attribute name="Class-path" -- value="wrapper.jar log4j-1.2.11.jar mpj.jar"/> --> -+ value="wrapper.jar log4j-1.2.jar mpj.jar"/> --> - </manifest> +@@ -288,8 +288,8 @@ + includes="runtime/common/*.class"> + <manifest> + <attribute name="Class-path" +- value="commons-cli-1.2.jar +- commons-codec-1.8.jar"/> ++ value="commons-cli.jar ++ commons-codec.jar"/> + </manifest> </jar> -@@ -202,7 +202,7 @@ - <manifest> - <attribute name="Main-class" value="runtime.starter.MPJRun" /> - <attribute name="Class-path" -- value="org.mortbay.jetty.jar log4j-1.2.11.jar runtimecommon.jar"/> -+ value="log4j-1.2.jar runtimecommon.jar"/> - </manifest> - </jar> - -@@ -303,7 +303,7 @@ +@@ -422,7 +422,7 @@ <target name="java-docs" depends="figures"> <javadoc destdir="${doc.dir}/javadocs" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mpj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
