This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 5f9672491a580e41be1a80bdf2abb532210f64f0 Author: Miguel Landaeta <[email protected]> Date: Sun May 29 15:20:45 2011 -0430 Link javadocs to system javadocs --- debian/changelog | 3 ++- debian/control | 5 +++-- debian/patches/13_fix_javadocs_links.diff | 19 +++++++++++++++++++ debian/patches/series | 1 + subprojects/docs/docs.gradle | 5 +++-- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a40377f..1afd4b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ gradle (1.0~m3-1) UNRELEASED; urgency=low * Fix missing-classpath lintian warnings. * Update copyright dates and make it DEP-5 compliant. * Add README.source. + * Link javadocs to system javadocs. - -- Miguel Landaeta <[email protected]> Sun, 29 May 2011 09:59:51 -0430 + -- Miguel Landaeta <[email protected]> Sun, 29 May 2011 15:17:14 -0430 gradle (0.9.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 97b850f..15abf65 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, libplexus-utils-java, libwagon-java, libcodenarc-groovy-java, checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd, - libservlet2.5-java, libjetty-java, libjetty-extra-java, ant-optional (>= 1.8) + libservlet2.5-java, libjetty-java, libjetty-extra-java, ant-optional (>= 1.8), + default-jdk-doc, groovy-doc, libmaven2-core-java-doc Standards-Version: 3.9.2 Homepage: http://gradle.org/ Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git @@ -238,7 +239,7 @@ Architecture: all Section: doc Depends: ${misc:Depends} Recommends: libgradle-core-java (= ${binary:Version}) -Suggests: default-jdk-doc, groovy-doc +Suggests: default-jdk-doc, groovy-doc, libmaven2-core-java-doc Description: Documentation for gradle Documentation for the Gradle core library. . diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff new file mode 100644 index 0000000..251492e --- /dev/null +++ b/debian/patches/13_fix_javadocs_links.diff @@ -0,0 +1,19 @@ +Description: Link javadocs with local -doc packages +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2011-05-29 + +--- gradle-1.0~m3.orig/subprojects/docs/docs.gradle ++++ gradle-1.0~m3/subprojects/docs/docs.gradle +@@ -238,8 +238,9 @@ task javadoc(type: Javadoc) { + include 'org/gradle/testfixtures/**' + include 'org/gradle/tooling/**' + exclude '**/internal/**' +- options.links("http://download.oracle.com/javase/1.5.0/docs/api";, "http://groovy.codehaus.org/gapi/";, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, +- "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) ++ //options.links("http://download.oracle.com/javase/1.5.0/docs/api";, "http://groovy.codehaus.org/gapi/";, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, ++ // "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) ++ options.links("file:///usr/share/doc/default-jdk-doc/api", "file:///usr/share/doc/groovy-doc/gapi/", "file:///usr/share/doc/libmaven2-core-java/api") + doFirst { + title = "Gradle API $version" + } diff --git a/debian/patches/series b/debian/patches/series index b44fd03..783f021 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,6 @@ 10_fix_version.diff 11_fix_jni_path.diff 12_fix_missing_classpath.diff +13_fix_javadocs_links.diff 21_docs.diff 22_checkstyle.diff diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle index 05976a4..60cd1f8 100644 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -238,8 +238,9 @@ task javadoc(type: Javadoc) { include 'org/gradle/testfixtures/**' include 'org/gradle/tooling/**' exclude '**/internal/**' - options.links("http://download.oracle.com/javase/1.5.0/docs/api";, "http://groovy.codehaus.org/gapi/";, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, - "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) + //options.links("http://download.oracle.com/javase/1.5.0/docs/api";, "http://groovy.codehaus.org/gapi/";, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, + // "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) + options.links("file:///usr/share/doc/default-jdk-doc/api", "file:///usr/share/doc/groovy-doc/gapi/", "file:///usr/share/doc/libmaven2-core-java/api") doFirst { title = "Gradle API $version" } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
