Tony Mancill pushed to branch master at Debian Java Maintainers / groovy
Commits: 3e7ca0d7 by tony mancill at 2018-10-19T02:47:20Z apply patch for 910098 Thank you to Tiago Stürmer Daitx for the patch! - - - - - 2e989116 by tony mancill at 2018-10-19T02:48:00Z interim changelog - - - - - c8a0ec58 by tony mancill at 2018-10-19T02:56:26Z Install groovyConsole desktop file (Closes: #879892) - - - - - d7affb4d by tony mancill at 2018-10-19T02:59:05Z interim changelog - - - - - 5 changed files: - debian/changelog - debian/control - debian/groovy.install - + debian/groovyConsole.desktop - debian/patches/10_fix_javadoc_links.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,21 @@ +groovy (2.4.15-4) UNRELEASED; urgency=medium + + * Team upload + + [ Tiago Stürmer Daitx ] + * Replace HTTP URLs with local files: (Closes: #910098) + - debian/control: build depends on -doc packages so javadoc can + properly link the apis. + - 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. + + [ tony mancill ] + * Add groovyConsole desktop file. (Closes: #879892) + Thank you to Dirk Heinrichs for the patch and reminder. + + -- tony mancill <[email protected]> Tue, 02 Oct 2018 17:04:35 -0700 + groovy (2.4.15-3) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -5,6 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Felix Natter <[email protected]> Build-Depends: ant, + ant-doc, ant-optional, antlr, bnd (>= 2.1.0), @@ -14,6 +15,7 @@ Build-Depends: gradle-debian-helper, ivy, junit4, + junit4-doc, libasm-java (>= 6.0~alpha-2~), libbsf-java, libcommons-cli-java, @@ -24,6 +26,7 @@ Build-Depends: libjline2-java, libqdox-java, libservlet3.1-java, + libservlet3.1-java-doc, libxstream-java, locales-all | language-pack-en, maven-repo-helper, @@ -75,7 +78,7 @@ Package: groovy-doc Section: doc Architecture: all Depends: ${misc:Depends} -Recommends: default-jdk-doc +Recommends: default-jdk-doc, juni4-doc, libservlet3.1-java-doc Suggests: groovy Description: Agile dynamic language for the Java Virtual Machine (documentation) Groovy is an agile dynamic language for the JVM combining lots of great ===================================== debian/groovy.install ===================================== @@ -8,3 +8,4 @@ target/distributions/bin/groovy-*/bin/java2groovy /usr/share/groovy/bin target/distributions/bin/groovy-*/bin/startGroovy /usr/share/groovy/bin target/distributions/bin/groovy-*/conf/* /etc/groovy target/distributions/bin/groovy-*/indy /usr/share/groovy +debian/groovyConsole.desktop /usr/share/applications ===================================== debian/groovyConsole.desktop ===================================== @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Groovy Console +Type=Application +Exec=/usr/bin/groovyConsole +Terminal=false +Comment=Groovy Script Console +NoDisplay=false +Categories=Development;IDE +Name[en]=Groovy Script Console \ No newline at end of file ===================================== debian/patches/10_fix_javadoc_links.patch ===================================== @@ -3,18 +3,20 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/gradle/docs.gradle +++ b/gradle/docs.gradle -@@ -33,9 +33,7 @@ +@@ -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/default-jre/api/') ++ links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jdk/api/', ++ 'file:///usr/share/doc/libservlet3.1-java-doc/api', ++ 'file:///usr/share/doc/junit4/api/') } } -@@ -53,12 +51,7 @@ +@@ -53,12 +53,10 @@ def groovydocSpec = { overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) } includePrivate = false @@ -24,7 +26,10 @@ Forwarded: not-needed - 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/default-jre/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' ++ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.' ++ link 'file:///usr/share/doc/default-jdk/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 { View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/486374b5567bbc965fbd49d6c83a548c8f320dcb...d7affb4d1ae112f18fab3dbe40a4e4d450128588 -- View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/486374b5567bbc965fbd49d6c83a548c8f320dcb...d7affb4d1ae112f18fab3dbe40a4e4d450128588 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
