diff -Nru gradle-1.4/debian/changelog gradle-1.4/debian/changelog --- gradle-1.4/debian/changelog 2013-09-09 17:54:37.000000000 +0000 +++ gradle-1.4/debian/changelog 2015-12-16 08:44:08.000000000 +0000 @@ -1,3 +1,9 @@ +gradle (1.4-2ubuntu2) trusty; urgency=medium + + * Only set JAVA_HOME in the gradle script when unset. + + -- Matthias Klose Wed, 16 Dec 2015 09:43:40 +0100 + gradle (1.4-2ubuntu1) saucy; urgency=low * Adjust Build-Conflicts to cope with the anomalous version of groovy diff -Nru gradle-1.4/debian/gradle.sed gradle-1.4/debian/gradle.sed --- gradle-1.4/debian/gradle.sed 2013-08-11 15:03:12.000000000 +0000 +++ gradle-1.4/debian/gradle.sed 2015-12-16 08:43:35.000000000 +0000 @@ -1,4 +1,6 @@ #!/bin/sed -f /^# Determine the Java command to use to start the JVM/ i\ -export JAVA_HOME=/usr/lib/jvm/default-java\ +if [ -z "$JAVA_HOME" ]; then\ + export JAVA_HOME=/usr/lib/jvm/default-java\ +fi\