diff -Nru starjava-util-1.0+2017.09.28/debian/changelog starjava-util-1.0+2017.09.28/debian/changelog --- starjava-util-1.0+2017.09.28/debian/changelog 2018-03-29 11:46:05.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/changelog 2018-03-30 12:33:18.000000000 +0000 @@ -1,8 +1,12 @@ -starjava-util (1.0+2017.09.28-1ubuntu1) bionic; urgency=medium +starjava-util (1.0+2017.09.28-2) unstable; urgency=medium - * Disable the autopkg test, not working with OpenJDK 9. + * Update VCS fields to use salsa.d.o + * Fix URL comparison in testResourceStream() for Java 9 (Closes: #893529) + * Push Standards-Version to 4.1.3. No changes needed. + * Push compat to 11 + * Don't include ImageHolder.java in jar file - -- Matthias Klose Thu, 29 Mar 2018 19:46:05 +0800 + -- Ole Streicher Fri, 30 Mar 2018 14:33:18 +0200 starjava-util (1.0+2017.09.28-1) unstable; urgency=low diff -Nru starjava-util-1.0+2017.09.28/debian/compat starjava-util-1.0+2017.09.28/debian/compat --- starjava-util-1.0+2017.09.28/debian/compat 2017-03-24 16:08:16.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/compat 2018-03-30 12:11:11.000000000 +0000 @@ -1 +1 @@ -9 \ No newline at end of file +11 diff -Nru starjava-util-1.0+2017.09.28/debian/control starjava-util-1.0+2017.09.28/debian/control --- starjava-util-1.0+2017.09.28/debian/control 2017-10-03 13:11:52.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/control 2018-03-30 12:11:15.000000000 +0000 @@ -3,15 +3,15 @@ Uploaders: Ole Streicher Section: java Priority: optional -Build-Depends: ant, debhelper (>= 9), dh-exec, javahelper +Build-Depends: ant, debhelper (>= 11), dh-exec, javahelper Build-Depends-Indep: ant-optional, default-jdk, default-jdk-doc, junit, libcommons-compress-java -Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/starjava-util.git -Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/starjava-util.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/debian-astro-team/starjava-util +Vcs-Git: https://salsa.debian.org/debian-astro-team/starjava-util.git Homepage: https://github.com/Starlink/starjava/tree/master/util Package: starlink-util-java diff -Nru starjava-util-1.0+2017.09.28/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch starjava-util-1.0+2017.09.28/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch --- starjava-util-1.0+2017.09.28/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch 2017-10-03 13:04:47.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch 2018-03-30 12:32:09.000000000 +0000 @@ -21,11 +21,11 @@ * Don't sign the jarfile --- - build.xml | 50 +++++++++++++++++++++----------------------------- - 1 file changed, 21 insertions(+), 29 deletions(-) + build.xml | 52 ++++++++++++++++++++++------------------------------ + 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/build.xml b/build.xml -index 48f856c..9343d71 100644 +index 48f856c..4602b39 100644 --- a/build.xml +++ b/build.xml @@ -37,12 +37,6 @@ @@ -123,6 +123,15 @@ optimize="${optimize}"> +@@ -362,7 +357,7 @@ + ! (i.e. are discovered using "getResource()"). --> + + +- ++ + + + @@ -396,6 +391,10 @@ description="-> creates the package jar file"> diff -Nru starjava-util-1.0+2017.09.28/debian/patches/Fix-URL-comparison-in-testResourceStream-for-Java-9.patch starjava-util-1.0+2017.09.28/debian/patches/Fix-URL-comparison-in-testResourceStream-for-Java-9.patch --- starjava-util-1.0+2017.09.28/debian/patches/Fix-URL-comparison-in-testResourceStream-for-Java-9.patch 1970-01-01 00:00:00.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/patches/Fix-URL-comparison-in-testResourceStream-for-Java-9.patch 2018-03-30 12:31:42.000000000 +0000 @@ -0,0 +1,24 @@ +From: Ole Streicher +Date: Fri, 30 Mar 2018 13:58:05 +0200 +Subject: Fix URL comparison in testResourceStream() for Java 9 + +See https://github.com/Starlink/starjava/issues/22 for the upstream report. + +Closes: #893529 +--- + src/testcases/uk/ac/starlink/util/DataSourceTest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/testcases/uk/ac/starlink/util/DataSourceTest.java b/src/testcases/uk/ac/starlink/util/DataSourceTest.java +index e596115..69ad4bd 100644 +--- a/src/testcases/uk/ac/starlink/util/DataSourceTest.java ++++ b/src/testcases/uk/ac/starlink/util/DataSourceTest.java +@@ -116,7 +116,7 @@ public class DataSourceTest extends TestCase { + public void testResourceStream() { + assertEquals( "Object.class", rSrc.getName() ); + assertTrue( rSrc.getURL().toString() +- .endsWith( "!/java/lang/Object.class" ) ); ++ .endsWith( "/java/lang/Object.class" ) ); + } + + private static byte[] fillBuffer1( InputStream istrm ) throws IOException { diff -Nru starjava-util-1.0+2017.09.28/debian/patches/series starjava-util-1.0+2017.09.28/debian/patches/series --- starjava-util-1.0+2017.09.28/debian/patches/series 2017-10-03 13:10:55.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/patches/series 2018-03-30 12:31:42.000000000 +0000 @@ -1,3 +1,4 @@ Fix-build.xml-for-use-outside-of-starjava.patch Use-commons-compress-instead-of-apache-ant.patch Remove-reference-to-sun.awt.shell.ShellFolder.patch +Fix-URL-comparison-in-testResourceStream-for-Java-9.patch diff -Nru starjava-util-1.0+2017.09.28/debian/patches/Use-commons-compress-instead-of-apache-ant.patch starjava-util-1.0+2017.09.28/debian/patches/Use-commons-compress-instead-of-apache-ant.patch --- starjava-util-1.0+2017.09.28/debian/patches/Use-commons-compress-instead-of-apache-ant.patch 2017-10-03 13:04:47.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/patches/Use-commons-compress-instead-of-apache-ant.patch 2018-03-30 12:32:09.000000000 +0000 @@ -9,7 +9,7 @@ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/build.xml b/build.xml -index 9343d71..39549b3 100644 +index 4602b39..256940f 100644 --- a/build.xml +++ b/build.xml @@ -190,9 +190,11 @@ diff -Nru starjava-util-1.0+2017.09.28/debian/rules starjava-util-1.0+2017.09.28/debian/rules --- starjava-util-1.0+2017.09.28/debian/rules 2018-03-29 11:46:05.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/rules 2017-03-24 16:08:16.000000000 +0000 @@ -7,8 +7,8 @@ ant jars ant javadocs -#override_dh_auto_test: -# ant test -Djava.awt.headless=true +override_dh_auto_test: + ant test -Djava.awt.headless=true get-orig-source: svn export https://github.com/Starlink/starjava/trunk/util starjava-util ; \ diff -Nru starjava-util-1.0+2017.09.28/debian/tests/control starjava-util-1.0+2017.09.28/debian/tests/control --- starjava-util-1.0+2017.09.28/debian/tests/control 2018-03-29 11:46:05.000000000 +0000 +++ starjava-util-1.0+2017.09.28/debian/tests/control 2017-03-24 16:08:16.000000000 +0000 @@ -1,6 +1,3 @@ -Test-Command: true +Test-Command: ant test -Dbuild.dir=$ADTTMP -Drunonly.install=true -Djunit.present=true -Djava.awt.headless=true Depends: starlink-util-java, ant, ant-optional, default-jdk, junit -#Test-Command: ant test -Dbuild.dir=$ADTTMP -Drunonly.install=true -Djunit.present=true -Djava.awt.headless=true -#Depends: starlink-util-java, -# ant, ant-optional, default-jdk, junit