[gradle] 02/02: drop d/patches/disable_distributions.diff: Unnecessary

[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 b2058fb00c009c06f521c343f17637d66ef83d26
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jan 21 15:56:27 2016 +0800

    drop d/patches/disable_distributions.diff: Unnecessary
---
 debian/changelog                          |  3 ++-
 debian/patches/disable_distributions.diff | 40 -------------------------------
 debian/patches/disable_tests.diff         | 17 ++++++++++++-
 debian/patches/series                     |  1 -
 4 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6024e35..5826a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ gradle (2.10-1) UNRELEASED; urgency=medium
     - Update manpage
   * Drop the use of javahelper since it never works well with maven-repo-helper
   * d/generate_classpath.gradle: Sort classpaths for reproducibility
+  * drop d/patches/disable_distributions.diff: Unnecessary
 
- -- Kai-Chung Yan <seamlikok at gmail.com>  Sat, 16 Jan 2016 20:29:38 +0800
+ -- Kai-Chung Yan <seamlikok at gmail.com>  Thu, 21 Jan 2016 15:55:53 +0800
 
 gradle (2.9-1) unstable; urgency=medium
 
diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff
deleted file mode 100644
index 9163608..0000000
--- a/debian/patches/disable_distributions.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Subproject :distribution is for generating tarballs for
-             distributing Gradle hence not needed.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-08
---- a/settings.gradle
-+++ b/settings.gradle
-@@ -13,7 +13,7 @@
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--include 'distributions'
-+//include 'distributions'
- include 'baseServices'
- include 'baseServicesGroovy'
- include 'core'
---- a/build.gradle
-+++ b/build.gradle
-@@ -250,22 +250,6 @@
-     }
- }
- 
--evaluationDependsOn ":distributions"
--
--task install(type: Install) {
--    description = 'Installs the minimal distribution into directory $gradle_installPath'
--    group = 'build'
--    with project(":distributions").binDistImage
--    installDirPropertyName = 'gradle_installPath'
--}
--
--task installAll(type: Install) {
--    description = 'Installs the full distribution into directory $gradle_installPath'
--    group = 'build'
--    with project(":distributions").allDistImage
--    installDirPropertyName = 'gradle_installPath'
--}
--
- clean {
-     dependsOn ':killExistingDaemons'
- }
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index a07ba9c..6d7d5f7 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -19,7 +19,7 @@ Last-Update: 2015-09-30
  apply from: "gradle/taskOrdering.gradle"
  apply from: "gradle/fix-GRADLE-2492.gradle"
  
-@@ -254,7 +252,6 @@
+@@ -270,7 +268,6 @@
      dependsOn ':killExistingDaemons'
  }
  
@@ -65,6 +65,21 @@ Last-Update: 2015-09-30
  evaluationDependsOn ":docs"
  
  ext {
+@@ -129,12 +127,4 @@
+ 
+ artifacts {
+     dists allZip, binZip, srcZip
+-}
+-
+-integTest {
+-    inputs.files allZip, binZip, srcZip
+-}
+-
+-java9IntegTest {
+-    inputs.files allZip, binZip, srcZip
+-}
++}
+\ No newline at end of file
 --- a/subprojects/tooling-api/tooling-api.gradle
 +++ b/subprojects/tooling-api/tooling-api.gradle
 @@ -7,39 +7,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index ac5be31..6fb4350 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ use_local_artifacts.diff
 34_disable_code_quality.diff
 30_envjs.diff
 33_scala_zinc.diff
-disable_distributions.diff
 disable_tests.diff
 jetty.diff
 docs.diff

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