[gradle] 05/05: Disable dsl reference and userguide for now

Tue Jul 7 10:34:23 UTC 2015

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 2d41dc3acfe8d9e1d7be5a11f0b8314ddeaf53cd
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jul 7 18:32:50 2015 +0800

    Disable dsl reference and userguide for now
---
 debian/changelog                            | 12 ++++++++----
 debian/control                              |  9 +++++++--
 debian/gradle-doc.doc-base.gradle-dsl       |  9 ---------
 debian/gradle-doc.doc-base.gradle-userguide | 11 -----------
 debian/gradle-doc.install                   |  1 -
 debian/libgradle-plugins-java.jlibs         |  1 -
 debian/rules                                | 11 ++---------
 7 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4dab306..b879bd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,10 +19,14 @@ gradle (2.4-1) UNRELEASED; urgency=low
     - bintray_dependencies.diff
     - diagnostics_jquery.diff
     - disable_css3pie.diff
-  * New d/patches/disable_aws.diff: AWS SDK for Java is not in Debian
-  * New d/patches/taskOrdering.diff: shouldRunAfter() is not in Gradle 1.5
-  * New d/patches/jcommander.diff: Gradle uses jcommander but does not declare
-    the dependency
+  * Multiple new patches under debian/patches/:
+  * disable_aws.diff: AWS SDK for Java is not in Debian
+  * taskOrdering.diff: shouldRunAfter() is not in Gradle 1.5
+  * jcommander.diff: Gradle uses jcommander but does not declare the dependency
+  * nekohtml.diff: Fix nekohtml usage
+  * relax_warnings.diff: strictCompile.gradle is too strict
+  * gradle-doc no longer provides Gradle User Guide and DSL Reference because
+    missing Sonar plugins causes their compilation produce errors.
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Sun, 28 Jun 2015 19:28:30 +0800
 
diff --git a/debian/control b/debian/control
index 1e5c757..a44b018 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends: ant,
                libasm4-java (>= 5),
                libatinject-jsr330-api-java,
                libbcpg-java,
+               libclassworlds-java,
                libclassycle-java,
                libcommons-cli-java,
                libcommons-collections3-java,
@@ -59,6 +60,8 @@ Build-Depends: ant,
                libpegdown-java,
                libplexus-container-default-java,
                libplexus-containers1.5-java,
+               libplexus-interpolation-java,
+               libplexus-utils-java,
                libpolyglot-maven-java,
                librhino-java,
                libservlet2.5-java,
@@ -153,6 +156,7 @@ Depends: ant-optional,
          libantlr-java,
          libatinject-jsr330-api-java,
          libbcpg-java,
+         libclassworlds-java
          libcommons-cli-java,
          libdom4j-java,
          libgoogle-gson-java,
@@ -167,6 +171,8 @@ Depends: ant-optional,
          libobjenesis-java,
          libplexus-container-default-java,
          libplexus-containers1.5-java,
+         libplexus-interpolation-java,
+         libplexus-utils-java,
          libpolyglot-maven-java,
          librhino-java,
          libservlet2.5-java,
@@ -231,5 +237,4 @@ Description: Documentation for Gradle
  gives you always the choice between the flexibility of Ant
  and the convenience of a build-by-convention behavior.
  .
- This package contains the Gradle User Guide, Gradle API Javadoc and Groovydoc
- and the Gradle DSL Reference.
+ This package contains Gradle API Javadoc and Groovydoc.
\ No newline at end of file
diff --git a/debian/gradle-doc.doc-base.gradle-dsl b/debian/gradle-doc.doc-base.gradle-dsl
deleted file mode 100644
index 753a9c2..0000000
--- a/debian/gradle-doc.doc-base.gradle-dsl
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: gradle-dsl
-Title: Gradle Build Language Reference
-Author: Gradle developers
-Abstract: Reference for the Gradle build language, or DSL.
-Section: Programming/Java
-
-Format: HTML
-Files: /usr/share/doc/gradle/dsl/*
-Index: /usr/share/doc/gradle/dsl/index.html
\ No newline at end of file
diff --git a/debian/gradle-doc.doc-base.gradle-userguide b/debian/gradle-doc.doc-base.gradle-userguide
deleted file mode 100644
index fc98166..0000000
--- a/debian/gradle-doc.doc-base.gradle-userguide
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: gradle-userguide
-Title: Gradle User Guide
-Author: Gradle developers
-Section: Programming/Java
-
-Format: HTML
-Files: /usr/share/doc/gradle/userguide/*.html
-Index: /usr/share/doc/gradle/userguide/userguide.html
-
-Format: PDF
-Files: /usr/share/doc/gradle/userguide/userguide.pdf.gz
\ No newline at end of file
diff --git a/debian/gradle-doc.install b/debian/gradle-doc.install
index bdb7c19..11c4a0c 100644
--- a/debian/gradle-doc.install
+++ b/debian/gradle-doc.install
@@ -1,3 +1,2 @@
 subprojects/docs/build/docs/*                        usr/share/doc/gradle/
-subprojects/docs/build/distDocs/getting-started.html usr/share/doc/gradle/
 subprojects/docs/build/samples/*                     usr/share/doc/gradle/examples/
\ No newline at end of file
diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs
index 9f21ed6..5807a98 100644
--- a/debian/libgradle-plugins-java.jlibs
+++ b/debian/libgradle-plugins-java.jlibs
@@ -3,7 +3,6 @@ subprojects/antlr/build/libs/*.jar
 subprojects/build-comparison/build/libs/*.jar
 subprojects/build-init/build/libs/*.jar
 subprojects/code-quality/build/libs/*.jar
-subprojects/cpp/build/libs/*.jar
 subprojects/dependency-management/build/libs/*.jar
 subprojects/diagnostics/build/libs/*.jar
 subprojects/ear/build/libs/*.jar
diff --git a/debian/rules b/debian/rules
index 4ffbf76..64a8df5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-GRADLE_TASKS := assemble docs startScripts
+GRADLE_TASKS := assemble startScripts javadocAll groovydocAll samplesDocs
 
 # Only for debug purpose
 # export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
@@ -21,7 +21,7 @@ endif
 override_dh_auto_build:
 	find /usr/share/gradle -type l ! -exec test -r {} \; -print
 
-	# Gradle 1.12 buildSrc uses APIs that does not exist in Gradle 1.5, hence
+	# Gradle 2.4 buildSrc uses APIs that does not exist in Gradle 1.5, hence
 	# make the codes available inside buildSrc.
 	cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/
 
@@ -40,13 +40,6 @@ override_dh_auto_clean:
 	rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/
 	rm -rf buildSrc/src/main/java/
 
-override_dh_install:
-	dh_install
-
-	# Remove empty files that raise lintian warnings
-	rm -f debian/gradle-doc/usr/share/doc/gradle/dsl/dsl-standalone.html
-	rm -f debian/gradle-doc/usr/share/doc/gradle/dsl/sidebar.js
-
 get-orig-source:
 	uscan --download-current-version --force-download --repack --compression xz
 

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

