[gradle] 01/02: Refresh disable_sonar.diff

[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.

commit 9a88358663faa2883a418efcaa473b006d30888c
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jan 21 15:53:42 2016 +0800

    Refresh disable_sonar.diff
---
 debian/patches/disable_sonar.diff | 24 ++++++++++++++++++++++++
 debian/rules                      |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff
index 11693da..f57a5ab 100644
--- a/debian/patches/disable_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -50,3 +50,27 @@ Last-Update: 2015-07-02
                  <td>org.gradle.api.tasks.Sync</td>
              </tr>
              <tr>
+--- a/subprojects/docs/src/docs/dsl/plugins.xml
++++ b/subprojects/docs/src/docs/dsl/plugins.xml
+@@ -77,10 +77,6 @@
+     <plugin id="visual-studio" description="Visual Studio Plugin">
+         <extends targetClass="org.gradle.api.Project" id="visualStudio" extensionClass="org.gradle.ide.visualstudio.VisualStudioExtension"/>
+     </plugin>
+-    <plugin id="sonar-runner" description="Sonar Runner Plugin">
+-        <extends targetClass="org.gradle.api.Project" id="sonarRunner" extensionClass="org.gradle.sonar.runner.SonarRunnerExtension"/>
+-        <extends targetClass="org.gradle.api.Project" id="sonarRunner" extensionClass="org.gradle.sonar.runner.SonarRunnerRootExtension"/>
+-    </plugin>
+ 
+     <plugin id="play" description="Play Plugin">
+     </plugin>
+--- a/subprojects/docs/src/docs/userguide/userguide.xml
++++ b/subprojects/docs/src/docs/userguide/userguide.xml
+@@ -102,8 +102,6 @@
+         <xi:include href='jdependPlugin.xml'/>
+         <xi:include href='pmdPlugin.xml'/>
+         <xi:include href='jacocoPlugin.xml'/>
+-        <xi:include href='sonarPlugin.xml'/>
+-        <xi:include href='sonarRunnerPlugin.xml'/>
+         <xi:include href='osgi.xml'/>
+         <xi:include href='eclipsePlugin.xml'/>
+         <xi:include href='ideaPlugin.xml'/>
diff --git a/debian/rules b/debian/rules
index 04e9f09..abdf840 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export GRADLE_VERSION = $(shell cat version.txt)
 # Under fakeroot Gradle will show error while creating /root/.gradle, hence
 # specifies the Gradle home location
 GRADLE_FLAGS = --project-prop finalRelease=true --offline --stacktrace \
-               --gradle-user-home debian/.gradlehome 
+               --gradle-user-home debian/.gradlehome
 
 # Support for DEB_BUILD_OPTIONS parallel=n
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -26,7 +26,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	find . -wholename .*build/tmp | xargs echo | sed -e 's^build/tmp^build^g' | xargs rm -Rf
+	find . -wholename .*build/generated-resources | xargs echo | sed -e 's^build/generated-resources^build^g' | xargs rm -Rf
 	rm -r -f .gradle debian/.gradlehome buildSrc/.gradle buildSrc/build build
 	rm -r -f debian/gradle.1 debian/*.pom
 
@@ -35,6 +35,8 @@ override_dh_install:
 	# Remove lintian warning zero-byte-file-in-doc-directory
 	rm debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/distribution/Distribution.html
 	rm debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/initialization/Settings.html
+	rm debian/gradle-doc/usr/share/doc/gradle/dsl/dsl-standalone.html
+	rm debian/gradle-doc/usr/share/doc/gradle/dsl/dsl-standalone.html
 
 override_mh_install:
 	mh_install

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