This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 3e12195f16aa5cc4e92fbf10a0bab3614e95e195 Author: Kai-Chung Yan <[email protected]> Date: Wed Jul 8 19:54:19 2015 +0800 Remove libmaven2-core-java(-doc) from (Build-)Depends --- debian/changelog | 1 + debian/control | 2 -- debian/patches/docs.diff | 24 ++++++++++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e99db4c..70e5b8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ gradle (2.5-1) UNRELEASED; urgency=low * New upstream release (Closes: #754725) * d/control: Remove maven from Depends + * d/control: Remove libmaven2-core-java(-doc) from (Build-)Depends * d/control: Remove bintray-client-java from (Build-)Depends * d/control: Change Groovy dependencies to groovy2 * d/control: Remove groovy from Build-Conflicts diff --git a/debian/control b/debian/control index 17c10ea..dbf7029 100644 --- a/debian/control +++ b/debian/control @@ -52,8 +52,6 @@ Build-Depends: ant, libjs-jquery, libkryo-java, liblogback-java, - libmaven2-core-java, - libmaven2-core-java-doc, libnative-platform-java (>= 0.10), libnekohtml-java, libobjenesis-java, diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff index b3defe0..2723748 100644 --- a/debian/patches/docs.diff +++ b/debian/patches/docs.diff @@ -4,14 +4,14 @@ Author: Miguel Landaeta <[email protected]> Damien Raude-Morvan <[email protected]> Kai-Chung Yan <[email protected]> Forwarded: not-needed -Last-Update: 2015-07-02 +Last-Update: 2015-07-08 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -117,12 +117,7 @@ [it.name, it.bytes.encodeBase64().toString()] } - + - def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { - def id = it.moduleVersion.id - ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()] @@ -31,17 +31,17 @@ Last-Update: 2015-07-02 - eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } - } } - + task samplesDocbook(type: AssembleSamplesDocTask) { @@ -292,8 +283,8 @@ classpath = configurations.userGuideTask } - + -def javaApiUrl = "https://docs.oracle.com/javase/6/docs/api"; -def groovyApiUrl = "http://docs.groovy-lang.org/docs/groovy-${versions.groovy}/html/gapi"; +def javaApiUrl = "file:///usr/share/doc/default-jdk/api/" +def groovyApiUrl = "file:///usr/share/doc/groovy2/api/" - + task javadocAll(type: Javadoc) { ext.stylesheetFile = file("src/docs/css/javadoc.css") @@ -331,8 +322,7 @@ @@ -50,7 +50,7 @@ Last-Update: 2015-07-02 exclude '**/internal/**' - options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, - "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) -+ options.links(javaApiUrl, groovyApiUrl, "file:///usr/share/doc/libmaven2-core-java/api") ++ options.links(javaApiUrl, groovyApiUrl) doFirst { title = "Gradle API $version" } @@ -63,7 +63,7 @@ Last-Update: 2015-07-02 - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd"; @@ -209,4 +209,4 @@ <dt><xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>:</dt> @@ -81,7 +81,7 @@ Last-Update: 2015-07-02 - <xsl:import href="html/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:param name="section.autolabel">0</xsl:param> @@ -36,4 +36,4 @@ <xi:include href="userguide.css" parse="text"/> @@ -99,12 +99,12 @@ Last-Update: 2015-07-02 - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:param name="root.filename">userguide</xsl:param> @@ -84,4 +84,4 @@ </div> </xsl:template> - + -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> @@ -118,7 +118,7 @@ Last-Update: 2015-07-02 - <xsl:import href="html/highlight.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/common.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/highlight.xsl"/> - + <xsl:output method="html" encoding="UTF-8" --- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl @@ -130,7 +130,7 @@ Last-Update: 2015-07-02 - <xsl:import href="xhtml/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:output method="xml" @@ -59,4 +59,4 @@ <xsl:apply-templates select=".." mode="title.markup"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
