Author: tille Date: 2012-01-21 17:45:49 +0000 (Sat, 21 Jan 2012) New Revision: 9367
Modified: trunk/packages/libmpj-java/trunk/debian/copyright trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch Log: Completed copyright information Modified: trunk/packages/libmpj-java/trunk/debian/copyright =================================================================== --- trunk/packages/libmpj-java/trunk/debian/copyright 2012-01-21 17:27:05 UTC (rev 9366) +++ trunk/packages/libmpj-java/trunk/debian/copyright 2012-01-21 17:45:49 UTC (rev 9367) @@ -1,15 +1,14 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Upstream-Name: MPJ Express -Upstream-Contact: +Upstream-Contact: [email protected] Original-Source: http://sourceforge.net/projects/mpjexpress/files/ Files: * -Copyright: 2005 - 2007 - 1. Distributed Systems Group, University of Portsmouth (2005) - 2. Aamir Shafi (2005 - 2007) - 3. Bryan Carpenter (2005 - 2007) - 4. Mark Baker (2005 - 2007) - Leif Mortenson <[email protected]> +Copyright: 2004 - 2007 Distributed Systems Group, University of Portsmouth, + Aamir Shafi <[email protected]> + Bryan Carpenter <[email protected]> + Mark Baker <[email protected]> + Guillermo Lopez Taboada <[email protected]> License: The MIT License The bulk of code in this distribution was developed by the Distributed Systems Group at the University of Portsmouth. Some sections of the code like @@ -34,24 +33,8 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - . - 2. MPJ uses two third party softwares: Jetty and Java Service Wrapper project. - The licenses for these two projects can be seen in - $MPJ_HOME/THIRDPARTYLICENSES file. -Comment: Needs to be packaged separately from source - The source of the jar is available at - http://sourceforge.net/projects/mpjexpress/ - and needs separate packaging for Debian. This is planed to be done in - the future. -Files: lib/mtj.jar -Copyright: 2003-2006 Bjørn-Ove Heimsund -License: LGPL-3+ - On Debian GNU/Linux system you can find the text at - /usr/share/common-licenses/LGPL-3 -Comment: Needs to be packaged separately from source - The source of the jar is available at - http://code.google.com/p/matrix-toolkits-java/ - and needs separate packaging for Debian. This is planed to be done in - the future. - +Files: debian/* +Copyright: © 2012 Andreas Tille <[email protected]> +License: The MIT License + Same license as mpj itself 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 2012-01-21 17:27:05 UTC (rev 9366) +++ trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch 2012-01-21 17:45:49 UTC (rev 9367) @@ -1,6 +1,9 @@ Author: Andreas Tille <[email protected]> Date: Sat, 21 Jan 2012 15:15:57 +0100 Description: Use Debian packaged libraries + - Set classpath to those Debian JARs which are used + - Remove jetty from classpath which is actually not used and thus there + is no need to worry about its copyright explicitely --- mpj-v0_38.orig/build.xml +++ mpj-v0_38/build.xml @@ -9,7 +12,25 @@ <javac srcdir="${src.dir}" - classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar" -+ classpath="/usr/share/java/wrapper.jar:lib/org.mortbay.jetty.jar:/usr/share/java/log4j-1.2.jar" ++ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar" sourcepath="${src.dir}" debug="true" /> +@@ -190,7 +190,7 @@ + <manifest> + <attribute name="Main-class" value="runtime.starter.MPJRun" /> + <attribute name="Class-path" +- value="org.mortbay.jetty.jar log4j-1.2.11.jar javax.servlet.jar"/> ++ value="log4j-1.2.11.jar javax.servlet.jar"/> + </manifest> + </jar> + </target> +@@ -273,7 +273,7 @@ + <target name="java-docs" depends="figures"> + <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"> ++ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar"> + <fileset dir="${mpi.dir}" defaultexcludes="yes"> + <include name="**/Cartcomm.java"/> + <include name="**/CartParms.java"/> _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
