[med-svn] r17516 - in trunk/packages/libmpj-java/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Thu Jul 24 13:52:14 UTC 2014
Author: tille
Date: 2014-07-24 13:52:14 +0000 (Thu, 24 Jul 2014)
New Revision: 17516
Modified:
trunk/packages/libmpj-java/trunk/debian/changelog
trunk/packages/libmpj-java/trunk/debian/control
trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
Log:
Use log4j properly
Modified: trunk/packages/libmpj-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/changelog 2014-07-24 13:11:15 UTC (rev 17515)
+++ trunk/packages/libmpj-java/trunk/debian/changelog 2014-07-24 13:52:14 UTC (rev 17516)
@@ -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 <tille at debian.org> Thu, 24 Jul 2014 13:43:16 +0200
Modified: trunk/packages/libmpj-java/trunk/debian/control
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/control 2014-07-24 13:11:15 UTC (rev 17515)
+++ trunk/packages/libmpj-java/trunk/debian/control 2014-07-24 13:52:14 UTC (rev 17516)
@@ -7,12 +7,12 @@
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 @@
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.
-
Modified: trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch 2014-07-24 13:11:15 UTC (rev 17515)
+++ trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch 2014-07-24 13:52:14 UTC (rev 17516)
@@ -12,16 +12,125 @@
<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 @@
<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"/>
More information about the debian-med-commit
mailing list