debian/changelog

+jblas (1.2.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898227)
+  * Removed Soeren Sonnenburg from the uploaders (Closes: #881836)
+  * Removed the build conflict with locales-all
+  * Merged and simplified the Java 9 patches
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 09 May 2018 00:30:33 +0200
+
 jblas (1.2.4-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,21 +2,18 @@ Source: jblas
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders:
- Soeren Sonnenburg <sonne@debian.org>,
  Torsten Werner <twerner@debian.org>,
  tony mancill <tmancill@debian.org>
 Build-Depends:
  ant-optional,
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  gfortran,
  junit4,
  libatlas-base-dev,
  locales,
  ruby
-Build-Conflicts:
- locales-all
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
 Section: science
 Homepage: http://jblas.org
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jblas.git

debian/patches/java10.patch

+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -139,23 +139,11 @@
+         </javac>
+     </target>
+     <target name="javah" depends="prepare" description="run javah">
+-        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
++        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes" nativeHeaderDir="${include}">
+             <src path="${src}" />
+             <include name="**/NativeBlas.java" />
+             <include name="**/ArchFlavor.java" />
+         </javac>
+-        <javah destdir="${include}" force="yes">
+-            <class name="${pkgbase}.NativeBlas" />
+-            <classpath>
+-                <pathelement path="${bin}" />
+-            </classpath>
+-        </javah>
+-        <javah destdir="${include}" force="yes">
+-            <class name="org.jblas.util.ArchFlavor" />
+-            <classpath>
+-                <pathelement path="${bin}" />
+-            </classpath>
+-        </javah>
+     </target>
+     <target name="generate-float" depends="preprocess" description="generate float versions of classes">
+         <class-to-float class="${pkgbase}.DoubleMatrix"/>

debian/patches/java9-part2.patch

-From 49d1f77e1da8d2fdba54ff2b8d35a36d7403724d Mon Sep 17 00:00:00 2001
-From: "Chris West (Faux)" <git@goeswhere.com>
-Date: Wed, 23 Aug 2017 20:41:39 +0100
-Subject: [PATCH] java9: remove /jre suffix iff it's present
-
----
- config/config_java.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/config_java.rb b/config/config_java.rb
-index 4e309ec..f9c0f90 100644
---- a/config/config_java.rb
-+++ b/config/config_java.rb
-@@ -55,7 +55,7 @@
-   if ENV.include? 'JAVA_HOME'
-     java_home = ENV['JAVA_HOME']
-   else
--    java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
-+    java_home = dir(%x(java -cp config PrintProperty java.home).chomp.gsub(/\/jre$/, ''))
-   end
-   #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
-   #  java_home = File.join(java_home, 'Home')

debian/patches/java9.patch

-From 999ff7186a756751ea03ca2b53e2af783135900e Mon Sep 17 00:00:00 2001
+From 49d1f77e1da8d2fdba54ff2b8d35a36d7403724d Mon Sep 17 00:00:00 2001
 From: "Chris West (Faux)" <git@goeswhere.com>
-Date: Wed, 23 Aug 2017 20:32:09 +0100
-Subject: [PATCH] java9: use -source/-target 1.6 as 1.5 is unsupported
+Date: Wed, 23 Aug 2017 20:41:39 +0100
+Subject: [PATCH] java9: remove /jre suffix iff it's present
 
 ---
- build.xml | 6 +++---
- pom.xml   | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 3092333..87a6117 100644
---- a/build.xml
-+++ b/build.xml
-@@ -126,12 +126,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-         <mkdir dir="${bin}" />
-     </target>
-     <target name="compile" depends="prepare,generate-float" description="compile java code">
--        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
-             <src path="${src}" />
-         </javac>
-     </target>
-     <target name="compile-test" depends="compile" description="compile java test code">
--        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
-             <src path="${test}" />
-             <classpath>
-                 <pathelement location="${external}/junit-4.8.2.jar" />
-@@ -139,7 +139,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-         </javac>
-     </target>
-     <target name="javah" depends="prepare" description="run javah">
--        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
-             <src path="${src}" />
-             <include name="**/NativeBlas.java" />
-             <include name="**/ArchFlavor.java" />
-diff --git a/pom.xml b/pom.xml
-index e67ff5e..e6dccf0 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -58,8 +58,8 @@
-         <artifactId>maven-compiler-plugin</artifactId>
-         <version>2.3.2</version>
-         <configuration>
--          <source>1.5</source>
--          <target>1.5</target>
-+          <source>1.6</source>
-+          <target>1.6</target>
-         </configuration>
-       </plugin>
+ config/config_java.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/config/config_java.rb b/config/config_java.rb
+index 4e309ec..f9c0f90 100644
+--- a/config/config_java.rb
++++ b/config/config_java.rb
+@@ -55,7 +55,7 @@
+   if ENV.include? 'JAVA_HOME'
+     java_home = ENV['JAVA_HOME']
+   else
+-    java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
++    java_home = dir(%x(java -cp config PrintProperty java.home).chomp.gsub(/\/jre$/, ''))
+   end
+   #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
+   #  java_home = File.join(java_home, 'Home')

debian/patches/series

@@ -2,4 +2,4 @@ version-property.patch
 debug-symbols.patch
 javadoc.patch
 java9.patch
-java9-part2.patch
+java10.patch

debian/rules

@@ -48,7 +48,3 @@ else
 	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH)
 endif
 	dh_auto_test
-
-get-orig-source:
-	-uscan --force-download --download-current-version
-	@echo successfully retrieved upstream tarball