This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mpj.
commit d3d9beee81a76c1980e33822ad0f4ee82e18b3d5 Author: Andreas Tille <[email protected]> Date: Thu Jul 24 13:52:14 2014 +0000 Use log4j properly --- debian/changelog | 3 +- debian/control | 5 +- debian/patches/use_debian_packaged_jars.patch | 115 +++++++++++++++++++++++++- 3 files changed, 116 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e8328d..c1e0a7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -mpj (0.42+dfsg-1) UNRELEASED; urgency=medium +mpj (0.42+dfsg-1) unstable; urgency=medium * New upstream version (adapted patch) * Adapted d/watch, droped d/get-orig-source * New Build-Depends: libcommons-cli-java, libcommons-codec-java, libcommons-io-java + * cme fix dpkg-control -- Andreas Tille <[email protected]> Thu, 24 Jul 2014 13:43:16 +0200 diff --git a/debian/control b/debian/control index 9b5a019..238ae6f 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 9), javahelper, default-jdk (>= 1:1.6), ant, - liblog4j2-java, + liblog4j1.2-java, libservice-wrapper-java, libcommons-cli-java, libcommons-codec-java, libcommons-io-java -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libmpj-java/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libmpj-java/trunk/ Homepage: http://mpj-express.org/ @@ -26,4 +26,3 @@ Description: Java library for parallel applications for multicore processors and MPJ Express is a Java message passing library that allows application developers to write and execute parallel applications for multicore processors and compute clusters/clouds. - diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch index cc70d02..e1bd313 100644 --- a/debian/patches/use_debian_packaged_jars.patch +++ b/debian/patches/use_debian_packaged_jars.patch @@ -12,16 +12,125 @@ Description: Use Debian packaged libraries <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.11.jar:/usr/share/java/commons-cli-1.2.jar:/usr/share/java/commons-codec-1.9.jar:/usr/share/java/commons-io-2.4.jar" ++ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli-1.2.jar:/usr/share/java/commons-codec-1.9.jar:/usr/share/java/commons-io-2.4.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"> + <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"> + <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" + includes="mpi/*.class" excludes="mpi/MPIException.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}/mpjbuf.jar" basedir="src" + includes="mpjbuf/*.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}/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"> + <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> +- <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}/niodev.jar" basedir="src" + includes="xdev/niodev/*.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}/mxdev.jar" basedir="src" + includes="xdev/mxdev/*.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}/smpdev.jar" basedir="src" + includes="xdev/smpdev/*.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}/hybdev.jar" basedir="src" + includes="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> + +@@ -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-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> + </manifest> + </jar> + +@@ -183,7 +183,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> + </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> + </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.11.jar runtimecommon.jar"/> ++ value="log4j-1.2.jar runtimecommon.jar"/> </manifest> </jar> @@ -30,7 +139,7 @@ Description: Use Debian packaged libraries <javadoc destdir="${doc.dir}/javadocs" - classpath="${lib.dir}/org.mortbay.jetty.jar:${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar"> -+ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar"> ++ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.jar;${lib.dir}/commons-cli-1.2.jar"> <fileset dir="${mpi.dir}" defaultexcludes="yes"> <include name="**/Cartcomm.java"/> <include name="**/CartParms.java"/> -- 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
