[libmtj-java] 01/01: patch to use libnetlib-java
Olivier Sallou
osallou at debian.org
Fri Sep 4 08:24:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
osallou pushed a commit to branch master
in repository libmtj-java.
commit 8ff95f21c47abc3fa3378e550e510eb20f541558
Author: Olivier Sallou <osallou at debian.org>
Date: Fri Sep 4 08:24:00 2015 +0000
patch to use libnetlib-java
---
debian/changelog | 18 +-
.../patches/0002-use_netlib_java_debian_lib.patch | 442 +++++++++++++++++++++
debian/patches/series | 1 +
debian/patches/use_debian_jar_files.patch | 10 +
4 files changed, 455 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c1c9bd7..9e851f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,25 +7,11 @@ mtj (1.0.1-1) UNRELEASED; urgency=medium
[ Olivier Sallou ]
* debian/patches/use_debian_jar_files.patch: fix patch to build using Debian jar files
+ ù d/patches/0002-use_netlib_java_debian_lib.patch: use netlib-java
[ 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;
-
- => Need to replace com.github.fommil.netlib by org.netlib.blas/lapack/utils/arpack according
- to required class
-
- [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;
+ missing dependencies: lombock https://projectlombok.org/index.html
-- Andreas Tille <tille at debian.org> Thu, 28 Aug 2014 14:31:28 +0200
diff --git a/debian/patches/0002-use_netlib_java_debian_lib.patch b/debian/patches/0002-use_netlib_java_debian_lib.patch
new file mode 100644
index 0000000..6d33f11
--- /dev/null
+++ b/debian/patches/0002-use_netlib_java_debian_lib.patch
@@ -0,0 +1,442 @@
+From: Olivier Sallou <osallou at debian.org>
+Date: Fri, 4 Sep 2015 08:17:26 +0000
+Subject: use_netlib_java_debian_lib
+
+Patch java classes to use netlib-java Debian package with corresponding namespaces
+---
+ src/main/java/no/uib/cipr/matrix/AbstractSymmBandMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/AbstractSymmDenseMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/AbstractSymmPackMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/AbstractTriangBandMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/AbstractTriangDenseMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/AbstractTriangPackMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/BandCholesky.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/BandLU.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/BandMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/DenseCholesky.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/DenseLU.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/DenseMatrix.java | 4 ++--
+ src/main/java/no/uib/cipr/matrix/EVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/LQ.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/PackCholesky.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/PermutationMatrix.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/QL.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/QR.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/QRP.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/RQ.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SPDTridiagMatrix.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SymmBandEVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SymmDenseEVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SymmPackEVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SymmTridiagEVD.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/SymmTridiagMatrix.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/TridiagMatrix.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java | 2 +-
+ src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java | 2 +-
+ 30 files changed, 38 insertions(+), 38 deletions(-)
+
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractSymmBandMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractSymmBandMatrix.java
+index aeccfdb..17d705d 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractSymmBandMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractSymmBandMatrix.java
+@@ -22,8 +22,8 @@ package no.uib.cipr.matrix;
+
+ import java.util.Iterator;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractSymmDenseMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractSymmDenseMatrix.java
+index 6df0e15..c4ccd86 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractSymmDenseMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractSymmDenseMatrix.java
+@@ -20,8 +20,8 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractSymmPackMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractSymmPackMatrix.java
+index 6548f70..10b9709 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractSymmPackMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractSymmPackMatrix.java
+@@ -20,8 +20,8 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractTriangBandMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractTriangBandMatrix.java
+index 6dafa48..f8c8b95 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractTriangBandMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractTriangBandMatrix.java
+@@ -20,8 +20,8 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractTriangDenseMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractTriangDenseMatrix.java
+index 364f144..8e720eb 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractTriangDenseMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractTriangDenseMatrix.java
+@@ -22,8 +22,8 @@ package no.uib.cipr.matrix;
+
+ import java.util.Iterator;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/AbstractTriangPackMatrix.java b/src/main/java/no/uib/cipr/matrix/AbstractTriangPackMatrix.java
+index c04a139..efc4bae 100644
+--- a/src/main/java/no/uib/cipr/matrix/AbstractTriangPackMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/AbstractTriangPackMatrix.java
+@@ -20,8 +20,8 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ import java.util.Iterator;
+diff --git a/src/main/java/no/uib/cipr/matrix/BandCholesky.java b/src/main/java/no/uib/cipr/matrix/BandCholesky.java
+index b782e0e..23e3741 100644
+--- a/src/main/java/no/uib/cipr/matrix/BandCholesky.java
++++ b/src/main/java/no/uib/cipr/matrix/BandCholesky.java
+@@ -22,7 +22,7 @@ package no.uib.cipr.matrix;
+
+ import no.uib.cipr.matrix.Matrix.Norm;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.doubleW;
+ import org.netlib.util.intW;
+
+diff --git a/src/main/java/no/uib/cipr/matrix/BandLU.java b/src/main/java/no/uib/cipr/matrix/BandLU.java
+index ea542ba..013dc3b 100644
+--- a/src/main/java/no/uib/cipr/matrix/BandLU.java
++++ b/src/main/java/no/uib/cipr/matrix/BandLU.java
+@@ -22,7 +22,7 @@ package no.uib.cipr.matrix;
+
+ import no.uib.cipr.matrix.Matrix.Norm;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.doubleW;
+ import org.netlib.util.intW;
+
+diff --git a/src/main/java/no/uib/cipr/matrix/BandMatrix.java b/src/main/java/no/uib/cipr/matrix/BandMatrix.java
+index 3ef5606..cfead4e 100644
+--- a/src/main/java/no/uib/cipr/matrix/BandMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/BandMatrix.java
+@@ -22,8 +22,8 @@ package no.uib.cipr.matrix;
+
+ import java.util.Arrays;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/DenseCholesky.java b/src/main/java/no/uib/cipr/matrix/DenseCholesky.java
+index ac67328..976ad43 100644
+--- a/src/main/java/no/uib/cipr/matrix/DenseCholesky.java
++++ b/src/main/java/no/uib/cipr/matrix/DenseCholesky.java
+@@ -22,7 +22,7 @@ package no.uib.cipr.matrix;
+
+ import no.uib.cipr.matrix.Matrix.Norm;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.doubleW;
+ import org.netlib.util.intW;
+
+diff --git a/src/main/java/no/uib/cipr/matrix/DenseLU.java b/src/main/java/no/uib/cipr/matrix/DenseLU.java
+index 207f537..0784b0b 100644
+--- a/src/main/java/no/uib/cipr/matrix/DenseLU.java
++++ b/src/main/java/no/uib/cipr/matrix/DenseLU.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import no.uib.cipr.matrix.Matrix.Norm;
+ import org.netlib.util.doubleW;
+ import org.netlib.util.intW;
+diff --git a/src/main/java/no/uib/cipr/matrix/DenseMatrix.java b/src/main/java/no/uib/cipr/matrix/DenseMatrix.java
+index 5aca14e..4b7ba7c 100644
+--- a/src/main/java/no/uib/cipr/matrix/DenseMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/DenseMatrix.java
+@@ -26,8 +26,8 @@ import no.uib.cipr.matrix.io.MatrixInfo;
+ import no.uib.cipr.matrix.io.MatrixSize;
+ import no.uib.cipr.matrix.io.MatrixVectorReader;
+
+-import com.github.fommil.netlib.BLAS;
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.blas.BLAS;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/EVD.java b/src/main/java/no/uib/cipr/matrix/EVD.java
+index 0166dd1..eebd77f 100644
+--- a/src/main/java/no/uib/cipr/matrix/EVD.java
++++ b/src/main/java/no/uib/cipr/matrix/EVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/LQ.java b/src/main/java/no/uib/cipr/matrix/LQ.java
+index d24f97c..bcb85c2 100644
+--- a/src/main/java/no/uib/cipr/matrix/LQ.java
++++ b/src/main/java/no/uib/cipr/matrix/LQ.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/PackCholesky.java b/src/main/java/no/uib/cipr/matrix/PackCholesky.java
+index 76942bc..8215160 100644
+--- a/src/main/java/no/uib/cipr/matrix/PackCholesky.java
++++ b/src/main/java/no/uib/cipr/matrix/PackCholesky.java
+@@ -22,7 +22,7 @@ package no.uib.cipr.matrix;
+
+ import no.uib.cipr.matrix.Matrix.Norm;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.doubleW;
+ import org.netlib.util.intW;
+
+diff --git a/src/main/java/no/uib/cipr/matrix/PermutationMatrix.java b/src/main/java/no/uib/cipr/matrix/PermutationMatrix.java
+index e6ebec7..1a3c47b 100644
+--- a/src/main/java/no/uib/cipr/matrix/PermutationMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/PermutationMatrix.java
+@@ -1,6 +1,6 @@
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+
+ import java.util.BitSet;
+
+diff --git a/src/main/java/no/uib/cipr/matrix/QL.java b/src/main/java/no/uib/cipr/matrix/QL.java
+index caa6cc9..85cd159 100644
+--- a/src/main/java/no/uib/cipr/matrix/QL.java
++++ b/src/main/java/no/uib/cipr/matrix/QL.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/QR.java b/src/main/java/no/uib/cipr/matrix/QR.java
+index 84d7a26..471d47f 100644
+--- a/src/main/java/no/uib/cipr/matrix/QR.java
++++ b/src/main/java/no/uib/cipr/matrix/QR.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/QRP.java b/src/main/java/no/uib/cipr/matrix/QRP.java
+index da83d50..5268f79 100644
+--- a/src/main/java/no/uib/cipr/matrix/QRP.java
++++ b/src/main/java/no/uib/cipr/matrix/QRP.java
+@@ -19,7 +19,7 @@
+ */
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/RQ.java b/src/main/java/no/uib/cipr/matrix/RQ.java
+index 395f037..d1a21bb 100644
+--- a/src/main/java/no/uib/cipr/matrix/RQ.java
++++ b/src/main/java/no/uib/cipr/matrix/RQ.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/SPDTridiagMatrix.java b/src/main/java/no/uib/cipr/matrix/SPDTridiagMatrix.java
+index f5558c7..b7a4e84 100644
+--- a/src/main/java/no/uib/cipr/matrix/SPDTridiagMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/SPDTridiagMatrix.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/SVD.java b/src/main/java/no/uib/cipr/matrix/SVD.java
+index d87fdd3..a12f289 100644
+--- a/src/main/java/no/uib/cipr/matrix/SVD.java
++++ b/src/main/java/no/uib/cipr/matrix/SVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/SymmBandEVD.java b/src/main/java/no/uib/cipr/matrix/SymmBandEVD.java
+index 93299de..132b05e 100644
+--- a/src/main/java/no/uib/cipr/matrix/SymmBandEVD.java
++++ b/src/main/java/no/uib/cipr/matrix/SymmBandEVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/SymmDenseEVD.java b/src/main/java/no/uib/cipr/matrix/SymmDenseEVD.java
+index 5cf7f03..5bea994 100644
+--- a/src/main/java/no/uib/cipr/matrix/SymmDenseEVD.java
++++ b/src/main/java/no/uib/cipr/matrix/SymmDenseEVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/SymmPackEVD.java b/src/main/java/no/uib/cipr/matrix/SymmPackEVD.java
+index 74380b9..36437da 100644
+--- a/src/main/java/no/uib/cipr/matrix/SymmPackEVD.java
++++ b/src/main/java/no/uib/cipr/matrix/SymmPackEVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+
+diff --git a/src/main/java/no/uib/cipr/matrix/SymmTridiagEVD.java b/src/main/java/no/uib/cipr/matrix/SymmTridiagEVD.java
+index b32ec68..f4f4b0e 100644
+--- a/src/main/java/no/uib/cipr/matrix/SymmTridiagEVD.java
++++ b/src/main/java/no/uib/cipr/matrix/SymmTridiagEVD.java
+@@ -20,7 +20,7 @@
+
+ package no.uib.cipr.matrix;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/SymmTridiagMatrix.java b/src/main/java/no/uib/cipr/matrix/SymmTridiagMatrix.java
+index b26770b..9377db9 100644
+--- a/src/main/java/no/uib/cipr/matrix/SymmTridiagMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/SymmTridiagMatrix.java
+@@ -23,7 +23,7 @@ package no.uib.cipr.matrix;
+ import java.util.Arrays;
+ import java.util.Iterator;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/TridiagMatrix.java b/src/main/java/no/uib/cipr/matrix/TridiagMatrix.java
+index 1d2799e..5d53c94 100644
+--- a/src/main/java/no/uib/cipr/matrix/TridiagMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/TridiagMatrix.java
+@@ -23,7 +23,7 @@ package no.uib.cipr.matrix;
+ import java.util.Arrays;
+ import java.util.Iterator;
+
+-import com.github.fommil.netlib.LAPACK;
++import org.netlib.lapack.LAPACK;
+ import org.netlib.util.intW;
+
+ /**
+diff --git a/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java b/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java
+index 19ff7f4..7e57f37 100644
+--- a/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java
++++ b/src/main/java/no/uib/cipr/matrix/sparse/ArpackSym.java
+@@ -1,6 +1,6 @@
+ package no.uib.cipr.matrix.sparse;
+
+-import com.github.fommil.netlib.ARPACK;
++import org.netlib.arpack.ARPACK;
+ import lombok.extern.java.Log;
+ import no.uib.cipr.matrix.*;
+ import org.netlib.util.doubleW;
+diff --git a/src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java b/src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java
+index 3b2b953..8e844a8 100644
+--- a/src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java
++++ b/src/main/java/no/uib/cipr/matrix/sparse/CompRowMatrix.java
+@@ -37,7 +37,7 @@ import no.uib.cipr.matrix.io.MatrixInfo;
+ import no.uib.cipr.matrix.io.MatrixSize;
+ import no.uib.cipr.matrix.io.MatrixVectorReader;
+
+-import com.github.fommil.netlib.BLAS;
++import org.netlib.blas.BLAS;
+
+ /**
+ * Compressed row storage (CRS) matrix
diff --git a/debian/patches/series b/debian/patches/series
index 61a6094..35808d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use_debian_jar_files.patch
+0002-use_netlib_java_debian_lib.patch
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
index c9a7d27..d6ab0ca 100644
--- a/debian/patches/use_debian_jar_files.patch
+++ b/debian/patches/use_debian_jar_files.patch
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 4 Sep 2015 07:59:24 +0000
+Subject: use_debian_jar_files
+
+---
+ build.xml | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index e5d049d..b1d0feb 100644
--- a/build.xml
+++ b/build.xml
@@ -2,18 +2,28 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmtj-java.git
More information about the pkg-java-commits
mailing list