[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-46-g0d4dcf4

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master-3.6 has been updated
       via  0d4dcf4d295800fc38c9bb9fe31f83430d6dac1d (commit)
      from  9a8032742e9f879d8fa607be5a434753cafa78a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d4dcf4d295800fc38c9bb9fe31f83430d6dac1d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Jun 22 21:47:18 2010 +0200

    Add patch to not overwrite JAVA_HOME.

-----------------------------------------------------------------------

Summary of changes:
 build.xml                      |    1 +
 debian/patches/java-home.patch |   32 ++++++++++++++++++++++++++++++++
 debian/patches/series          |    1 +
 patches/java-home.patch        |   15 +++++++++++++++
 4 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/build.xml b/build.xml
index faa1e89..8481590 100644
--- a/build.xml
+++ b/build.xml
@@ -293,6 +293,7 @@
 		<!-- Only build for one target (bug #293952) -->
 		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
 		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
+		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
 		<echo file="patch-stamp" />
 	</target>
 
diff --git a/debian/patches/java-home.patch b/debian/patches/java-home.patch
new file mode 100644
index 0000000..e79fe33
--- /dev/null
+++ b/debian/patches/java-home.patch
@@ -0,0 +1,32 @@
+Description: Do not overwrite exported JAVA_HOME variable
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317372
+
+--- eclipse-3.6.0.orig/build.xml
++++ eclipse-3.6.0/build.xml
+@@ -293,6 +293,7 @@
+ 		<!-- Only build for one target (bug #293952) -->
+ 		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
+ 		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
++		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
+ 		<echo file="patch-stamp" />
+ 	</target>
+ 
+--- /dev/null
++++ eclipse-3.6.0/patches/java-home.patch
+@@ -0,0 +1,15 @@
++Description: Do not overwrite exported JAVA_HOME variable
++Author: Benjamin Drung <bdrung at ubuntu.com>
++Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317634
++
++--- eclipse-3.6.0.orig/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+++++ eclipse-3.6.0/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
++@@ -155,7 +155,7 @@ DEFAULT_OS_ARCH="$defaultOSArch"
++ DEFAULT_WS="$defaultWS"
++ DEFAULT_JAVA=$defaultJava
++ 
++-if [ -n  $javaHome ]; then
+++if [ -z "$JAVA_HOME" -a -n  $javaHome ]; then
++ 	JAVA_HOME=$javaHome
++ 	export JAVA_HOME
++ fi
diff --git a/debian/patches/series b/debian/patches/series
index 53ae256..e6798dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ fix-bashism.patch
 build-arch.patch
 update-dependency.patch
 regenerateBootstrapFiles.patch
+java-home.patch
diff --git a/patches/java-home.patch b/patches/java-home.patch
new file mode 100644
index 0000000..a0defe8
--- /dev/null
+++ b/patches/java-home.patch
@@ -0,0 +1,15 @@
+Description: Do not overwrite exported JAVA_HOME variable
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: 
+
+--- eclipse-3.6.0.orig/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
++++ eclipse-3.6.0/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+@@ -155,7 +155,7 @@ DEFAULT_OS_ARCH="$defaultOSArch"
+ DEFAULT_WS="$defaultWS"
+ DEFAULT_JAVA=$defaultJava
+ 
+-if [ -n  $javaHome ]; then
++if [ -z "$JAVA_HOME" -a -n  $javaHome ]; then
+ 	JAVA_HOME=$javaHome
+ 	export JAVA_HOME
+ fi


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.