[libgpars-groovy-java] 01/01: Upload to unstable

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository libgpars-groovy-java.

commit 3e312026b53de8d509f265a9bbddd4311f97334c
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Aug 16 21:28:17 2015 +0200

    Upload to unstable
---
 debian/changelog                                      |  7 +++++++
 debian/control                                        |  2 +-
 debian/patches/add_compatibility_with_gradle_2.5.diff | 17 +++++++++++++++++
 debian/patches/series                                 |  1 +
 debian/rules                                          |  2 +-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5841a1e..5f1ec64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libgpars-groovy-java (1.2.1-3) unstable; urgency=medium
+
+  * Fix FTBFS error with Gradle 2.5. (Closes: #795738).
+  * Update my own email address.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sun, 16 Aug 2015 20:10:32 +0200
+
 libgpars-groovy-java (1.2.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 2cd9e03..64dc7db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: libgpars-groovy-java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>
+Uploaders: Miguel Landaeta <nomadium at debian.org>
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 9),
diff --git a/debian/patches/add_compatibility_with_gradle_2.5.diff b/debian/patches/add_compatibility_with_gradle_2.5.diff
new file mode 100644
index 0000000..14fdd51
--- /dev/null
+++ b/debian/patches/add_compatibility_with_gradle_2.5.diff
@@ -0,0 +1,17 @@
+Description: Add compatibility with Gradle 2.5
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-08-16
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -332,7 +332,8 @@ task zipJavaDemo(type: Zip) {
+ 
+ task zipDist(type: Zip) {
+     from jar.outputs.files
+-    from(runtimeClasspath) {
++    //from(runtimeClasspath) {
++    from(sourceSets.main.runtimeClasspath.asPath) {
+         include('jsr166*', 'netty*', 'multiverse*')
+     }
+     from('licenses') {
diff --git a/debian/patches/series b/debian/patches/series
index 10474f9..c3654b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_gradle_build.diff
+add_compatibility_with_gradle_2.5.diff
diff --git a/debian/rules b/debian/rules
index 6472b01..38f726f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_auto_install:
 
 override_dh_clean:
 	-gradle --project-prop finalRelease=true --stacktrace --offline clean --gradle-user-home .gradle
-	-rm -rf .gradle buildSrc/.gradle buildSrc/build
+	-rm -rf .gradle buildSrc/.gradle buildSrc/build ./build/
 	dh_clean
 
 get-orig-source:

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