diff -Nru openjdk-lts-11~28/debian/changelog openjdk-lts-11~28/debian/changelog --- openjdk-lts-11~28/debian/changelog 2018-10-03 02:16:04.000000000 +0000 +++ openjdk-lts-11~28/debian/changelog 2018-10-10 19:10:01.000000000 +0000 @@ -1,3 +1,16 @@ +openjdk-lts (11~28-3ubuntu2) cosmic; urgency=medium + + * debian/rules: + - limit the tests that we run for the hotspot, langtools, + and jdk testsuites to improve build times and also to + prevent running unstable or failing tests. + - fix 'if' clause for definition of the TIME command. + - remove guava jar from test classpath, no longer required. + * debian/control, debian/control.in: add a breaks clause to + clojure1.8 <= 1.8.0-7ubuntu1~. + + -- Tiago Stürmer Daitx Wed, 10 Oct 2018 19:10:01 +0000 + openjdk-lts (11~28-3ubuntu1) cosmic; urgency=medium * Sync packages with 11~28-3. diff -Nru openjdk-lts-11~28/debian/control openjdk-lts-11~28/debian/control --- openjdk-lts-11~28/debian/control 2018-10-03 02:16:04.000000000 +0000 +++ openjdk-lts-11~28/debian/control 2018-10-10 19:10:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: openjdk-lts Section: java Priority: optional -Maintainer: OpenJDK Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Matthias Klose Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), m4, lsb-release, zip, unzip, @@ -57,6 +58,7 @@ java9-runtime-headless, java10-runtime-headless, java11-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides} +Breaks: clojure1.8 (<= 1.8.0-7ubuntu1~) Conflicts: oracle-java11-installer, openjdk-11-jdk-headless (<< 11~18-2) Replaces: openjdk-11-jdk-headless (<< 11~18-2) Description: OpenJDK Java runtime, using ${vm:Name} (headless) diff -Nru openjdk-lts-11~28/debian/control.in openjdk-lts-11~28/debian/control.in --- openjdk-lts-11~28/debian/control.in 2018-10-03 02:16:04.000000000 +0000 +++ openjdk-lts-11~28/debian/control.in 2018-10-10 19:10:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: openjdk-lts Section: java Priority: optional -Maintainer: OpenJDK Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Matthias Klose Build-Depends: @bd_debhelper@ m4, lsb-release, zip, unzip, @@ -57,6 +58,7 @@ java9-runtime-headless, java10-runtime-headless, java11-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides} +Breaks: clojure1.8 (<= 1.8.0-7ubuntu1~) Conflicts: oracle-java11-installer, openjdk-11-jdk-headless (<< 11~18-2) Replaces: openjdk-11-jdk-headless (<< 11~18-2) Description: OpenJDK Java runtime, using ${vm:Name} (headless) diff -Nru openjdk-lts-11~28/debian/rules openjdk-lts-11~28/debian/rules --- openjdk-lts-11~28/debian/rules 2018-10-03 02:16:04.000000000 +0000 +++ openjdk-lts-11~28/debian/rules 2018-10-10 19:10:01.000000000 +0000 @@ -12,7 +12,7 @@ SHELL = /bin/bash # use gnu time in verbose mode if available, otherwise default to the shell builtin -ifeq (,$(wildcard /usr/bin/time)) +ifneq (,$(wildcard /usr/bin/time)) TIME = /usr/bin/time -v else TIME = time @@ -1066,8 +1066,8 @@ -jdk:$(builddir)/$(sdkimg) \ $(JTREG_OPTIONS) \ -exclude:test/hotspot/jtreg/ProblemList.txt \ - -cpa:/usr/share/java/guava.jar \ - $(CURDIR)/$(srcdir)/test/hotspot/jtreg \ + -dir:$(CURDIR)/$(srcdir)/test/hotspot/jtreg \ + :hotspot_compiler :hotspot_gc :hotspot_runtime :hotspot_serviceability \ | tee jtreg-test-output/$@.log check-langtools: stamps/build @@ -1078,8 +1078,8 @@ -jdk:$(builddir)/$(sdkimg) \ $(JTREG_OPTIONS) \ -exclude:test/langtools/ProblemList.txt \ - -cpa:/usr/share/java/guava.jar \ - $(CURDIR)/$(srcdir)/test/langtools \ + -dir:$(CURDIR)/$(srcdir)/test/langtools \ + jdk tools lib | tee jtreg-test-output/$@.log check-nashorn: stamps/build @@ -1090,7 +1090,6 @@ -jdk:$(builddir)/$(sdkimg) \ $(JTREG_OPTIONS) \ -exclude:test/nashorn/ProblemList.txt \ - -cpa:/usr/share/java/guava.jar \ $(CURDIR)/$(srcdir)/test/nashorn \ | tee jtreg-test-output/$@.log @@ -1102,7 +1101,6 @@ -jdk:$(builddir)/$(sdkimg) \ $(JTREG_OPTIONS) \ -exclude:test/jaxp/ProblemList.txt \ - -cpa:/usr/share/java/guava.jar \ $(CURDIR)/$(srcdir)/test/jaxp \ | tee jtreg-test-output/$@.log @@ -1117,8 +1115,8 @@ -jdk:$(builddir)/$(sdkimg) \ $(JTREG_OPTIONS) \ -exclude:test/jdk/ProblemList.txt \ - -cpa:/usr/share/java/guava.jar \ - $(CURDIR)/$(srcdir)/test/jdk \ + -dir:$(CURDIR)/$(srcdir)/test/jdk \ + :jdk_stable \ | tee jtreg-test-output/$@.log # FIXME: this might need some adjustment for other OS than Linux