This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mpj.
commit 279e1b740643f84ba9064aa37c52ce63be50887c Author: Andreas Tille <[email protected]> Date: Sat Jan 21 14:36:11 2012 +0000 Some buildable state for mpj.jar only (ignoring all other jars builded in the source tree because these are not needed by beast-mcmc) --- debian/README.Debian | 13 +++++++++++++ debian/changelog | 4 ++-- debian/control | 14 +------------- debian/get-orig-source | 7 +++++-- debian/libmpj-java-doc.javadoc | 1 - debian/libmpj-java.jlibs | 2 +- debian/patches/series | 1 + debian/patches/use_debian_packaged_jars.patch | 11 +++++++++++ debian/rules | 3 --- 9 files changed, 34 insertions(+), 22 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..9c34baa --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,13 @@ +libmpj-java for Debian +====================== + +The mpjexpress 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. + +Please feel free to suggest inclusion of other JARs if you have some +use case. + + -- Andreas Tille <[email protected]> Sat, 21 Jan 2012 15:15:57 +0100 diff --git a/debian/changelog b/debian/changelog index 24cedc4..52aaeba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mpj (0.38-1) UNRELEASED; urgency=low +mpj (0.38~dfsg-1) UNRELEASED; urgency=low * Initial release (Closes: #?????) - -- Andreas Tille <[email protected]> Mon, 21 Feb 2011 08:17:38 +0100 + -- Andreas Tille <[email protected]> Sat, 21 Jan 2012 15:15:57 +0100 diff --git a/debian/control b/debian/control index 0a0ae4b..4e168da 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <[email protected]. DM-Upload-Allowed: yes Uploaders: Andreas Tille <[email protected]> Build-Depends: debhelper (>= 8), javahelper (>=0.25), openjdk-6-jdk, ant, - libservice-wrapper-jni, liblog4j1.2-java, libservice-wrapper-java + liblog4j1.2-java, libservice-wrapper-java Standards-Version: 3.9.2 Homepage: http://mpj-express.org/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libmpj-java/trunk @@ -19,15 +19,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. - -Package: libmpj-java-doc -Section: doc -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 - 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. - . - This package provides the documentation for the library diff --git a/debian/get-orig-source b/debian/get-orig-source index bb832db..21a71d4 100755 --- a/debian/get-orig-source +++ b/debian/get-orig-source @@ -1,7 +1,6 @@ #!/bin/sh # get source for libmpj-java and remove unneeded jars and binaries -set -x set -e NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'` @@ -39,6 +38,10 @@ find . -name "libwrapper*" -delete # libservice-wrapper-jni rm -f lib/log4j*.jar # liblog4j1.2-java rm -f lib/wrapper.jar # libservice-wrapper-java +# 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/* + cd .. GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}" -# rm -rf ${UARCHIVEDIR} +rm -rf ${UARCHIVEDIR} diff --git a/debian/libmpj-java-doc.javadoc b/debian/libmpj-java-doc.javadoc deleted file mode 100644 index a3994cb..0000000 --- a/debian/libmpj-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -doc /usr/share/doc/libmpj-java diff --git a/debian/libmpj-java.jlibs b/debian/libmpj-java.jlibs index 8c5987b..ce9b8fd 100644 --- a/debian/libmpj-java.jlibs +++ b/debian/libmpj-java.jlibs @@ -1 +1 @@ -lib/*.jar +lib/mpj.jar diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a19efd6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +use_debian_packaged_jars.patch diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch new file mode 100644 index 0000000..3feb7a5 --- /dev/null +++ b/debian/patches/use_debian_packaged_jars.patch @@ -0,0 +1,11 @@ +--- mpj-v0_38.orig/build.xml ++++ mpj-v0_38/build.xml +@@ -79,7 +79,7 @@ + depends="generateJava"> + + <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" + sourcepath="${src.dir}" + debug="true" + /> diff --git a/debian/rules b/debian/rules index 747df8a..457aec1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,5 @@ JAVA_HOME=/usr/lib/jvm/default-java %: dh $@ --with javahelper -override_dh_auto_build: - ant build - get-orig-source: uscan --verbose --force-download -- 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
