[gradle] 03/03: Removed 26_disable_commitid.diff (not required)

[Emmanuel Bourg]

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

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

commit a663397b6f0dd6b9fa5127eb3fd91da3fa760ee1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 1 21:04:07 2016 +0100

    Removed 26_disable_commitid.diff (not required)
---
 debian/changelog                        |  1 +
 debian/patches/26_disable_commitid.diff | 36 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7e320b..ea1c29d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed disable_java9.diff (no longer required)
+  * Removed 26_disable_commitid.diff (not required)
   * Replaced disable_release_notes.diff with a task exclusion parameter
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
deleted file mode 100644
index e97dd2a..0000000
--- a/debian/patches/26_disable_commitid.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-08-18
-
---- a/gradle/buildReceipt.gradle
-+++ b/gradle/buildReceipt.gradle
-@@ -32,7 +32,7 @@
-     }
- }
- 
--task determineCommitId {
-+/*task determineCommitId {
-     ext.commitId = null
- 
-     doLast {
-@@ -103,9 +103,9 @@
-             throw new InvalidUserDataException("Could not determine commit id")
-         }
-     }
--}
-+}*/
- 
--task createBuildReceipt(dependsOn: determineCommitId) {
-+task createBuildReceipt() {
-     ext.receiptFile = file("$buildDir/$buildReceiptFileName")
-     outputs.file receiptFile
-     outputs.upToDateWhen { false }
-@@ -127,7 +127,7 @@
-             }
-         }
-         def data = [
--                commitId: determineCommitId.commitId,
-+                commitId: "UNKNOWN",
-                 versionNumber: version,
-                 versionBase: versionBase,
-                 isSnapshot: isSnapshot,
diff --git a/debian/patches/series b/debian/patches/series
index 8f43223..6c6ac1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ jetty.diff
 docs.diff
 disable_sonar.diff
 search_system_jar.diff
-26_disable_commitid.diff
 disable_aws.diff
 jcommander.diff
 nekohtml.diff

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