[gradle] 11/16: No need to copy gradle-core codes to buildSrc since Build-Depends on gradle (>= 2.5)

[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 14f283a5b159430ca78ab88d01fbe84756fb3e51
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Sep 30 07:10:23 2015 +0800

    No need to copy gradle-core codes to buildSrc since Build-Depends on gradle (>= 2.5)
---
 debian/changelog |  7 +++++--
 debian/control   |  2 +-
 debian/rules     | 14 +++-----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a8bd2d..7fa715c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ gradle (2.7-1) UNRELEASED; urgency=low
 
   * New upstream release
   * d/copyright: Simplify file exclusion pattern with *.min.js
-  * Refresh patches
   * Remove maven_testng.diff: No longer needed.
-  * d/control: Remove maven from Build-Depends
+  * d/control:
+    - Remove maven from Build-Depends
+    - Add libcglib-java to Build-Depends
+    - Build-Depends on gradle (>= 2.5)
+  * d/rules: No need to copy gradle-core codes to buildSrc
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Wed, 30 Sep 2015 04:37:18 +0800
 
diff --git a/debian/control b/debian/control
index 6a5cbc2..f3f0b57 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: ant,
                default-jdk-doc,
                docbook-xsl,
                findbugs,
-               gradle (>= 1.5),
+               gradle (>= 2.5),
                groovy2 (>= 2.3.10),
                groovy2-doc,
                ivy,
diff --git a/debian/rules b/debian/rules
index 2e0e9ab..91a40cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,6 @@ endif
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	# 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/
 
 	gradle $(GRADLE_TASKS) $(GRADLE_FLAGS)
 	pandoc -s -o debian/gradle.1 debian/gradle.1.md
@@ -29,21 +26,16 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean
 
-	# buildSrc must be prepared well before all Gradle operations
-	cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/
-
 	gradle clean $(GRADLE_FLAGS)
 	rm -rf debian/gradle.1
-
-	rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/
-	rm -rf buildSrc/src/main/java/
+	rm -rf .gradle .gradlehome buildSrc/.gradle buildSrc/build
 
 override_dh_install:
 	dh_install
 
 	# Remove lintian warning zero-byte-file-in-doc-directory
-	rm -f debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/distribution/Distribution.html
-	rm -f debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/initialization/Settings.html
+	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
 
 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