[med-svn] r9366 - in trunk/packages/libmpj-java/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Sat Jan 21 17:27:05 UTC 2012
Author: tille
Date: 2012-01-21 17:27:05 +0000 (Sat, 21 Jan 2012)
New Revision: 9366
Added:
trunk/packages/libmpj-java/trunk/debian/copyright
Modified:
trunk/packages/libmpj-java/trunk/debian/README.Debian
trunk/packages/libmpj-java/trunk/debian/control
trunk/packages/libmpj-java/trunk/debian/get-orig-source
trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
trunk/packages/libmpj-java/trunk/debian/watch
Log:
Dropped several other files from source tarball which have either no source or no license and are not actually needed for the wanted result mpj.jar
Modified: trunk/packages/libmpj-java/trunk/debian/README.Debian
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/README.Debian 2012-01-21 16:48:32 UTC (rev 9365)
+++ trunk/packages/libmpj-java/trunk/debian/README.Debian 2012-01-21 17:27:05 UTC (rev 9366)
@@ -1,13 +1,40 @@
libmpj-java for Debian
======================
-The mpjexpress project builds several different jar files.
+Documentation
+-------------
+The original tarball contained some PDF files without source. So these
+were stripped from the source to not cause conflicts with DFSG. Feel
+free to download and read these files at
+
+ http://mpj-express.org/guides.html
+
+
+Other parts of the library
+--------------------------
+
+The mpj-express project builds several different jar files.
+
This actual package was to build mpj.jar exclusively as a prerequisite
-for the beast-mcmc package. Because the chances to test the other builded
-JARs are not very good they are not shipped with the binary package.
+for the beast-mcmc package. Because the chances to test the other
+builded JARs are not very good they are not shipped with the binary
+package.
Please feel free to suggest inclusion of other JARs if you have some
use case.
+
+Test suite
+----------
+
+The original tarball contained a complex test suite. However large
+parts of this suite did not contained any licensing statement. This
+test suite is even downloadable separately at
+
+ http://www2.epcc.ed.ac.uk/computing/research_activities/java_grande/mpj.html
+
+If you consider using the test suite and want to include it into the
+packaging please clarify the license with the authors.
+
-- Andreas Tille <tille at debian.org> Sat, 21 Jan 2012 15:15:57 +0100
Modified: trunk/packages/libmpj-java/trunk/debian/control
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/control 2012-01-21 16:48:32 UTC (rev 9365)
+++ trunk/packages/libmpj-java/trunk/debian/control 2012-01-21 17:27:05 UTC (rev 9366)
@@ -15,7 +15,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
Recommends: ${java:Recommends}
-Description: Java library for parallel applications for multicore processors and compute clusters/clouds
+Description: Java library for parallel applications for multicore processors and clusters
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.
Added: trunk/packages/libmpj-java/trunk/debian/copyright
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/copyright (rev 0)
+++ trunk/packages/libmpj-java/trunk/debian/copyright 2012-01-21 17:27:05 UTC (rev 9366)
@@ -0,0 +1,57 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: MPJ Express
+Upstream-Contact:
+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 <leif at tanukisoftware.com>
+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
+ the buffering API and derived datatypes include contributions developed at
+ the Community Grids Lab at Indiana University.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ 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.
+
Modified: trunk/packages/libmpj-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/get-orig-source 2012-01-21 16:48:32 UTC (rev 9365)
+++ trunk/packages/libmpj-java/trunk/debian/get-orig-source 2012-01-21 17:27:05 UTC (rev 9366)
@@ -33,11 +33,20 @@
find . -name "*macosx*" -delete
find . -name "*solaris*" -delete
+# Unfortunately there is no source for the PDFs
+find . -name "*.pdf" -delete
+
# Remove binaries which are provided by Debian packages anyway
find . -name "libwrapper*" -delete # libservice-wrapper-jni
rm -f lib/log4j*.jar # liblog4j1.2-java
rm -f lib/wrapper.jar # libservice-wrapper-java
+# The test suite contains code with unspecified license
+# because it is not used in the build process it will
+# be simply removed to enable upload to Debian main.
+# Volunteers to do further investigation are really welcome
+rm -rf test
+
# finally all precompiled JARs are either builded in the build process
# or not needed for the build process of mpj.jar which is in our main interest
rm -f lib/*
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 16:48:32 UTC (rev 9365)
+++ trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch 2012-01-21 17:27:05 UTC (rev 9366)
@@ -1,3 +1,7 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Sat, 21 Jan 2012 15:15:57 +0100
+Description: Use Debian packaged libraries
+
--- mpj-v0_38.orig/build.xml
+++ mpj-v0_38/build.xml
@@ -79,7 +79,7 @@
Modified: trunk/packages/libmpj-java/trunk/debian/watch
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/watch 2012-01-21 16:48:32 UTC (rev 9365)
+++ trunk/packages/libmpj-java/trunk/debian/watch 2012-01-21 17:27:05 UTC (rev 9366)
@@ -1,4 +1,4 @@
version=3
-opts="uversionmangle=s/_/./g" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/~dfsg//" \
http://sf.net/mpjexpress/mpj-v(.+)\.zip \
debian debian/get-orig-source
More information about the debian-med-commit
mailing list