[gradle-1.12] 84/211: Updated the version of Guava used to fix a clean error

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

commit 898e9aa990c462bc00ecbc0af0ba35c09365a54c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 2 23:10:26 2013 +0200

    Updated the version of Guava used to fix a clean error
---
 debian/changelog                       | 7 +++++++
 debian/patches/01_use_debian_jars.diff | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c2fbd1..8028c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gradle (1.4-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Updated the version of Guava used to fix a clean error 
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Oct 2013 23:09:09 +0200
+
 gradle (1.4-2) unstable; urgency=low
 
   * Fix compatibility with Apache Ivy 2.3 (Closes: #713171):
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index d56dde4..f8ff7e5 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -44,7 +44,7 @@ Last-Update: 2012-08-18
  
  apply plugin: 'groovy'
  apply plugin: 'checkstyle'
-@@ -21,8 +22,14 @@
+@@ -21,16 +22,22 @@
  apply plugin: 'eclipse'
  
  repositories {
@@ -61,8 +61,9 @@ Last-Update: 2012-08-18
  }
  
  dependencies {
-@@ -30,7 +37,7 @@
-     compile 'com.google.guava:guava:11.0.2 at jar'
+     compile gradleApi()
+-    compile 'com.google.guava:guava:11.0.2 at jar'
++    compile 'com.google.guava:guava:debian at jar'
      compile 'commons-lang:commons-lang:2.6 at jar'
      groovy localGroovy()
 -    testCompile 'junit:junit:4.11 at jar'

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