diff -Nru groovy-2.4.15/debian/changelog groovy-2.4.15/debian/changelog --- groovy-2.4.15/debian/changelog 2018-04-21 00:33:44.000000000 +0100 +++ groovy-2.4.15/debian/changelog 2018-09-24 13:19:05.000000000 +0100 @@ -1,13 +1,31 @@ -groovy (2.4.15-1ubuntu1) bionic; urgency=medium +groovy (2.4.15-3ubuntu1) cosmic; urgency=medium - * Replace HTTP URLs with local files: LP: #1765885. + * Merge from Debian unstable. Remaining changes: (LP: #1794129) + - Replace HTTP URLs with local files: LP: #1765885. - debian/control: build depends on -doc packages so javadoc can properly link the apis. - - debian/patches/10_use_local_docs.patch, debian/control: include - javadoc apis locally as invalid, unreacheable, or nonexistent - links cause the build to faild with openjdk-10. + - debian/patches/10_fix_javadoc_links.patch: include javadoc apis + locally, since openjdk 10 any invalid, unreacheable, or + nonexistent doc link causes the build to fail. - -- Tiago Stürmer Daitx Fri, 20 Apr 2018 23:33:44 +0000 + -- Tiago Stürmer Daitx Mon, 24 Sep 2018 12:19:05 +0000 + +groovy (2.4.15-3) unstable; urgency=medium + + * Team upload. + * Drop build-dep on default-jdk-headless | default-jdk in favor of + simply default-jdk to address FTBFS. (Closes: #904783) + * Bump Standards-Version to 4.2.1 + + -- tony mancill Tue, 04 Sep 2018 21:00:55 -0700 + +groovy (2.4.15-2) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 10 (Closes: #897612) + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg Thu, 17 May 2018 10:10:18 +0200 groovy (2.4.15-1) unstable; urgency=medium diff -Nru groovy-2.4.15/debian/control groovy-2.4.15/debian/control --- groovy-2.4.15/debian/control 2018-04-21 00:33:44.000000000 +0100 +++ groovy-2.4.15/debian/control 2018-09-24 13:19:05.000000000 +0100 @@ -6,12 +6,13 @@ Uploaders: Felix Natter Build-Depends: ant, + ant-doc, ant-optional, antlr, bnd (>= 2.1.0), debhelper (>= 11), + default-jdk, default-jdk-doc, - default-jdk-headless | default-jdk, gradle-debian-helper, ivy, junit4, @@ -32,9 +33,9 @@ maven-repo-helper, testng, unzip -Standards-Version: 4.1.4 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/groovy.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/groovy.git +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/groovy.git +Vcs-Browser: https://salsa.debian.org/java-team/groovy Homepage: http://www.groovy-lang.org Package: groovy diff -Nru groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch --- groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch 1970-01-01 01:00:00.000000000 +0100 +++ groovy-2.4.15/debian/patches/10_fix_javadoc_links.patch 2018-09-24 13:19:05.000000000 +0100 @@ -0,0 +1,35 @@ +Description: Use local javadoc links to avoid a build failure with Java 10 +Author: Emmanuel Bourg +Forwarded: not-needed +--- a/gradle/docs.gradle ++++ b/gradle/docs.gradle +@@ -33,9 +33,9 @@ def javadocSpec = { + overview = rootProject.file('src/main/overviewj.html') + footer = doc.footer + source = rootProject.useIndy()?'1.7':'1.6' +- links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/', +- 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/', +- 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/') ++ links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jre/api/', ++ 'file:///usr/share/doc/libservlet3.1-java-doc/api', ++ 'file:///usr/share/doc/junit4/api/') + } + } + +@@ -53,12 +53,10 @@ def groovydocSpec = { + overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) + } + includePrivate = false +- link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 'javax.management.' +- link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' +- link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.' +- link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.' +- link 'http://www.antlr2.org/javadoc/', 'antlr.' +- link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.' ++ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.' ++ link 'file:///usr/share/doc/default-jre/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' ++ link 'file:///usr/share/doc/ant/api/', 'org.apache.tools.ant.' ++ link 'file:///usr/share/doc/junit4/api/', 'org.junit.' + } + + allprojects { diff -Nru groovy-2.4.15/debian/patches/10_use_local_docs.patch groovy-2.4.15/debian/patches/10_use_local_docs.patch --- groovy-2.4.15/debian/patches/10_use_local_docs.patch 2018-04-21 00:33:44.000000000 +0100 +++ groovy-2.4.15/debian/patches/10_use_local_docs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ ---- a/gradle/docs.gradle -+++ b/gradle/docs.gradle -@@ -33,9 +33,11 @@ def javadocSpec = { - overview = rootProject.file('src/main/overviewj.html') - footer = doc.footer - source = rootProject.useIndy()?'1.7':'1.6' -- links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/', -- 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/', -- 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/') -+ //links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/', -+ // 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/', -+ // 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/') -+ links('file:///usr/share/doc/default-jdk-doc/api/', 'file:///usr/share/doc/libservlet3.1-java-doc/api', -+ 'file:///usr/share/doc/junit4/api/') - } - } - -@@ -53,12 +55,14 @@ def groovydocSpec = { - overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) - } - includePrivate = false -- link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 'javax.management.' -- link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' -- link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.' -- link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.' -- link 'http://www.antlr2.org/javadoc/', 'antlr.' -- link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.' -+ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.' -+ link 'file:///usr/share/doc/default-jdk-doc/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' -+ link 'file:///usr/share/doc/ant/api/', 'org.apache.tools.ant.' -+ link 'file:///usr/share/doc/junit4/api/', 'org.junit.' -+ //link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.' -+ //link 'http://junit.org/junit4/javadoc/latest/', 'junit.' -+ //link 'http://www.antlr2.org/javadoc/', 'antlr.' -+ //link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.' - } - - allprojects { diff -Nru groovy-2.4.15/debian/patches/series groovy-2.4.15/debian/patches/series --- groovy-2.4.15/debian/patches/series 2018-04-21 00:33:44.000000000 +0100 +++ groovy-2.4.15/debian/patches/series 2018-09-05 05:00:55.000000000 +0100 @@ -8,4 +8,4 @@ transition_Gradle_3.1.patch 08_GROOVY-8163.patch 09_ignore_buildscan.patch -10_use_local_docs.patch +10_fix_javadoc_links.patch