diff -Nru gradle-debian-helper-1.6/debian/changelog gradle-debian-helper-1.6ubuntu1/debian/changelog --- gradle-debian-helper-1.6/debian/changelog 2017-09-25 19:33:01.000000000 -0300 +++ gradle-debian-helper-1.6ubuntu1/debian/changelog 2018-04-20 22:26:08.000000000 -0300 @@ -1,3 +1,11 @@ +gradle-debian-helper (1.6ubuntu1) UNRELEASED; urgency=medium + + * Replace javadoc link with default-jdk-doc directory instead of + default-jdk. LP: #1765883. + * debian/control: add runtime dependency to default-jdk-doc. + + -- Tiago Stürmer Daitx Sat, 21 Apr 2018 01:26:08 +0000 + gradle-debian-helper (1.6) unstable; urgency=medium * Team upload. diff -Nru gradle-debian-helper-1.6/debian/control gradle-debian-helper-1.6ubuntu1/debian/control --- gradle-debian-helper-1.6/debian/control 2017-09-25 19:32:24.000000000 -0300 +++ gradle-debian-helper-1.6ubuntu1/debian/control 2018-04-20 22:26:08.000000000 -0300 @@ -1,7 +1,8 @@ Source: gradle-debian-helper Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg , Kai-Chung Yan Build-Depends: debhelper (>= 10), default-jdk-headless | default-jdk, maven-debian-helper, gradle (>= 3.2) @@ -11,7 +12,7 @@ Package: gradle-debian-helper Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, maven-repo-helper, gradle (>= 3.2) +Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, default-jdk-doc, maven-repo-helper, gradle (>= 3.2) Recommends: debhelper Description: Helper tools for building Debian packages with Gradle gradle-debian-helper contains helper tools to ease the packaging of Gradle diff -Nru gradle-debian-helper-1.6/gradle-helper-plugin/src/main/java/org/debian/gradle/DebianHelperPlugin.java gradle-debian-helper-1.6ubuntu1/gradle-helper-plugin/src/main/java/org/debian/gradle/DebianHelperPlugin.java --- gradle-debian-helper-1.6/gradle-helper-plugin/src/main/java/org/debian/gradle/DebianHelperPlugin.java 2016-12-14 10:45:27.000000000 -0200 +++ gradle-debian-helper-1.6ubuntu1/gradle-helper-plugin/src/main/java/org/debian/gradle/DebianHelperPlugin.java 2018-04-20 22:26:08.000000000 -0300 @@ -42,7 +42,7 @@ Javadoc javadocTask = ((Javadoc)(project.getTasksByName("javadoc", false).toArray()[0])); if (javadocTask.getOptions() instanceof StandardJavadocDocletOptions) { log.info("\tConfiguring javadoc links"); - ((StandardJavadocDocletOptions)(javadocTask.getOptions())).getLinks().add(0, "file:///usr/share/doc/default-jdk/api"); + ((StandardJavadocDocletOptions)(javadocTask.getOptions())).getLinks().add(0, "file:///usr/share/doc/default-jdk-doc/api"); } } }