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 c3b4b4dd22c74ff1e5ea3d858aea72b3a9064a23 Author: Miguel Landaeta <[email protected]> Date: Wed May 14 21:38:12 2014 -0300 Fix 719814 and upload to unstable --- debian/changelog | 8 +++- debian/control | 64 ++++++++++++++------------- debian/gradle.sed | 4 -- debian/patches/90_respect_user_java_home.diff | 20 +++++++++ debian/rules | 2 +- 5 files changed, 61 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36e8ebf..e1482e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ gradle (1.5-1) unstable; urgency=medium + [ Emmanuel Bourg ] * Team upload. * New upstream release - Added a build dependency on libjatl-java @@ -10,7 +11,12 @@ gradle (1.5-1) unstable; urgency=medium * Use XZ compression for the upstream tarball * Switch to debhelper level 9 - -- Emmanuel Bourg <[email protected]> Mon, 12 May 2014 11:26:59 +0200 + [ Miguel Landaeta ] + * Add patch to don't override user defined JAVA_HOME in the gradle script. + (Closes: #719814). + * Fix possible-unindented-list-in-extended-description lintian tag. + + -- Miguel Landaeta <[email protected]> Tue, 13 May 2014 17:38:10 -0300 gradle (1.4-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 71ca96e..4cae14c 100644 --- a/debian/control +++ b/debian/control @@ -204,37 +204,39 @@ Description: Groovy based build system - All plugins gives you always the choice between the flexibility of Ant and the convenience of a build-by-convention behavior. . - This package contains the Gradle Plugins : - * announce plugin: enables you to publish messages on succeeded - tasks to your favourite platforms. - It supports Twitter, Ubuntu Notify, Snarl and Growl. - * ANTLR plugin that extends the Java plugin to add support for - generating parsers using ANTLR - * code-quality plugin that adds - tasks which perform code quality checks and generate reports from these - checks. The following tools are supported: CodeNarc and checkstyle - * ide plugins that provide integration with - common used IDEs like Eclipse and IDEA IntelliJ. - * jetty plugin that extends the - War plugin to add tasks which allow you to deploy your web application - to a Jetty web container embedded in the build. - * maven plugin. With Gradle you can deploy - to remote Maven repositories or install to your local Maven repository. This - includes all Maven metadata manipulation and works also for Maven snapshots - * osgi plugin: if the Java plugins is - applied, the OSGi plugin replaces the manifest object of the default jar - with an OsgiManifest object. The replaced manifest is merged into the new - one. The OSGi plugin makes heavy use of Peter Kriens BND tool - * scala plugin that extends the - Java Plugin to add support for Scala projects. It can deal with Scala-only - projects and with mixed Java/Scala projects. It can even deal with Java-only - projects. The Scala plugin supports joint compilation of Java and Scala - source. This means your project can contain Scala classes which use Java - classes, and vice versa. - * cpp plugin: C++ source compilation capabilities to a project. - * ear plugin: Adds support for building J2EE applications. - * javascript plugin: Adds the ability to check and minify Javascript files. - * signing plugin: Adds the ability to digitally sign built files and artifacts. + This package contains the Gradle Plugins: + * announce plugin: enables you to publish messages on succeeded + tasks to your favourite platforms. + It supports Twitter, Ubuntu Notify, Snarl and Growl. + * ANTLR plugin that extends the Java plugin to add support for + generating parsers using ANTLR + * code-quality plugin that adds + tasks which perform code quality checks and generate reports from these + checks. The following tools are supported: CodeNarc and checkstyle + * ide plugins that provide integration with + common used IDEs like Eclipse and IDEA IntelliJ. + * jetty plugin that extends the + War plugin to add tasks which allow you to deploy your web application + to a Jetty web container embedded in the build. + * maven plugin. With Gradle you can deploy + to remote Maven repositories or install to your local Maven repository. + This includes all Maven metadata manipulation and works also for Maven + snapshots. + * osgi plugin: if the Java plugins is + applied, the OSGi plugin replaces the manifest object of the default jar + with an OsgiManifest object. The replaced manifest is merged into the new + one. The OSGi plugin makes heavy use of Peter Kriens BND tool + * scala plugin that extends the + Java Plugin to add support for Scala projects. It can deal with Scala-only + projects and with mixed Java/Scala projects. It can even deal with + Java-only projects. The Scala plugin supports joint compilation of Java and + Scala source. This means your project can contain Scala classes which use + Java classes, and vice versa. + * cpp plugin: C++ source compilation capabilities to a project. + * ear plugin: Adds support for building J2EE applications. + * javascript plugin: Adds the ability to check and minify Javascript files. + * signing plugin: Adds the ability to digitally sign built files and + artifacts. Package: gradle-doc Architecture: all diff --git a/debian/gradle.sed b/debian/gradle.sed deleted file mode 100755 index f763f45..0000000 --- a/debian/gradle.sed +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sed -f -/^# Determine the Java command to use to start the JVM/ i\ -export JAVA_HOME=/usr/lib/jvm/default-java\ - diff --git a/debian/patches/90_respect_user_java_home.diff b/debian/patches/90_respect_user_java_home.diff new file mode 100644 index 0000000..f01aff9 --- /dev/null +++ b/debian/patches/90_respect_user_java_home.diff @@ -0,0 +1,20 @@ +Description: Respect JAVA_HOME if users already set it +Author: Miguel Landaeta <[email protected]> +Bug-Debian: http://bugs.debian.org/719814 +Forwarded: no +Last-Update: 2014-05-13 + +--- a/build/distributions/bin/gradle-1.5/bin/gradle 2014-05-13 16:54:18.370234000 -0300 ++++ b/build/distributions/bin/gradle-1.5/bin/gradle 2014-05-13 17:04:16.766234000 -0300 +@@ -67,6 +67,11 @@ + + CLASSPATH=$APP_HOME/lib/gradle-launcher-1.5.jar + ++# Only set JAVA_HOME if the user hasn't set anything about it ++if [ -z "$JAVA_HOME" ] ; then ++ export JAVA_HOME=/usr/lib/jvm/default-java ++fi ++ + # Determine the Java command to use to start the JVM. + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then diff --git a/debian/rules b/debian/rules index 166dd39..4b5fa93 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_build: unzip -q -n build/distributions/gradle-*-bin.zip -d build/distributions/bin unzip -q -n build/distributions/gradle-*-all.zip -d build/distributions/all pod2man -c '' -r '' debian/gradle.pod > build/gradle.1 - ./debian/gradle.sed -i build/distributions/bin/gradle-*/bin/gradle + patch -p1 < debian/patches/90_respect_user_java_home.diff override_dh_auto_clean: dh_auto_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
