debian/changelog

+netlib-java (0.9.3-6.1) unstable; urgency=medium
+
+  * Add patch to set source to 1.8 as 1.5 is not supported with JDK 11
+  * Add patch to fail on generate-task to not hide errors in build-output
+  * Add patch to use a fixed list for the classpath to allow building on JDK
+    11 (Closes: #923759)
+
+ -- Dominik Stadler (Ubuntu key) <dominik.stadler@gmx.at>  Tue, 26 Mar 2019 20:51:44 +0100
+
 netlib-java (0.9.3-6) unstable; urgency=medium
 
   * Drop /build/netlib-java-0.9.3 from URLs

debian/patches/URLClassLoader.patch

@@ -7,8 +7,10 @@ Subject: URLClassLoader
  src/org/netlib/generate/JavaGenerator.java | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
---- a/src/org/netlib/generate/JavaGenerator.java
-+++ b/src/org/netlib/generate/JavaGenerator.java
+Index: netlib-java/src/org/netlib/generate/JavaGenerator.java
+===================================================================
+--- netlib-java.orig/src/org/netlib/generate/JavaGenerator.java
++++ netlib-java/src/org/netlib/generate/JavaGenerator.java
 @@ -51,6 +51,8 @@ import org.netlib.util.doubleW;
  import org.netlib.util.floatW;
  import org.netlib.util.intW;
@@ -28,7 +30,7 @@ Subject: URLClassLoader
  		String packagePath = packageName.replace('.', '/');
  //		ArrayList<URL> classpath = new ArrayList<URL>();
  //		String[] classpathString = System.getProperty("java.class.path").split(":");
-@@ -658,7 +661,13 @@ class JavaGenerator {
+@@ -658,7 +661,14 @@ class JavaGenerator {
  //					log(Level.SEVERE, classpathString[i] + " " + ex.getMessage());
  //			}
  //		}
@@ -38,8 +40,19 @@ Subject: URLClassLoader
 +		URL url3 = new URL("file:///usr/share/java/jlapack-blas-0.8.jar");
 +		URL url4 = new URL("file:///usr/share/java/jlapack-lapack-0.8.jar");
 +		URL url5 = new URL("file:///usr/share/java/jlapack-xerbla-0.8.jar");
++		URL url6 = new URL("file://" + new File(".").getAbsolutePath() + "/build/classes/");
 +
-+		URL [] classpath = { url1, url2, url3, url4, url5 };
++		URL [] classpath = { url1, url2, url3, url4, url5, url6 };
  		List<Class<?>> result = new ArrayList<Class<?>>();
  		System.out.println(Arrays.toString(classpath));
  		for (URL url : classpath) {
+@@ -700,6 +710,9 @@ class JavaGenerator {
+ 				// class path is a directory
+ 				File packageDirectory =
+ 						new File(file.getPath() + "/" + packagePath);
++				if(packageDirectory.listFiles() == null) {
++					throw new IllegalStateException("Could not find directory " + packageDirectory + " at " + packageDirectory.getAbsolutePath());
++				}
+ 				for (File f : packageDirectory.listFiles()) {
+ 					if (f.getPath().endsWith(".class")) {
+ 						String className =

debian/patches/fail_when_generate_fails.patch

+Index: netlib-java/build.xml
+===================================================================
+--- netlib-java.orig/build.xml
++++ netlib-java/build.xml
+@@ -25,7 +25,7 @@
+ 	</target>
+ 	<target name="generate" depends="compile">
+ 		<!-- Autogenerate the Java and C files -->
+-		<java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" />
++		<java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" failonerror="true"/>
+ 	</target>
+ 	
+ 	<!--

debian/patches/series

 update_classpath.patch
+set_source_1_8.patch
 URLClassLoader.patch
+fail_when_generate_fails.patch

debian/patches/set_source_1_8.patch

+From: Dominik Stadler <dominik.stadler@gmx.at>
+Date: Tue, 26 Mar 2019 19:20:22 +0100
+Subject: set_source_1.8
+
+---
+Index: netlib-java/nbproject/project.properties
+===================================================================
+--- netlib-java.orig/nbproject/project.properties
++++ netlib-java/nbproject/project.properties
+@@ -28,8 +28,8 @@ javac.classpath=\
+ # Space-separated list of extra javac options
+ javac.compilerargs=
+ javac.deprecation=false
+-javac.source=1.5
+-javac.target=1.5
++javac.source=1.8
++javac.target=1.8
+ javac.test.classpath=\
+     ${javac.classpath}:\
+     ${build.classes.dir}:\