Bug#925559: unblock: netlib-java/0.9.3-5
Control: tags -1 - moreinfo
On Wed, Mar 27, 2019 at 06:32:00AM +0000, Niels Thykier wrote:
> > ++ URL url5 = new URL("file:///usr/share/java/jlapack-xerbla-0.8.jar");
> > ++ URL url6 = new URL("file:///build/netlib-java-0.9.3/build/classes/");
> ^^^^^^^^^^^^^^^^^^^^^^^^^
>
> Is this redundant or required for building the package. If it is the
> latter, then sadly we cannot rely on the build-path to be stable, so we
> will need a better fix (e.g. sbuild and pbuilder does not agree on the
> paths AFAIR and even if they did, I would probably still prefer a better
> fix).
Since it turned out that I got an identical result by simply droping
that URL I just removed it. Here is a full debdiff between the version
in testing and my latest upload (netlib-java_0.9.3-6):
diff -Nru netlib-java-0.9.3/debian/changelog netlib-java-0.9.3/debian/changelog
--- netlib-java-0.9.3/debian/changelog 2019-03-27 08:35:16.000000000 +0100
+++ netlib-java-0.9.3/debian/changelog 2019-01-13 21:11:05.000000000 +0100
@@ -1,16 +1,3 @@
-netlib-java (0.9.3-6) unstable; urgency=medium
-
- * Drop /build/netlib-java-0.9.3 from URLs
-
- -- Andreas Tille <tille@debian.org> Wed, 27 Mar 2019 08:35:16 +0100
-
-netlib-java (0.9.3-5) unstable; urgency=medium
-
- * Fix URLClassLoader
- Closes: #923759
-
- -- Andreas Tille <tille@debian.org> Tue, 26 Mar 2019 16:47:32 +0100
-
netlib-java (0.9.3-4) unstable; urgency=medium
* Deactivate watch file since in debian/README.source is declared that
diff -Nru netlib-java-0.9.3/debian/patches/add_compile_target.patch netlib-java-0.9.3/debian/patches/add_compile_target.patch
--- netlib-java-0.9.3/debian/patches/add_compile_target.patch 1970-01-01 01:00:00.000000000 +0100
+++ netlib-java-0.9.3/debian/patches/add_compile_target.patch 2019-01-13 21:11:05.000000000 +0100
@@ -0,0 +1,26 @@
+--- a/build.xml
++++ b/build.xml
+@@ -2,6 +2,7 @@
+ <project name="org.netlib" default="default" basedir=".">
+ <description>Builds, tests, and runs the project org.netlib.</description>
+ <property name="version" value="0.9.3" />
++ <property name="src.dir" value="src"/>
+ <!-- REMINDER: When bumping the version value, also bump the value in jni/configure -->
+ <import file="nbproject/build-impl.xml"/>
+
+@@ -23,6 +24,15 @@
+ </delete>
+ <delete dir="jni/ARPACK"/>
+ </target>
++ <target name="compile" description="compiles netlib code">
++<!-- classpath="/usr/share/java/jlapack-blas.jar:
++ /usr/share/java/jlapack-lapack.jar:
++ " -->
++ <javac srcdir="${src.dir}"
++ sourcepath="${src.dir}"
++ debug="true">
++ </javac>
++ </target>
+ <target name="generate" depends="compile">
+ <!-- Autogenerate the Java and C files -->
+ <java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" />
diff -Nru netlib-java-0.9.3/debian/patches/series netlib-java-0.9.3/debian/patches/series
--- netlib-java-0.9.3/debian/patches/series 2019-03-27 08:35:16.000000000 +0100
+++ netlib-java-0.9.3/debian/patches/series 2019-01-13 21:11:05.000000000 +0100
@@ -1,2 +1,2 @@
update_classpath.patch
-URLClassLoader.patch
+add_compile_target.patch
diff -Nru netlib-java-0.9.3/debian/patches/URLClassLoader.patch netlib-java-0.9.3/debian/patches/URLClassLoader.patch
--- netlib-java-0.9.3/debian/patches/URLClassLoader.patch 2019-03-27 08:35:16.000000000 +0100
+++ netlib-java-0.9.3/debian/patches/URLClassLoader.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Mon, 25 Mar 2019 14:44:22 +0100
-Bug-Debian: https://bugs.debian.org/923759
-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
-@@ -51,6 +51,8 @@ import org.netlib.util.doubleW;
- import org.netlib.util.floatW;
- import org.netlib.util.intW;
-
-+import java.net.MalformedURLException;
-+
- /**
- * Due to the depressing number of LAPACK routines, it is much more efficient to
- * auto-generate the Java code for the wrapper and corresponding Java and JNI
-@@ -643,7 +645,8 @@ class JavaGenerator {
- * @return all classes in a given package
- * @see http://forum.java.sun.com/thread.jspa?threadID=757391&messageID=4326850
- */
-- private List<Class<?>> getClasses(String packageName, IClassFilter filter) {
-+ private List<Class<?>> getClasses(String packageName, IClassFilter filter)
-+ throws MalformedURLException{
- String packagePath = packageName.replace('.', '/');
- // ArrayList<URL> classpath = new ArrayList<URL>();
- // String[] classpathString = System.getProperty("java.class.path").split(":");
-@@ -658,7 +661,13 @@ class JavaGenerator {
- // log(Level.SEVERE, classpathString[i] + " " + ex.getMessage());
- // }
- // }
-- URL [] classpath = ((URLClassLoader) ClassLoader.getSystemClassLoader()).getURLs();
-+ URL url1 = new URL("file:///usr/share/java/junit-3.8.2.jar");
-+ URL url2 = new URL("file:///usr/share/java/f2jutil-0.8.1.jar");
-+ 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 [] classpath = { url1, url2, url3, url4, url5 };
- List<Class<?>> result = new ArrayList<Class<?>>();
- System.out.println(Arrays.toString(classpath));
- for (URL url : classpath) {
Kind regards
Andreas.
--
http://fam-tille.de
Reply to: