[SCM] Gradle: Groovy based build system branch, master, updated. debian/1.0_m3-1-23-g7d8b742

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit c58d7201ea8f4be2a4add32a86b9f0a470e3bd11
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Jan 4 00:17:30 2013 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 07ad84a..47aaf25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 gradle (1.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 04 Jan 2013 00:13:00 +0100
+
+gradle (1.1-1) experimental; urgency=low
+
   * New upstream release (Closes: #667077).
 
   [ Miguel Landaeta ]
@@ -30,7 +36,7 @@ gradle (1.3-1) UNRELEASED; urgency=low
     - Depends in libservlet2.5-java and libecj-java instead of libtomcat6-java.
   * Include new d/watch from Bart Martens <bartm at debian.org>.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 01 Sep 2012 00:49:07 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 26 Dec 2012 23:52:01 +0100
 
 gradle (1.0~m3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 15ca818..324c1ab 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,7 @@ Build-Depends: ant (>= 1.8),
                libjcip-annotations-java,
                libjetty-extra-java,
                libjetty-java,
+               libjmock2-java,
                libjna-java,
                libjnr-posix-java (>= 1.1.8~0),
                libjsch-java,
@@ -71,6 +72,7 @@ Build-Depends: ant (>= 1.8),
                maven (>= 3.0.4-4),
                testng,
                unzip
+Build-Conflicts: groovy (>= 2.0.0~)
 Standards-Version: 3.9.3
 Homepage: http://gradle.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git
diff --git a/debian/gradle.install b/debian/gradle.install
index 212653d..572dcde 100644
--- a/debian/gradle.install
+++ b/debian/gradle.install
@@ -1,5 +1,5 @@
-build/distributions/bin/gradle-*/bin/gradle                    usr/share/gradle/bin
 
+build/distributions/bin/gradle-*/bin/gradle                    usr/share/gradle/bin
 build/distributions/bin/gradle-*/lib/gradle-base-services-*.jar     usr/share/gradle/lib
 build/distributions/bin/gradle-*/lib/gradle-cli-*.jar           usr/share/gradle/lib
 build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar      usr/share/gradle/lib
diff --git a/debian/rules b/debian/rules
index 8566f7f..743940a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ JARS := announce antlr code-quality cpp ear ide javascript jetty maven osgi plug
 export JAVA_HOME=/usr/lib/jvm/default-java
 export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m
 export GRADLE_USER_HOME=$(CURDIR)/.gradlehome
-DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --offline
+DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --stacktrace --offline
 
 %:
 	dh $@ --with javahelper

-- 
Gradle: Groovy based build system