[libmtj-java] 01/02: Revert to old state of 0.9.14+dfsg-2
Andreas Tille
tille at debian.org
Fri May 20 19:10:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libmtj-java.
commit 738a57c64751d52943f34168eb3f6c3004ae3961
Author: Andreas Tille <tille at debian.org>
Date: Fri May 20 21:05:34 2016 +0200
Revert to old state of 0.9.14+dfsg-2
---
debian/changelog | 17 -
debian/control | 26 +-
debian/copyright | 5 +
debian/get-orig-source | 37 ++
debian/libmtj-java.poms | 28 --
debian/libmtj-java.substvars | 8 -
debian/maven.cleanIgnoreRules | 1 -
debian/maven.ignoreRules | 2 -
debian/maven.publishedRules | 1 -
debian/maven.rules | 3 -
debian/mtj-maven-1.0.4.pom | 241 -------------
.../patches/0002-use_netlib_java_debian_lib.patch | 382 ---------------------
debian/patches/series | 2 +-
debian/patches/use_debian_jar_files.patch | 21 ++
debian/rules | 11 +-
debian/watch | 5 +-
16 files changed, 82 insertions(+), 708 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 185b01b..38d22aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,3 @@
-mtj (1.0.4-1) UNRELEASED; urgency=medium
-
- * New upstream version
- * d/watch: moved to Github
- * d/get-orig-source: deleted since no need to repack any more
- * Move from Debian Med team to pkg-java team maintenance
- * Build system switched from ant to maven - add mh_make output files
- * cme fix dpkg-control
- * Add maven artifacts file from
- http://search.maven.org/#search|ga|1|mtj
-
- [ 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
-
- -- Andreas Tille <tille at debian.org> Thu, 28 Aug 2014 14:31:28 +0200
-
mtj (0.9.14+dfsg-2) unstable; urgency=low
* Upload to unstable
diff --git a/debian/control b/debian/control
index a8bf19e..09bda7a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,16 @@
Source: mtj
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>
Section: contrib/java
-XS-Autobuild: no
Priority: optional
Build-Depends: debhelper (>= 9),
javahelper,
- default-jdk,
- maven-debian-helper,
- libnetlib-java,
- libopencsv-java,
- libguava-java,
- libmaven-install-plugin-java,
- libmaven-deploy-plugin-java,
- libmaven-cobertura-plugin-java,
- libmaven-assembly-plugin-java,
- libmaven-antrun-plugin-java,
- libmaven-javadoc-plugin-java,
- liblombok-java,
- junit4
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libmtj-java.git
-Vcs-Git: https://anonscm.debian.org/pkg-java/libmtj-java.git
+ default-jdk (>= 1:1.6),
+ ant,
+ libnetlib-java
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libmtj-java/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libmtj-java/trunk/
Homepage: http://code.google.com/p/matrix-toolkits-java/
Package: libmtj-java
@@ -62,3 +51,4 @@ Description: Java library for developing numerical applications (documentation)
a production environment.
.
This package contains the javadoc documentation files.
+
diff --git a/debian/copyright b/debian/copyright
index be0b6f5..094655a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,11 @@ Upstream-Name: matrix-toolkits-java
Upstream-Contact: Sam Halliday <Sam.Halliday at gmail.com>
Bjørn-Ove Heimsund <Bjorn.Ove.Heimsund at gmail.com>
Source: http://code.google.com/p/matrix-toolkits-java/downloads/list
+Files-Excluded:
+ *.jar
+ lib/junit/
+ lib/netlib-java/
+ javadoc/
Files: *
Copyright: 2008-2011 Sam Halliday <Sam.Halliday at gmail.com>
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..6f63632
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,37 @@
+#!/bin/sh
+# get source for libmtj-java and remove unneeded jars and binaries
+
+set -e
+NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+
+if ! echo $@ | grep -q upstream-version ; then
+ VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
+else
+ VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
+ if echo "$VERSION" | grep -q "upstream-version" ; then
+ echo "Unable to parse version number"
+ exit
+ fi
+fi
+
+# unmangle version
+UARCHIVEDIR=${NAME}-${VERSION}
+UPSTREAMARCHIVE=${UARCHIVEDIR}.zip
+
+mkdir -p ../tarballs
+cd ../tarballs
+mv ../${UPSTREAMARCHIVE} .
+unzip -q ${UPSTREAMARCHIVE}
+
+# Remove all *.jar files
+# rm -rf ${UARCHIVEDIR}/lib/*
+find ${UARCHIVEDIR} -name "*.jar" -delete
+find ${UARCHIVEDIR} -type d -empty -delete
+
+# Build process deletes javadoc first and rebuilds it afterwards
+# So it is reasonable to save space in the upstream tarball once
+# we are rebuilding it anyway
+rm -rf ${UARCHIVEDIR}/javadoc
+
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}"
+rm -rf ${UARCHIVEDIR}
diff --git a/debian/libmtj-java.poms b/debian/libmtj-java.poms
deleted file mode 100644
index 5ad70f2..0000000
--- a/debian/libmtj-java.poms
+++ /dev/null
@@ -1,28 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM and its artifact if any
-# --ignore-pom: don't install the POM. To use on POM files that are created
-# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install. [mh_install]
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar.
-# It will be installed with mh_install. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-# Empty by default. [mh_install]
-#
-pom.xml --no-parent --has-package-version
diff --git a/debian/libmtj-java.substvars b/debian/libmtj-java.substvars
deleted file mode 100644
index 5186b48..0000000
--- a/debian/libmtj-java.substvars
+++ /dev/null
@@ -1,8 +0,0 @@
-#List of dependencies for libmtj-java, generated for use by debian/control
-maven.CompileDepends=
-maven.UpstreamPackageVersion=1.0.4
-maven.Depends=
-maven.OptionalDepends=
-maven.TestDepends=
-maven.DocDepends=default-jdk-doc
-maven.DocOptionalDepends=
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
deleted file mode 100644
index 74a357d..0000000
--- a/debian/maven.ignoreRules
+++ /dev/null
@@ -1,2 +0,0 @@
-
-org.apache.maven.plugins maven-gpg-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.rules b/debian/maven.rules
deleted file mode 100644
index 22ee6b0..0000000
--- a/debian/maven.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-
-com.googlecode.matrix-toolkits-java mtj jar s/.*/debian/ * *
-junit junit jar s/4\..*/4.x/ * *
diff --git a/debian/mtj-maven-1.0.4.pom b/debian/mtj-maven-1.0.4.pom
deleted file mode 100644
index 6d53cd5..0000000
--- a/debian/mtj-maven-1.0.4.pom
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!--
- mvn release:clean
- mvn release:prepare
- mvn release:perform
- -->
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
-
- <groupId>com.googlecode.matrix-toolkits-java</groupId>
- <artifactId>mtj</artifactId>
- <version>1.0.4</version>
- <packaging>jar</packaging>
-
- <name>Matrix Toolkits for Java</name>
- <description>A comprehensive collection of matrix data structures, linear solvers, least squares methods,
- eigenvalue, and singular value decompositions.
- </description>
- <url>https://github.com/fommil/matrix-toolkits-java/</url>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Bjørn-Ove Heimsund</name>
- </developer>
- <developer>
- <name>Sam Halliday</name>
- <id>fommil</id>
- <email>sam.halliday at gmail.com</email>
- </developer>
- </developers>
-
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
-
- <scm>
- <url>https://github.com/fommil/matrix-toolkits-java</url>
- <connection>scm:git:git at github.com:fommil/matrix-toolkits-java.git</connection>
- <developerConnection>scm:git:git at github.com:fommil/matrix-toolkits-java.git</developerConnection>
- </scm>
- <issueManagement>
- <system>github</system>
- <url>https://github.com/fommil/matrix-toolkits-java/issues</url>
- </issueManagement>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>sonatype-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>sonatype-releases</id>
- <url>https://oss.sonatype.org/content/repositories/releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- mvn versions:display-dependency-updates -->
- <dependencies>
- <dependency>
- <groupId>com.github.fommil.netlib</groupId>
- <artifactId>all</artifactId>
- <version>1.1.2</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.16.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.github.fommil</groupId>
- <artifactId>java-logging</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- mvn versions:display-plugin-updates -->
- <!-- mvn tidy:pom -->
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <systemProperties>
- <!--
- <property>
- <name>java.util.logging.config.file</name>
- <value>${project.build.directory}/test-classes/logging.properties</value>
- </property>
- -->
- <!-- force the java implementation of netlib-java
- <property>
- <name>com.github.fommil.netlib.BLAS</name>
- <value>com.github.fommil.netlib.F2jBLAS</value>
- </property>
- <property>
- <name>com.github.fommil.netlib.LAPACK</name>
- <value>com.github.fommil.netlib.F2jLAPACK</value>
- </property>
- <property>
- <name>com.github.fommil.netlib.ARPACK</name>
- <value>com.github.fommil.netlib.F2jARPACK</value>
- </property>
- -->
- <!-- force the native ref implementation of netlib-java -->
- <!--
- <property>
- <name>com.github.fommil.netlib.BLAS</name>
- <value>com.github.fommil.netlib.NativeRefBLAS</value>
- </property>
- <property>
- <name>com.github.fommil.netlib.LAPACK</name>
- <value>com.github.fommil.netlib.NativeRefLAPACK</value>
- </property>
- <property>
- <name>com.github.fommil.netlib.ARPACK</name>
- <value>com.github.fommil.netlib.NativeRefARPACK</value>
- </property>
- -->
- </systemProperties>
- <forkCount>1</forkCount>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <compilerArgs>
- <arg>-Xlint:all</arg>
- <!-- <arg>-Werror</arg> -->
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <!-- For the benefit of java-matrix-benchmark -->
- <!-- mvn compile assembly:single -->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eluder.coveralls</groupId>
- <artifactId>coveralls-maven-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <format>xml</format>
- <maxmem>256m</maxmem>
- <check>
- <totalBranchRate>53</totalBranchRate>
- </check>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
- <configuration>
- <configFile>.formatting.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/debian/patches/0002-use_netlib_java_debian_lib.patch b/debian/patches/0002-use_netlib_java_debian_lib.patch
deleted file mode 100644
index 9bf09e2..0000000
--- a/debian/patches/0002-use_netlib_java_debian_lib.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-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(-)
-
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
---- 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;
-
---- 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;
-
---- 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;
-
- /**
---- 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;
-
---- 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;
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
---- 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;
-
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
-
- /**
---- 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;
---- 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 bba1400..61a6094 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0002-use_netlib_java_debian_lib.patch
+use_debian_jar_files.patch
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
new file mode 100644
index 0000000..a31a994
--- /dev/null
+++ b/debian/patches/use_debian_jar_files.patch
@@ -0,0 +1,21 @@
+--- 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>
+ </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"/>
+ </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
diff --git a/debian/rules b/debian/rules
index 5ae137a..d52d2e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,10 @@
JAVA_HOME=/usr/lib/jvm/default-java
%:
- dh $@ --buildsystem=maven --with javahelper
+ dh $@ --with javahelper
-override_dh_link:
- dh_link
- mh_installjar
- mh_installpom
+override_dh_auto_build:
+ dh_auto_build -- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+
+get-orig-source:
+ uscan --verbose --force-download
diff --git a/debian/watch b/debian/watch
index 632dd59..b7451b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,5 @@
version=3
-https://github.com/fommil/matrix-toolkits-java/releases .*/archive/mtj-(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+opts=dversionmangle=s/\+dfsg// \
+ http://code.google.com/p/matrix-toolkits-java/downloads/list?can=1 \
+ .*/mtj-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip) \
+ debian debian/get-orig-source
--
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