[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream-3.6, updated. f14af072718e4a59ea3628896219e30d0ab6f0ee
Benjamin Drung
bdrung-guest at alioth.debian.org
Mon Jul 5 18:07:18 UTC 2010
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, upstream-3.6 has been updated
via f14af072718e4a59ea3628896219e30d0ab6f0ee (commit)
from 43d52e504626eeb4b1783a5c2c29814989deed4a (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 f14af072718e4a59ea3628896219e30d0ab6f0ee
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Jul 5 20:06:39 2010 +0200
Import eclipse-build 3.6 branch (revision 25179).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 31 +++++++++++++++++
build.xml | 26 +++++++-------
buildSDKSource.sh | 3 ++
dependencies.properties | 14 ++++----
.../donotsetjavahomeandoptimizeliblocalfile.patch | 6 ++--
patches/donotstorebuildlogsinfiles.patch | 36 +++++++++-----------
patches/eclipse-add-archs-executable.patch | 17 +++------
patches/eclipse-add-archs-filesystem.patch | 10 +++---
patches/eclipse-add-archs-swt.patch | 12 +++---
patches/eclipse-add-ppc64-sparc64-s390-s390x.patch | 20 +++++-----
patches/eclipse-addArchesAnd64bitSWT.patch | 4 +-
patches/eclipse-buildswtnatives.patch | 6 ++--
patches/eclipse-no-jetty5.patch | 4 --
.../eclipse-nosourcebundlesfordependencies.patch | 35 +++++++------------
patches/eclipse-pde.build-add-package-build.patch | 32 ++++-------------
patches/eclipse-swt-buildagainstxulrunner.patch | 6 ++--
patches/eclipse-use-newer-commons-codec.patch | 4 +-
patches/gnomeproxy-makefile.patch | 6 ++--
patches/java-home.patch | 15 ++++++++
patches/junit4-nochecksum.patch | 17 +++++----
patches/osgi-util.patch | 4 +--
21 files changed, 158 insertions(+), 150 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e5b53dd..5f0540a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+
+ * buildSDKSource.sh: Remove *.orig files. (Benjamin Drung bz#316525)
+
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/java-home.patch: New file.
+ * build.xml: Do not blindly override JAVA_HOME.
+ * dependencies.properties: Add icu4j for Debian (Benjamin Drung).
+
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+ Refresh all patches. (Benjamin Drung)
+ * build.xml: Make every patch applies in build directory.
+ * dependencies.properties: Remove my testing leftovers.
+ * patches/donotsetjavahomeandoptimizeliblocalfile.patch: Update patch for Helios.
+ * patches/donotstorebuildlogsinfiles.patch: Likewise.
+ * patches/eclipse-add-archs-executable.patch: Likewise.
+ * patches/eclipse-add-archs-filesystem.patch: Likewise.
+ * patches/eclipse-add-archs-swt.patch: Likewise.
+ * patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: Likewise.
+ * patches/eclipse-addArchesAnd64bitSWT.patch: Likewise.
+ * patches/eclipse-buildswtnatives.patch: Likewise.
+ * patches/eclipse-no-jetty5.patch: Likewise.
+ * patches/eclipse-nosourcebundlesfordependencies.patch: Likewise.
+ * patches/eclipse-pde.build-add-package-build.patch: Likewise.
+ * patches/eclipse-swt-buildagainstxulrunner.patch: Likewise.
+ * patches/eclipse-use-newer-commons-codec.patch: Likewise.
+ * patches/gnomeproxy-makefile.patch: Likewise.
+ * patches/junit4-nochecksum.patch: Likewise.
+ * patches/osgi-util.patch: Likewise.
+
2010-06-23 Alexander Kurtakov <akurtako at redhat.com>
* dependencies.properties: Fix jetty and jetty utils lists.
diff --git a/build.xml b/build.xml
index f8c4a43..ebedc0d 100644
--- a/build.xml
+++ b/build.xml
@@ -238,22 +238,21 @@
<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
<!-- eclipse-build-only patches -->
- <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" />
- <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
-
- <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}/features/org.eclipse.equinox.executable" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
- <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
@@ -263,6 +262,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/buildSDKSource.sh b/buildSDKSource.sh
index 31ebe98..fbbf5dd 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -182,6 +182,9 @@ rm fetch_*
rm -rf features/org.eclipse.sdk.examples
rm -rf plugins/*.examples*
+# Remove temporary files
+find -name '*.orig' -delete
+
# Remove empty directories
find -type d -empty -delete
diff --git a/dependencies.properties b/dependencies.properties
index 5db643e..06ce276 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -1,6 +1,6 @@
-com.ibm.icu_4.2.1.v20100412.jar=/home/akurtakov/orbit/icu.jar:/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar::/usr/share/java/com.ibm.icu.jar
+com.ibm.icu_4.2.1.v20100412.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/share/java/com.ibm.icu-4.2.jar:/usr/share/java/com.ibm.icu.jar
com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
-javax.servlet_2.5.0.v200910301333.jar=/home/akurtakov/orbit/servlet.jar:/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
@@ -10,8 +10,8 @@ org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache
org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
-org.mortbay.jetty.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-org.objectweb.asm_3.2.0.v200909071300.jar=/home/akurtakov/orbit/asm.jar:/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
-org.sat4j.core_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.core.jar:/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-org.sat4j.pb_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.pb.jar:/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
+org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
+org.objectweb.asm_3.2.0.v200909071300.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+org.sat4j.core_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+org.sat4j.pb_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/patches/donotsetjavahomeandoptimizeliblocalfile.patch b/patches/donotsetjavahomeandoptimizeliblocalfile.patch
index bc544fa..3ba3b5d 100644
--- a/patches/donotsetjavahomeandoptimizeliblocalfile.patch
+++ b/patches/donotsetjavahomeandoptimizeliblocalfile.patch
@@ -1,6 +1,6 @@
---- ./plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile.orig 2007-12-06 20:30:00.000000000 +0100
-+++ ./plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile 2009-08-26 23:12:41.594611729 +0200
-@@ -20,10 +20,10 @@ LIB_NAME_FULL = libunixfile_1_0_0.so
+--- a/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
++++ b/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
+@@ -20,10 +20,10 @@
OS_TYPE = linux
#Set this to be the location of your JRE
diff --git a/patches/donotstorebuildlogsinfiles.patch b/patches/donotstorebuildlogsinfiles.patch
index 526bbf8..9c26364 100644
--- a/patches/donotstorebuildlogsinfiles.patch
+++ b/patches/donotstorebuildlogsinfiles.patch
@@ -1,7 +1,6 @@
-diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
---- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml 2009-04-28 18:53:02.000000000 +0200
-+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml 2009-08-26 23:13:02.158691612 +0200
-@@ -63,7 +63,7 @@
+--- a/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
++++ b/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
+@@ -64,7 +64,7 @@
</target>
<target name="ecj">
@@ -10,10 +9,9 @@ diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclip
<arg line="-out:ecj.exe -main:org.eclipse.jdt.internal.compiler.batch.Main -recurse:./*.class -recurse:./*.properties -recurse:./*.rsc"/>
</exec>
<copy file="${ikvm_home}/bin/IKVM.Runtime.dll" todir="${dest}" />
-diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2007-11-29 15:16:54.000000000 +0100
-+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2009-08-26 23:13:03.342691628 +0200
-@@ -74,7 +74,7 @@
+--- a/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
++++ b/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
+@@ -65,7 +65,7 @@
<delete dir="reference/api"/>
<mkdir dir="reference/api"/>
@@ -21,8 +19,8 @@ diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclip
+ <exec dir="." executable="${javadoc}" >
<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
</exec>
- <antcall target="generateJdtAptJavadoc" />
-@@ -100,7 +100,7 @@
+
+@@ -98,7 +98,7 @@
<delete dir="reference/apt" />
<mkdir dir="reference/apt" />
@@ -30,11 +28,10 @@ diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclip
+ <exec dir="." executable="${javadoc15}" >
<arg line="@${basedir}/${jdtaptoptionsFile} -J-Xmx500M" />
</exec>
- </target>
-diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml
---- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2009-06-05 16:48:40.000000000 +0200
-+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2009-08-26 23:13:02.194691701 +0200
-@@ -63,7 +63,7 @@
+
+--- a/plugins/org.eclipse.pde.doc.user/buildDoc.xml
++++ b/plugins/org.eclipse.pde.doc.user/buildDoc.xml
+@@ -65,7 +65,7 @@
<delete dir="reference/api"/>
<mkdir dir="reference/api"/>
@@ -42,11 +39,10 @@ diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclip
+ <exec dir="." executable="${javadoc}" >
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
</exec>
- </target>
-diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
---- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2009-01-26 18:12:18.000000000 +0100
-+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2009-08-26 23:13:02.698691170 +0200
-@@ -118,7 +118,7 @@
+
+--- a/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
++++ b/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
+@@ -119,7 +119,7 @@
<delete dir="reference/api"/>
<mkdir dir="reference/api"/>
diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
index f41ba2d..7ae0129 100644
--- a/patches/eclipse-add-archs-executable.patch
+++ b/patches/eclipse-add-archs-executable.patch
@@ -1,6 +1,6 @@
---- target.build.properties.orig 2010-02-04 21:48:35.000000000 +0200
-+++ target.build.properties 2010-04-13 18:22:19.420042896 +0300
-@@ -22,10 +22,47 @@ root.win32.wpf.x86=file:bin/wpf/win32/x8
+--- a/features/org.eclipse.equinox.executable/target.build.properties
++++ b/features/org.eclipse.equinox.executable/target.build.properties
+@@ -22,10 +22,47 @@
root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
root.linux.gtk.x86.permissions.755=libcairo-swt.so
@@ -48,15 +48,8 @@
root.macosx.carbon.ppc=bin/carbon/macosx/ppc
root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
-@@ -57,4 +94,4 @@ root.linux.gtk.x86_64.permissions.755=li
- root.qnx.photon.x86=bin/photon/qnx/x86
-
- root.linux.motif.x86=bin/motif/linux/x86,motif_root
--root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
-\ No newline at end of file
-+root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
---- feature.xml.orig 2009-10-20 19:03:15.000000000 +0300
-+++ feature.xml 2010-04-13 18:32:05.844795100 +0300
+--- a/features/org.eclipse.equinox.executable/feature.xml
++++ b/features/org.eclipse.equinox.executable/feature.xml
@@ -88,6 +88,66 @@
version="0.0.0"
fragment="true"/>
diff --git a/patches/eclipse-add-archs-filesystem.patch b/patches/eclipse-add-archs-filesystem.patch
index 5c831f9..bdc4708 100644
--- a/patches/eclipse-add-archs-filesystem.patch
+++ b/patches/eclipse-add-archs-filesystem.patch
@@ -1,8 +1,8 @@
---- ./features/org.eclipse.platform/feature.xml.orig 2009-10-29 20:07:20.000000000 +0100
-+++ ./features/org.eclipse.platform/feature.xml 2009-10-29 20:16:08.000000000 +0100
-@@ -432,6 +432,66 @@
+--- a/features/org.eclipse.platform/feature.xml
++++ b/features/org.eclipse.platform/feature.xml
+@@ -441,6 +441,66 @@
unpack="false"/>
-
+
<plugin
+ id="org.eclipse.core.filesystem.linux.alpha"
+ os="linux"
@@ -67,7 +67,7 @@
id="org.eclipse.core.filesystem.linux.ppc"
os="linux"
arch="ppc"
-@@ -440,6 +500,56 @@
+@@ -449,6 +509,56 @@
version="0.0.0"
fragment="true"
unpack="false"/>
diff --git a/patches/eclipse-add-archs-swt.patch b/patches/eclipse-add-archs-swt.patch
index 315f614..ab54b9f 100644
--- a/patches/eclipse-add-archs-swt.patch
+++ b/patches/eclipse-add-archs-swt.patch
@@ -1,6 +1,6 @@
---- ./features/org.eclipse.rcp/feature.xml.orig 2009-10-25 09:34:48.000000000 +0100
-+++ ./features/org.eclipse.rcp/feature.xml 2009-10-29 20:13:44.000000000 +0100
-@@ -217,10 +217,87 @@
+--- a/features/org.eclipse.rcp/feature.xml
++++ b/features/org.eclipse.rcp/feature.xml
+@@ -206,10 +206,87 @@
unpack="false"/>
<plugin
@@ -90,7 +90,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -250,8 +327,8 @@
+@@ -239,8 +316,8 @@
unpack="false"/>
<plugin
@@ -101,7 +101,7 @@
ws="gtk"
arch="sparc"
download-size="0"
-@@ -259,12 +336,12 @@
+@@ -248,12 +325,12 @@
version="0.0.0"
fragment="true"
unpack="false"/>
@@ -118,7 +118,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -272,10 +349,10 @@
+@@ -261,10 +338,10 @@
unpack="false"/>
<plugin
diff --git a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
index 67b1409..9da34b5 100644
--- a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
+++ b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
@@ -1,5 +1,5 @@
---- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.orig 2009-10-25 09:34:49.000000000 +0100
-+++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2009-10-29 20:24:58.000000000 +0100
+--- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
++++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
@@ -48,6 +48,14 @@
Platform.ARCH_X86, //
Platform.ARCH_AMD64, //
@@ -15,8 +15,8 @@
Platform.ARCH_IA64_32};
// debug support: set in loadOptions()
---- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2009-10-25 09:34:49.000000000 +0100
-+++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2009-10-29 20:25:41.000000000 +0100
+--- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
++++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
@@ -349,6 +349,15 @@
* @since 3.1
*/
@@ -33,9 +33,9 @@
/**
* Constant string (value "win32") indicating the platform is running on a
---- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.orig 2009-10-25 09:34:54.000000000 +0100
-+++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 2009-10-29 20:23:01.000000000 +0100
-@@ -64,7 +64,7 @@
+--- a/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
++++ b/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
+@@ -63,7 +63,7 @@
private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
private static PluginConverterImpl instance;
@@ -44,9 +44,9 @@
static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
---- ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig 2009-10-25 09:34:54.000000000 +0100
-+++ ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2009-10-29 20:24:10.000000000 +0100
-@@ -153,6 +153,14 @@
+--- a/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
++++ b/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+@@ -160,6 +160,14 @@
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
diff --git a/patches/eclipse-addArchesAnd64bitSWT.patch b/patches/eclipse-addArchesAnd64bitSWT.patch
index 3051c50..e89334b 100644
--- a/patches/eclipse-addArchesAnd64bitSWT.patch
+++ b/patches/eclipse-addArchesAnd64bitSWT.patch
@@ -1,5 +1,5 @@
---- ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2009-12-08 09:00:12.000000000 +0200
-+++ ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2010-04-13 17:24:11.418047380 +0300
+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2009-12-08 09:00:12.000000000 +0200
++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2010-04-13 17:24:11.418047380 +0300
@@ -63,6 +63,18 @@ if [ "${MODEL}" = "" ]; then
fi
fi
diff --git a/patches/eclipse-buildswtnatives.patch b/patches/eclipse-buildswtnatives.patch
index c5072e9..759776e 100644
--- a/patches/eclipse-buildswtnatives.patch
+++ b/patches/eclipse-buildswtnatives.patch
@@ -1,6 +1,6 @@
---- ./plugins/org.eclipse.swt/buildFragment.xml.orig 2010-03-30 18:07:02.000000000 +0300
-+++ ./plugins/org.eclipse.swt/buildFragment.xml 2010-04-13 16:36:57.319044426 +0300
-@@ -545,4 +545,28 @@
+--- a/plugins/org.eclipse.swt/buildFragment.xml
++++ b/plugins/org.eclipse.swt/buildFragment.xml
+@@ -558,4 +558,28 @@
extraManifests="${extraManifests}"
extraSourceLocations="${extraSourceLocations}"/>
</target>
diff --git a/patches/eclipse-no-jetty5.patch b/patches/eclipse-no-jetty5.patch
index 3957512..8ecc402 100644
--- a/patches/eclipse-no-jetty5.patch
+++ b/patches/eclipse-no-jetty5.patch
@@ -1,5 +1,3 @@
-diff --git a/eclipse/features/master-equinox/feature.xml b/eclipse/features/master-equinox/feature.xml
-index ff7ccf1..d89663d 100644
--- a/features/master-equinox/feature.xml
+++ b/features/master-equinox/feature.xml
@@ -39,14 +39,14 @@
@@ -19,8 +17,6 @@ index ff7ccf1..d89663d 100644
<plugin
id="org.eclipse.equinox.http.jetty"
download-size="0"
-diff --git a/eclipse/features/master-jetty/feature.xml b/eclipse/features/master-jetty/feature.xml
-index a23c475..d33099e 100644
--- a/features/master-jetty/feature.xml
+++ b/features/master-jetty/feature.xml
@@ -17,14 +17,14 @@
diff --git a/patches/eclipse-nosourcebundlesfordependencies.patch b/patches/eclipse-nosourcebundlesfordependencies.patch
index 4a79c0c..eb31625 100644
--- a/patches/eclipse-nosourcebundlesfordependencies.patch
+++ b/patches/eclipse-nosourcebundlesfordependencies.patch
@@ -1,16 +1,15 @@
-diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.platform/sourceTemplateFeature/build.properties
---- ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:43.000000000 -0500
-+++ ./features/org.eclipse.platform/sourceTemplateFeature/build.properties 2010-02-26 13:46:34.000000000 -0500
-@@ -15,7 +15,7 @@ feature.xml,\
+--- a/features/org.eclipse.platform/sourceTemplateFeature/build.properties
++++ b/features/org.eclipse.platform/sourceTemplateFeature/build.properties
+@@ -15,7 +15,7 @@
feature.properties,\
license.html
--generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.0.1.qualifier;unpack="false"
+-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.2.1.qualifier;unpack="false"
+generate.feature at org.eclipse.rcp.source=org.eclipse.rcp
generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.ssl.source;version=1.0.0.qualifier;unpack="false",\
-@@ -24,9 +24,7 @@ generate.feature at org.eclipse.equinox.p2.
+@@ -24,9 +24,7 @@
plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=3.0.0.qualifier;unpack="false",\
@@ -21,17 +20,9 @@ diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.
-@@ -35,4 +33,4 @@ generate.feature at org.eclipse.equinox.p2.
-
-
-
--
-\ No newline at end of file
-+
-diff -up ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.sdk/build.properties
---- ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:53.000000000 -0500
-+++ ./features/org.eclipse.sdk/build.properties 2010-02-26 13:47:39.000000000 -0500
-@@ -11,26 +11,14 @@
+--- a/features/org.eclipse.sdk/build.properties
++++ b/features/org.eclipse.sdk/build.properties
+@@ -11,27 +11,14 @@
bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
@@ -41,9 +32,10 @@ diff -up ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependenc
generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
-plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
+-plugin at org.junit.source;version=4.8.1.qualifier;unpack="false",\
-plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
-exclude at org.eclipse.jdt.doc.user
--generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.1.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
+-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.2.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
+exclude at org.eclipse.jdt.doc.user,\
+exclude at org.junit4
+generate.feature at org.eclipse.pde.source=org.eclipse.pde,exclude at org.eclipse.pde.doc.user
@@ -57,10 +49,9 @@ diff -up ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependenc
- plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
- plugin at org.apache.lucene.source;version=1.9.1.qualifier;unpack="false",\
- plugin at org.apache.lucene.analysis.source;version=1.9.1.qualifier;unpack="false",\
-- plugin at org.mortbay.jetty.util.source;version=6.1.15.qualifier;unpack="false",\
-- plugin at org.mortbay.jetty.server.source;version=6.1.15.qualifier;unpack="false"
+- plugin at org.mortbay.jetty.util.source;version=6.1.23.qualifier;unpack="false",\
+- plugin at org.mortbay.jetty.server.source;version=6.1.23.qualifier;unpack="false"
+generate.feature at org.eclipse.help.source=org.eclipse.help
--generatedVersionLength=45
+ generatedVersionLength=45
\ No newline at end of file
-+generatedVersionLength=45
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index f5998ce..d9de2e0 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -1,11 +1,7 @@
### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.build
-Index: templates/package-build/prepare-build-dir.sh
-===================================================================
-RCS file: templates/package-build/prepare-build-dir.sh
-diff -N templates/package-build/prepare-build-dir.sh
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000
+--- /dev/null
++++ b/plugins/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
@@ -112,12 +108,8 @@ diff -N templates/package-build/prepare-build-dir.sh
+
+rm -rf $BUILDDIR/tmp
+echo done
-Index: templates/package-build/customTargets-assemble-target.xml
-===================================================================
-RCS file: templates/package-build/customTargets-assemble-target.xml
-diff -N templates/package-build/customTargets-assemble-target.xml
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/customTargets-assemble-target.xml 1 Jan 1970 00:00:00 -0000
+--- /dev/null
++++ b/plugins/org.eclipse.pde.build/templates/package-build/customTargets-assemble-target.xml
@@ -0,0 +1,15 @@
+<project>
+ <!-- ===================================================================== -->
@@ -134,12 +126,8 @@ diff -N templates/package-build/customTargets-assemble-target.xml
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
+ </target>
+</project>
-Index: templates/package-build/customTargets.xml
-===================================================================
-RCS file: templates/package-build/customTargets.xml
-diff -N templates/package-build/customTargets.xml
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/customTargets.xml 1 Jan 1970 00:00:00 -0000
+--- /dev/null
++++ b/plugins/org.eclipse.pde.build/templates/package-build/customTargets.xml
@@ -0,0 +1,154 @@
+<project name="Build specific targets and properties" default="noDefault">
+
@@ -295,12 +283,8 @@ diff -N templates/package-build/customTargets.xml
+ </target>
+
+</project>
-Index: templates/package-build/build.properties
-===================================================================
-RCS file: templates/package-build/build.properties
-diff -N templates/package-build/build.properties
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000
+--- /dev/null
++++ b/plugins/org.eclipse.pde.build/templates/package-build/build.properties
@@ -0,0 +1,12 @@
+buildDirectory=${sourceDirectory}/build
+buildLabel=rpmBuild
diff --git a/patches/eclipse-swt-buildagainstxulrunner.patch b/patches/eclipse-swt-buildagainstxulrunner.patch
index 5e75a62..9d3a5ea 100644
--- a/patches/eclipse-swt-buildagainstxulrunner.patch
+++ b/patches/eclipse-swt-buildagainstxulrunner.patch
@@ -5,9 +5,9 @@ Index: Eclipse SWT PI/gtk/library/build.sh
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
retrieving revision 1.54
diff -u -r1.54 build.sh
---- Eclipse SWT PI/gtk/library/build.sh 29 May 2009 21:30:14 -0000 1.54
-+++ Eclipse SWT PI/gtk/library/build.sh 1 Jun 2009 18:44:43 -0000
-@@ -106,19 +106,19 @@
+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 29 May 2009 21:30:14 -0000 1.54
++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 1 Jun 2009 18:44:43 -0000
+@@ -120,19 +120,19 @@
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
export MOZILLA_INCLUDES
export MOZILLA_LIBS
diff --git a/patches/eclipse-use-newer-commons-codec.patch b/patches/eclipse-use-newer-commons-codec.patch
index 5ea5dc6..1ab7b33 100644
--- a/patches/eclipse-use-newer-commons-codec.patch
+++ b/patches/eclipse-use-newer-commons-codec.patch
@@ -1,5 +1,5 @@
---- features/org.eclipse.equinox.p2.user.ui/feature.xml.orig 2010-04-06 06:12:02.000000000 +0300
-+++ features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-06-10 10:48:14.803076479 +0300
+--- a/features/org.eclipse.equinox.p2.user.ui/feature.xml
++++ b/features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -298,21 +298,21 @@
id="org.apache.commons.codec"
download-size="0"
diff --git a/patches/gnomeproxy-makefile.patch b/patches/gnomeproxy-makefile.patch
index be3bc60..ce2ff4b 100644
--- a/patches/gnomeproxy-makefile.patch
+++ b/patches/gnomeproxy-makefile.patch
@@ -1,6 +1,6 @@
---- ./plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 22:36:19.965754808 +0200
-+++ ./plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 23:01:39.375006881 +0200
-@@ -20,7 +20,8 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+--- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile
++++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+@@ -20,7 +20,8 @@
OS_TYPE = linux
JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
diff --git a/patches/java-home.patch b/patches/java-home.patch
new file mode 100644
index 0000000..9ca4cb3
--- /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: 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/patches/junit4-nochecksum.patch b/patches/junit4-nochecksum.patch
index c1e7782..72d7684 100644
--- a/patches/junit4-nochecksum.patch
+++ b/patches/junit4-nochecksum.patch
@@ -1,14 +1,15 @@
---- ./plugins/org.junit_4.8.1.v4_8_1_v20100114-1600/META-INF/MANIFEST.MF.sav 2010-03-07 22:38:26.000000000 +0200
-+++ ./plugins/org.junit_4.8.1.v4_8_1_v20100114-1600/META-INF/MANIFEST.MF 2010-04-20 23:23:36.962959283 +0300
-@@ -29,18 +29,4 @@ Export-Package: junit.extensions;version
- Bundle-Version: 4.8.1.v4_8_1_v20100114-1600
+--- a/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
++++ b/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
+@@ -28,19 +28,3 @@
+ ers.model;version="4.8.1"
+ Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
Bundle-ManifestVersion: 2
-
+-
-Name: META-INF/eclipse.inf
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
-
-Name: junit.jar
--SHA1-Digest: XIT/0/dzpzuuA72Vv7gtkiGAY6k=
+-SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
-
-Name: about_files/cpl-v10.html
-SHA1-Digest: REygXYi+T14Sj1v8XnnKycNjpN4=
@@ -17,5 +18,5 @@
-SHA1-Digest: w3lIEWRkSmgtAui4qxGRJmqgDw4=
-
-Name: plugin.properties
--SHA1-Digest: yg4cr1Fc8Pkzv804Pu1BHvrWCC4=
-
+-SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
+-
diff --git a/patches/osgi-util.patch b/patches/osgi-util.patch
index c75d6be..a854b00 100644
--- a/patches/osgi-util.patch
+++ b/patches/osgi-util.patch
@@ -1,8 +1,6 @@
-diff --git a/eclipse/plugins/org.eclipse.osgi.util/build.properties b/eclipse/plugins/org.eclipse.osgi.util/build.properties
-index 2a015f5..270afcd 100644
--- a/plugins/org.eclipse.osgi.util/build.properties
+++ b/plugins/org.eclipse.osgi.util/build.properties
-@@ -12,10 +12,10 @@ bin.includes = plugin.properties,\
+@@ -12,10 +12,10 @@
org/,\
about.html,\
META-INF/,\
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list