[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-81-gda93049
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Jul 2 09:22:04 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, master-3.6 has been updated
via da930493d1e3ab6835785797f2ce93f36906704e (commit)
from 01f8d9a3b7cf4b428d500080d90bde3a8f972bee (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 da930493d1e3ab6835785797f2ce93f36906704e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Jul 2 11:16:04 2010 +0200
Add refresh-patches.patch, rearrange order of patches, and refresh them.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 27 +-
debian/patches/add-o.e.equinox.concurrent.patch | 2 -
debian/patches/build-arch.patch | 2 +-
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
.../patches/eclipse-build-generatedScripts.patch | 2 +-
debian/patches/eclipse-manpage.patch | 2 +-
debian/patches/fix-bashism.patch | 8 +-
debian/patches/fix-shell-script-perm.patch | 8 +-
debian/patches/fix-tooltip-color.patch | 4 +-
debian/patches/java-home.patch | 8 +-
debian/patches/osgi-services-symlink-javax.patch | 6 +-
debian/patches/osgi-services.patch | 6 +-
debian/patches/refresh-patches.patch | 511 ++++++++++++++++++++
debian/patches/series | 31 +-
debian/patches/swt-compile-xpt.patch | 6 +-
.../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/junit4-nochecksum.patch | 17 +-
patches/osgi-util.patch | 4 +-
32 files changed, 657 insertions(+), 189 deletions(-)
diff --git a/build.xml b/build.xml
index 3c6eeb4..378cb58 100644
--- a/build.xml
+++ b/build.xml
@@ -263,27 +263,26 @@
<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" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<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" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/tooltip-color.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" />
diff --git a/debian/patches/add-o.e.equinox.concurrent.patch b/debian/patches/add-o.e.equinox.concurrent.patch
index 025af10..ff71c38 100644
--- a/debian/patches/add-o.e.equinox.concurrent.patch
+++ b/debian/patches/add-o.e.equinox.concurrent.patch
@@ -6,8 +6,6 @@ Author: Niels Thykier <niels at thykier.net>
Bug-Debian: #585178
Forwarded: not needed
-diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
-index a85e2dd..49fd699 100644
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
@@ -620,4 +620,12 @@
diff --git a/debian/patches/build-arch.patch b/debian/patches/build-arch.patch
index 9cc0330..fb31374 100644
--- a/debian/patches/build-arch.patch
+++ b/debian/patches/build-arch.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
--- a/build.xml
+++ b/build.xml
-@@ -53,6 +53,30 @@
+@@ -52,6 +52,30 @@
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 2ac11e4..c75ff13 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -334,6 +334,32 @@
+@@ -359,6 +359,32 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index db89ac0..784c73e 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Forwarded: no
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
-@@ -320,7 +321,24 @@
+@@ -345,7 +346,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/eclipse-build-generatedScripts.patch b/debian/patches/eclipse-build-generatedScripts.patch
index 2594177..8de8d4b 100644
--- a/debian/patches/eclipse-build-generatedScripts.patch
+++ b/debian/patches/eclipse-build-generatedScripts.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
<available file="eclipse-sdktests-${label}-src.tar.bz2" property="testsSourcePresent" value="true" />
<available file="eclipse-sdktests-${label}-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
-@@ -110,7 +110,7 @@
+@@ -134,7 +134,7 @@
</target>
<target name="extractBuildXmls" if="scriptsPresent">
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index b840289..158f23c 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -751,6 +751,12 @@
+@@ -774,6 +774,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/fix-bashism.patch b/debian/patches/fix-bashism.patch
index 326f7c8..eef6103 100644
--- a/debian/patches/fix-bashism.patch
+++ b/debian/patches/fix-bashism.patch
@@ -5,7 +5,7 @@ Last-Update: 2010-06-18
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
-@@ -53,7 +53,7 @@
+@@ -49,7 +49,7 @@
+ PROJECTDIR=$(dirname "$f")
+ inSDK=1
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
@@ -14,7 +14,7 @@ Last-Update: 2010-06-18
+ PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ ERROR=""
+ if [ -z "$PROJECTNAME" ]; then
-@@ -66,7 +66,7 @@
+@@ -62,7 +62,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
@@ -23,7 +23,7 @@ Last-Update: 2010-06-18
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
-@@ -81,7 +81,7 @@
+@@ -77,7 +77,7 @@
+ ERROR=""
+ inSDK=1
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
@@ -32,7 +32,7 @@ Last-Update: 2010-06-18
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ elif [ -e "$dir/plugin.xml" ]; then
-@@ -100,7 +100,7 @@
+@@ -96,7 +96,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
index 66de83e..a3d7a0f 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -5,10 +5,10 @@ Applied-Upstream: no
--- a/build.xml
+++ b/build.xml
-@@ -249,6 +249,7 @@
- <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" />
+@@ -273,6 +273,7 @@
+ <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" />
+ <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/fix-tooltip-color.patch b/debian/patches/fix-tooltip-color.patch
index 16a52ff..0d3ea32 100644
--- a/debian/patches/fix-tooltip-color.patch
+++ b/debian/patches/fix-tooltip-color.patch
@@ -5,10 +5,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/540332
--- a/build.xml
+++ b/build.xml
-@@ -260,6 +260,7 @@
+@@ -283,6 +283,7 @@
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/tooltip-color.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" />
diff --git a/debian/patches/java-home.patch b/debian/patches/java-home.patch
index e79fe33..0939ebe 100644
--- a/debian/patches/java-home.patch
+++ b/debian/patches/java-home.patch
@@ -2,9 +2,9 @@ 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 @@
+--- a/build.xml
++++ b/build.xml
+@@ -286,6 +286,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}" />
@@ -13,7 +13,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317372
</target>
--- /dev/null
-+++ eclipse-3.6.0/patches/java-home.patch
++++ b/patches/java-home.patch
@@ -0,0 +1,15 @@
+Description: Do not overwrite exported JAVA_HOME variable
+Author: Benjamin Drung <bdrung at ubuntu.com>
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index f015a21..f9d1722 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -4,11 +4,11 @@ Forwarded: No
--- a/build.xml
+++ b/build.xml
-@@ -258,6 +258,7 @@
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
+@@ -280,6 +280,7 @@
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.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" />
+ <!-- end eclipse-build-only patches -->
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index a18f385..48f34ab 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -5,10 +5,10 @@ Applied-Upstream: no
--- a/build.xml
+++ b/build.xml
-@@ -255,6 +255,7 @@
- <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" />
+@@ -279,6 +279,7 @@
+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/osgi-services-build.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" />
diff --git a/debian/patches/refresh-patches.patch b/debian/patches/refresh-patches.patch
new file mode 100644
index 0000000..745abc5
--- /dev/null
+++ b/debian/patches/refresh-patches.patch
@@ -0,0 +1,511 @@
+--- 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" />
+--- 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
+--- 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 @@
+ <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 @@
+ + <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 @@
+ + <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 @@
+ + <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"/>
+
+--- 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"/>
+--- 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"/>
+--- 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
+--- 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$
+
+--- 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
+--- 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>
+--- 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 @@
+ <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 @@
+--- 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 @@
+
+
+
+-@@ -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 @@
+
+ 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 @@
+ - 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
+--- 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 @@
+ +
+ +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 @@
+ + <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 @@
+ + </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
+--- a/patches/eclipse-swt-buildagainstxulrunner.patch
++++ b/patches/eclipse-swt-buildagainstxulrunner.patch
+@@ -5,9 +5,9 @@
+ 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
+--- 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"
+--- 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}
+--- 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=
++-
+--- 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/,\
diff --git a/debian/patches/series b/debian/patches/series
index 28d9127..e555afa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,22 +1,23 @@
-osgi-services.patch
-fix-shell-script-perm.patch
-lucene.patch
+refresh-patches.patch
+build-arch.patch
+java-home.patch
+regenerateBootstrapFiles.patch
+update-dependency.patch
+swt-compile-xpt.patch
eclipse-manpage.patch
-pdebuild-script.patch
-pdebuild-path-copy-platform.patch
-symlink-system-files.patch
+osgi-services.patch
+osgi-services-symlink-javax.patch
+fix-bashism.patch
compile-jarinjarloader.patch
compile-IPluginDescriptor.patch
use-stable-xulrunner.patch
-swt-compile-xpt.patch
-eclipse-build-generatedScripts.patch
-osgi-services-symlink-javax.patch
+lucene.patch
+add-o.e.equinox.concurrent.patch
ecj-gccmain-java.patch
+eclipse-build-generatedScripts.patch
fix-help-contents.patch
+fix-shell-script-perm.patch
+pdebuild-path-copy-platform.patch
+pdebuild-script.patch
+symlink-system-files.patch
fix-tooltip-color.patch
-fix-bashism.patch
-build-arch.patch
-update-dependency.patch
-regenerateBootstrapFiles.patch
-java-home.patch
-add-o.e.equinox.concurrent.patch
diff --git a/debian/patches/swt-compile-xpt.patch b/debian/patches/swt-compile-xpt.patch
index a06caee..86b215a 100644
--- a/debian/patches/swt-compile-xpt.patch
+++ b/debian/patches/swt-compile-xpt.patch
@@ -4,10 +4,10 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
--- a/build.xml
+++ b/build.xml
-@@ -258,6 +258,7 @@
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
+@@ -278,6 +278,7 @@
+ <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" />
- <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.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" />
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 d141306..a7039c5 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 64e2f19..62eb47e 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/junit4-nochecksum.patch b/patches/junit4-nochecksum.patch
index c1e7782..5a2e25d 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