[gradle-1.12] 179/211: Add libxslthl-java to Build-Depends

[Kai-Chung Yan]

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 41f19537e5408ae96071a2c7e16eb1b6cabac4af
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jun 16 23:16:16 2015 +0800

    Add libxslthl-java to Build-Depends
---
 debian/control           |  1 +
 debian/patches/docs.diff | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 86fff2b..0ad0ebb 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Build-Depends: ant,
                libxalan2-java,
                libxbean-java,
                libxerces2-java,
+               libxslthl-java,
                maven (>= 3),
                perl,
                quilt,
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 2fe8e12..b4b1555 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -2,8 +2,9 @@ Description: Fix build of documentation to build everything
  using docbook-xsl, xalan2 and xhtmlrenderer from Debian
 Author: Miguel Landaeta <miguel at miguel.cc>
 Author: Damien Raude-Morvan <drazzib at debian.org>
+Author: Kai-Chung Yan <seamlikok at gmail.com>
 Forwarded: not-needed
-Last-Update: 2015-06-11
+Last-Update: 2015-06-16
 
 --- a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
 +++ b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
@@ -20,14 +21,13 @@ Last-Update: 2015-06-11
          }
 --- a/subprojects/docs/docs.gradle
 +++ b/subprojects/docs/docs.gradle
-@@ -39,26 +39,19 @@
+@@ -39,26 +39,18 @@
      fonts
  }
  
 +repositories {
-+    flatDir {
-+        dirs "/usr/share/javascript/jquery/"
-+    }
++    maven { url "/usr/share/maven-repo/" }
++    flatDir { dirs "/usr/share/javascript/jquery/" }
 +}
 +
  dependencies {
@@ -37,9 +37,10 @@ Last-Update: 2015-06-11
 +    userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') {
          dependency 'itext:itext:2.0.8 at jar'
      }
-     userGuideTask 'xslthl:xslthl:2.0.1 at jar'
+-    userGuideTask 'xslthl:xslthl:2.0.1 at jar'
 -
 -    userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
++    userGuideTask 'net.sf.:xslthl:[2.0.1, )@jar'
      jquery "jquery:jquery.min:1.8.0 at js"
 -    jqueryTipTip "com.drewwilson.code:jquery.tipTip:1.3:minified at js"
 -
@@ -55,7 +56,7 @@ Last-Update: 2015-06-11
  
      groovydocGroovy libraries.groovy
  
-@@ -124,12 +117,12 @@
+@@ -124,12 +116,12 @@
          [it.name, it.bytes.encodeBase64().toString()]
      }
  
@@ -71,7 +72,7 @@ Last-Update: 2015-06-11
      css.inputs.property 'tokens', tokens
      css.filter ReplaceTokens, tokens: tokens
  }
-@@ -174,10 +167,6 @@
+@@ -174,10 +166,6 @@
          include '*.xsl'
      }
      from(cssFiles)
@@ -82,7 +83,7 @@ Last-Update: 2015-06-11
  }
  
  task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -291,8 +280,8 @@
+@@ -291,8 +279,8 @@
      classpath = configurations.userGuideTask
  }
  
@@ -93,7 +94,7 @@ Last-Update: 2015-06-11
  
  task javadocAll(type: Javadoc) {
      ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -319,8 +308,7 @@
+@@ -319,8 +307,7 @@
      include 'org/gradle/testing/jacoco/**'
      include 'org/gradle/buildinit/**'
      exclude '**/internal/**'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git