[libmtj-java] 01/01: fix build.xml to use Debian jar files, some other deps are still missing, see changelog file

[Olivier Sallou]

This is an automated email from the git hooks/post-receive script.

osallou pushed a commit to branch master
in repository libmtj-java.

commit 4d4ef939e8f6c30a70130f0877580003a93ba156
Author: Olivier Sallou <osallou at debian.org>
Date:   Thu Sep 3 09:35:06 2015 +0000

    fix build.xml to use Debian jar files, some other deps are still missing, see changelog file
---
 debian/changelog                          | 18 ++++++++++
 debian/patches/use_debian_jar_files.patch | 56 +++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22a2f8f..337f8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,24 @@ mtj (1.0.1-1) UNRELEASED; urgency=medium
   * d/get-orig-source: deleted since no need to repack any more
   * Move from Debian Med team to pkg-java team maintenance
 
+  [ Olivier Sallou ]
+  * debian/patches/use_debian_jar_files.patch: fix patch to build using Debian jar files
+
+  [ TODO ]
+
+  Still several missing dependencies:
+    [javac] /home/vagrant/libmtj-java/src/main/java/no/uib/cipr/matrix/TridiagMatrix.java:26: error: package com.github.fommil.netlib does not exist
+    [javac] import com.github.fommil.netlib.LAPACK;
+    [javac]                                ^
+    [javac] /home/vagrant/libmtj-java/src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java:40: error: package com.github.fommil.netlib does not exist
+    [javac] import com.github.fommil.netlib.BLAS;
+    [javac]                                ^
+    [javac] /home/vagrant/libmtj-java/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java:3: error: package com.github.fommil.netlib does not exist
+    [javac] import com.github.fommil.netlib.ARPACK;
+    [javac]                                ^
+    [javac] /home/vagrant/libmtj-java/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java:4: error: package lombok.extern.java does not exist
+    [javac] import lombok.extern.java.Log;
+
  -- Andreas Tille <tille at debian.org>  Thu, 28 Aug 2014 14:31:28 +0200
 
 mtj (0.9.14+dfsg-2) unstable; urgency=low
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
index a31a994..c9a7d27 100644
--- a/debian/patches/use_debian_jar_files.patch
+++ b/debian/patches/use_debian_jar_files.patch
@@ -1,21 +1,41 @@
---- mtj-0.9.14.orig/build.xml
-+++ mtj-0.9.14/build.xml
-@@ -16,4 +16,6 @@
- 			<zipfileset dir="." excludes="**/lib/nblibraries-private.properties **/nbproject/private** **/.ant-targets-build.xml dist/** build/** **/*.zip **/.svn**" prefix="mtj-${version}" />
- 		</zip>
+--- a/build.xml
++++ b/build.xml
+@@ -2,18 +2,28 @@
+ <project name="Matrix_Toolkits_for_Java" default="default" basedir=".">
+     <description>Builds, tests, and runs the project Matrix Toolkits for Java.</description>
+     <property name="version" value="dev" />
+-    <import file="nbproject/build-impl.xml"/>
+ 	
+-	<target name="-post-clean">
++	<target name="clean">
+ 		<delete dir="javadoc" />
++                <delete dir="build" />
++                <delete dir="dist" />
  	</target>
+ 
+-	<target name="package" depends="jar, javadoc">
+-		<!-- TODO: consider bundling BLAS/LAPACK -->
+-		<move file="dist/javadoc" todir="."/>
+-		<move file="${dist.jar}" tofile="mtj-${version}.jar" />
+-		<zip destfile="mtj-${version}.zip">
+-			<zipfileset dir="." excludes="**/lib/nblibraries-private.properties **/nbproject/private** **/.ant-targets-build.xml dist/** build/** **/*.zip **/.svn**" prefix="mtj-${version}" />
+-		</zip>
+-	</target>
 +    <property name="src.dir" value="src"/>
-+    <property name="javac.classpath" value="/usr/share/java/junit.jar:/usr/share/java/f2jutil.jar:/usr/share/java/netlib-java.jar"/>
++    <property name="compile.classpath" value="/usr/share/java/junit.jar:/usr/share/java/f2jutil.jar:/usr/share/java/netlib-java.jar"/>
++    <path id="compile.classpath">
++                        <fileset dir="/usr/share/java">
++                                <include name="junit.jar"/>
++                                <include name="f2jutil.jar"/>
++                                <include name="netlib-java.jar"/>
++                        </fileset>
++     </path>
++
++     <target name="default">
++                <mkdir dir="build"/>
++                <mkdir dir="dist"/>
++                <javac srcdir="src" destdir="build" classpathref="compile.classpath" nowarn="true" source="1.5" target="1.5">
++                </javac>
++        </target>
++
  </project>
---- mtj-0.9.14.orig/lib/nblibraries.properties
-+++ mtj-0.9.14/lib/nblibraries.properties
-@@ -1,7 +1,6 @@
- libs.junit.classpath=\
--    ${base}/junit/junit-3.8.2.jar
-+    /usr/share/java/junit.jar
- libs.junit.javadoc=\
-     ${base}/junit/junit-3.8.2-api.zip
- libs.netlib-java.classpath=\
--    ${base}/netlib-java/arpack_combo-0.1.jar:\
--    ${base}/netlib-java/netlib-java-0.9.3.jar
-+    /usr/share/java/netlib-java.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmtj-java.git