[med-svn] r9363 - in trunk/packages/libmpj-java/trunk/debian: . patches

Andreas Tille tille at alioth.debian.org
Sat Jan 21 14:36:11 UTC 2012


Author: tille
Date: 2012-01-21 14:36:11 +0000 (Sat, 21 Jan 2012)
New Revision: 9363

Added:
   trunk/packages/libmpj-java/trunk/debian/README.Debian
   trunk/packages/libmpj-java/trunk/debian/patches/
   trunk/packages/libmpj-java/trunk/debian/patches/series
   trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
Removed:
   trunk/packages/libmpj-java/trunk/debian/libmpj-java-doc.javadoc
Modified:
   trunk/packages/libmpj-java/trunk/debian/changelog
   trunk/packages/libmpj-java/trunk/debian/control
   trunk/packages/libmpj-java/trunk/debian/get-orig-source
   trunk/packages/libmpj-java/trunk/debian/libmpj-java.jlibs
   trunk/packages/libmpj-java/trunk/debian/rules
Log:
Some buildable state for mpj.jar only (ignoring all other jars builded in the source tree because these are not needed by beast-mcmc)


Added: trunk/packages/libmpj-java/trunk/debian/README.Debian
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/README.Debian	                        (rev 0)
+++ trunk/packages/libmpj-java/trunk/debian/README.Debian	2012-01-21 14:36:11 UTC (rev 9363)
@@ -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 <tille at debian.org>  Sat, 21 Jan 2012 15:15:57 +0100

Modified: trunk/packages/libmpj-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/changelog	2012-01-21 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/changelog	2012-01-21 14:36:11 UTC (rev 9363)
@@ -1,5 +1,5 @@
-mpj (0.38-1) UNRELEASED; urgency=low
+mpj (0.38~dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #?????)
 
- -- Andreas Tille <tille at debian.org>  Mon, 21 Feb 2011 08:17:38 +0100
+ -- 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 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/control	2012-01-21 14:36:11 UTC (rev 9363)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
 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 @@
  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

Modified: trunk/packages/libmpj-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/get-orig-source	2012-01-21 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/get-orig-source	2012-01-21 14:36:11 UTC (rev 9363)
@@ -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 @@
 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}

Deleted: trunk/packages/libmpj-java/trunk/debian/libmpj-java-doc.javadoc
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/libmpj-java-doc.javadoc	2012-01-21 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/libmpj-java-doc.javadoc	2012-01-21 14:36:11 UTC (rev 9363)
@@ -1 +0,0 @@
-doc /usr/share/doc/libmpj-java

Modified: trunk/packages/libmpj-java/trunk/debian/libmpj-java.jlibs
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/libmpj-java.jlibs	2012-01-21 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/libmpj-java.jlibs	2012-01-21 14:36:11 UTC (rev 9363)
@@ -1 +1 @@
-lib/*.jar
+lib/mpj.jar

Added: trunk/packages/libmpj-java/trunk/debian/patches/series
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/libmpj-java/trunk/debian/patches/series	2012-01-21 14:36:11 UTC (rev 9363)
@@ -0,0 +1 @@
+use_debian_packaged_jars.patch

Added: trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch	                        (rev 0)
+++ trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch	2012-01-21 14:36:11 UTC (rev 9363)
@@ -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"
+ 	/>

Modified: trunk/packages/libmpj-java/trunk/debian/rules
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/rules	2012-01-21 14:07:42 UTC (rev 9362)
+++ trunk/packages/libmpj-java/trunk/debian/rules	2012-01-21 14:36:11 UTC (rev 9363)
@@ -5,8 +5,5 @@
 %:
 	dh $@ --with javahelper
 
-override_dh_auto_build:
-	ant build
-
 get-orig-source:
 	uscan --verbose --force-download




More information about the debian-med-commit mailing list