r1859 - in trunk/eclipse/debian: . extra patches
Stephan Michels
tashiro-guest at costa.debian.org
Sat Feb 4 15:39:29 UTC 2006
Author: tashiro-guest
Date: 2006-02-04 15:39:26 +0000 (Sat, 04 Feb 2006)
New Revision: 1859
Added:
trunk/eclipse/debian/extra/links.txt
trunk/eclipse/debian/extra/package-links.txt
trunk/eclipse/debian/patches/eclipse-heapstatus.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
trunk/eclipse/debian/patches/eclipse-disable-tomcat.dpatch
trunk/eclipse/debian/patches/eclipse-javadoc-bootclasspath.dpatch
trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
trunk/eclipse/debian/patches/eclipse-tomcat5.dpatch
trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch
trunk/eclipse/debian/rules
Log:
* New upstream version. Release notes:
http://www.eclipse.org/eclipse/development/readme_eclipse_3.1.2.html
* debian/rules: Replaced logic to create the symbolic links.
* debian/patches/eclipse-java-model-cache.dpatch: Removed
patch because it is fixed upstream in 3.1.2
* debian/patches/eclipse-libswt-mozilla.dpatch,
debian/patches/eclipse-libswt-firefox.dpatch: Using pkg-config to get
compiler flags for the compilation of SWT.
* debian/patches/eclipse-updatehomedir.dpatch: Updated patch to
the latest version.
* Added heapstatus patch from Michael Koch
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/changelog 2006-02-04 15:39:26 UTC (rev 1859)
@@ -1,17 +1,31 @@
-eclipse (3.1.1-9) UNRELEASED; urgency=low
+eclipse (3.1.2-1) UNRELEASED; urgency=low
+ [ Stephan Michels ]
+ * New upstream version. Release notes:
+ http://www.eclipse.org/eclipse/development/readme_eclipse_3.1.2.html
+ * debian/extra/eclipse.sh: Make the -vmargs and -install
+ arguments usable. Closes: #347749
+ * debian/rules: Replaced logic to create the symbolic links.
+ * debian/patches/eclipse-java-model-cache.dpatch: Removed
+ patch because it is fixed upstream in 3.1.2
+ * debian/patches/eclipse-libswt-mozilla.dpatch,
+ debian/patches/eclipse-libswt-firefox.dpatch: Using pkg-config to get
+ compiler flags for the compilation of SWT.
+ * debian/patches/eclipse-updatehomedir.dpatch: Updated patch to
+ the latest version.
+
[ Michael Koch ]
* debian/extra/eclipse.sh: Made the -vm option working.
+ * debian/control.in: eclipse-platform-common: Depends on zenity |
+ kdebase-bin | xdialog instead of zenity only.
+ * Added debian/patches/eclipse-heapstatus.dpatch to show the heap status
+ always.
* Added watch file.
- [ Stephan Michels ]
- * debian/extra/eclipse.sh: Make the -vmargs and -install
- arguments usable. Closes: #347749
-
[ Matthias Klose ]
* Add support to build using firefox-dev (turned off by default).
- -- Michael Koch <konqueror at gmx.de> Thu, 26 Jan 2006 23:00:43 +0000
+ -- Stephan Michels <stephan at apache.org> Tue, 31 Jan 2006 20:02:26 +0100
eclipse (3.1.1-8) unstable; urgency=low
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/control 2006-02-04 15:39:26 UTC (rev 1859)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, firefox-dev
Standards-Version: 3.6.2
Package: eclipse-rcp
@@ -96,7 +96,7 @@
Package: eclipse-platform-common
Architecture: all
-Depends: java-gcj-compat | java1-runtime, java-common (>= 0.23), zenity
+Depends: java-gcj-compat | java1-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog
Conflicts: eclipse-platform (<< 3.0)
Replaces: eclipse-platform (<< 3.0)
Description: Eclipse platform without plug-ins to develop any language (common files)
@@ -233,7 +233,7 @@
Package: libswt3.1-gtk-java
Architecture: any
-Depends: libswt3.1-gtk-jni (= ${Source-Version}), mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7) | firefox (>= 1.4.99), java-common
+Depends: libswt3.1-gtk-jni (= ${Source-Version}), firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7), java-common
Replaces: libswt2.1-gtk2-java, libswt-gtk3-java
Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
Description: Fast and rich GUI toolkit for Java, gtk2 version
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/control.in 2006-02-04 15:39:26 UTC (rev 1859)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
Standards-Version: 3.6.2
Package: eclipse-rcp
@@ -96,7 +96,7 @@
Package: eclipse-platform-common
Architecture: all
-Depends: java-gcj-compat | java1-runtime, java-common (>= 0.23), zenity
+Depends: java-gcj-compat | java1-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog
Conflicts: eclipse-platform (<< 3.0)
Replaces: eclipse-platform (<< 3.0)
Description: Eclipse platform without plug-ins to develop any language (common files)
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/extra/eclipse.sh 2006-02-04 15:39:26 UTC (rev 1859)
@@ -10,11 +10,21 @@
VMARGS=""
INSTALL="/usr/lib/eclipse"
+if [ -x /usr/bin/zenity ]; then
+ DIALOG=/usr/bin/zenity
+elif [ -x /usr/bin/kdialog ]; then
+ DIALOG=/usr/bin/kdialog
+elif [ -x /usr/bin/xdialog ]; then
+ DIALOG=/usr/bin/xdialog
+else
+ DIALOG=echo
+fi
+
# Make sure this directory exists.
if [ ! -d ~/.eclipse ]; then
mkdir ~/.eclipse > /dev/null 2>&1
if [ $? -ne 0 ]; then
- zenity \
+ $DIALOG \
--error \
--title="Could not launch Eclipse Platform" \
--text="Could not create settings directory at ~/.eclipse."
@@ -66,7 +76,7 @@
if [ -n "${JAVA_HOME}" ]; then
echo "using specified vm: ${JAVA_HOME}"
if [ ! -x "${JAVA_HOME}/bin/java" ]; then
- zenity \
+ $DIALOG \
--error \
--title="Could not launch Eclipse Platform" \
--text="The custom VM you have chosen is not a valid executable."
@@ -96,7 +106,7 @@
# If we don't have a JAVA_HOME yet, we're doomed.
if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then
- zenity \
+ $DIALOG \
--error \
--title="Could not launch Eclipse Platform" \
--text="A suitable Java Virtual Machine for running the Eclipse Platform could not be located."
@@ -109,11 +119,11 @@
fi
# Set path for the Mozilla SWT binding
-if [ -d /usr/lib/firefox ]; then
+if [ -d /usr/lib/firefox/libxpcom.so ]; then
export MOZILLA_FIVE_HOME=/usr/lib/firefox
-elif [ -d /usr/lib/mozilla-firefox ]; then
+elif [ -d /usr/lib/mozilla-firefox/libxpcom.so ]; then
export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
-elif [ -d /usr/lib/mozilla ]; then
+elif [ -d /usr/lib/mozilla/libxpcom.so ]; then
export MOZILLA_FIVE_HOME=/usr/lib/mozilla
fi
Added: trunk/eclipse/debian/extra/links.txt
===================================================================
--- trunk/eclipse/debian/extra/links.txt 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/extra/links.txt 2006-02-04 15:39:26 UTC (rev 1859)
@@ -0,0 +1,47 @@
+/usr/share/tomcat5/server/lib/tomcat-coyote.jar org.eclipse.tomcat/tomcat-coyote.jar
+/usr/share/tomcat5/common/lib/servlet-api.jar org.eclipse.tomcat/servlet.jar
+/usr/share/java/commons-collections.jar org.eclipse.tomcat/commons-collections.jar
+/usr/share/tomcat5/bin/bootstrap.jar org.eclipse.tomcat/bootstrap.jar
+/usr/share/tomcat5/server/lib/tomcat-http11.jar org.eclipse.tomcat/tomcat-http11.jar
+/usr/share/java/commons-modeler.jar org.eclipse.tomcat/commons-modeler.jar
+/usr/share/java/commons-logging-api.jar org.eclipse.tomcat/commons-logging-api.jar
+/usr/share/java/commons-beanutils.jar org.eclipse.tomcat/commons-beanutils.jar
+/usr/share/tomcat5/server/lib/servlets-common.jar org.eclipse.tomcat/servlets-common.jar
+/usr/share/tomcat5/server/lib/tomcat-util.jar org.eclipse.tomcat/tomcat-util.jar
+/usr/share/tomcat5/server/lib/servlets-invoker.jar org.eclipse.tomcat/servlets-invoker.jar
+/usr/share/java/commons-digester.jar org.eclipse.tomcat/commons-digester.jar
+/usr/share/tomcat5/common/lib/jasper-runtime.jar org.eclipse.tomcat/jasper-runtime.jar
+/usr/share/tomcat5/server/lib/jakarta-regexp.jar org.eclipse.tomcat/jakarta-regexp-1.3.jar
+/usr/share/tomcat5/server/lib/servlets-default.jar org.eclipse.tomcat/servlets-default.jar
+/usr/share/tomcat5/common/lib/naming-factory.jar org.eclipse.tomcat/naming-factory.jar
+/usr/share/tomcat5/server/lib/catalina.jar org.eclipse.tomcat/catalina.jar
+/usr/share/tomcat5/server/lib/catalina-optional.jar org.eclipse.tomcat/catalina-optional.jar
+/usr/share/java/mx4j-impl.jar org.eclipse.tomcat/mx4j-impl.jar
+/usr/share/java/mx4j-jmx.jar org.eclipse.tomcat/mx4j-jmx.jar
+/usr/share/tomcat5/common/lib/naming-common.jar org.eclipse.tomcat/naming-common.jar
+/usr/share/tomcat5/common/lib/naming-resources.jar org.eclipse.tomcat/naming-resources.jar
+/usr/share/tomcat5/common/lib/jasper-compiler.jar org.eclipse.tomcat/jasper-compiler.jar
+/usr/share/tomcat5/common/lib/jsp-api.jar org.eclipse.tomcat/jsp-api.jar
+/usr/share/java/commons-el.jar org.eclipse.tomcat/commons-el.jar
+/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant/lib/ant-apache-log4j.jar
+/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant/lib/ant-apache-resolver.jar
+/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant/lib/ant-commons-logging.jar
+/usr/share/ant/lib/ant-nodeps.jar org.apache.ant/lib/ant-nodeps.jar
+/usr/share/ant/lib/ant-javamail.jar org.apache.ant/lib/ant-javamail.jar
+/usr/share/ant/lib/ant-jsch.jar org.apache.ant/lib/ant-jsch.jar
+/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant/lib/ant-apache-bsf.jar
+/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant/lib/ant-apache-regexp.jar
+/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant/lib/ant-apache-oro.jar
+/usr/share/ant/lib/ant-antlr.jar org.apache.ant/lib/ant-antlr.jar
+/usr/share/ant/lib/ant-jdepend.jar org.apache.ant/lib/ant-jdepend.jar
+/usr/share/ant/lib/ant-junit.jar org.apache.ant/lib/ant-junit.jar
+/usr/share/ant/lib/ant.jar org.apache.ant/lib/ant.jar
+/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant/lib/ant-apache-bcel.jar
+/usr/share/ant/lib/ant-launcher.jar org.apache.ant/lib/ant-launcher.jar
+/usr/share/ant/lib/ant-jmf.jar org.apache.ant/lib/ant-jmf.jar
+/usr/share/ant/lib/ant-commons-net.jar org.apache.ant/lib/ant-commons-net.jar
+/usr/share/ant/lib/ant-trax.jar org.apache.ant/lib/ant-trax.jar
+/usr/share/ant/lib/ant-swing.jar org.apache.ant/lib/ant-swing.jar
+/usr/share/java/lucene-1.4.3.jar org.apache.lucene/lucene-1.4.3.jar
+/usr/share/java/junit.jar org.junit/junit.jar
+/usr/share/java/jsch.jar org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
Added: trunk/eclipse/debian/extra/package-links.txt
===================================================================
--- trunk/eclipse/debian/extra/package-links.txt 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/extra/package-links.txt 2006-02-04 15:39:26 UTC (rev 1859)
@@ -0,0 +1,47 @@
+/usr/share/tomcat5/server/lib/tomcat-coyote.jar org.eclipse.tomcat_5.0.30/tomcat-coyote.jar
+/usr/share/tomcat5/common/lib/servlet-api.jar org.eclipse.tomcat_5.0.30/servlet.jar
+/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.0.30/commons-collections.jar
+/usr/share/tomcat5/bin/bootstrap.jar org.eclipse.tomcat_5.0.30/bootstrap.jar
+/usr/share/tomcat5/server/lib/tomcat-http11.jar org.eclipse.tomcat_5.0.30/tomcat-http11.jar
+/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.0.30/commons-modeler.jar
+/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.0.30/commons-logging-api.jar
+/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.0.30/commons-beanutils.jar
+/usr/share/tomcat5/server/lib/servlets-common.jar org.eclipse.tomcat_5.0.30/servlets-common.jar
+/usr/share/tomcat5/server/lib/tomcat-util.jar org.eclipse.tomcat_5.0.30/tomcat-util.jar
+/usr/share/tomcat5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.0.30/servlets-invoker.jar
+/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.0.30/commons-digester.jar
+/usr/share/tomcat5/common/lib/jasper-runtime.jar org.eclipse.tomcat_5.0.30/jasper-runtime.jar
+/usr/share/tomcat5/server/lib/jakarta-regexp.jar org.eclipse.tomcat_5.0.30/jakarta-regexp-1.3.jar
+/usr/share/tomcat5/server/lib/servlets-default.jar org.eclipse.tomcat_5.0.30/servlets-default.jar
+/usr/share/tomcat5/common/lib/naming-factory.jar org.eclipse.tomcat_5.0.30/naming-factory.jar
+/usr/share/tomcat5/server/lib/catalina.jar org.eclipse.tomcat_5.0.30/catalina.jar
+/usr/share/tomcat5/server/lib/catalina-optional.jar org.eclipse.tomcat_5.0.30/catalina-optional.jar
+/usr/share/java/mx4j-impl.jar org.eclipse.tomcat_5.0.30/mx4j-impl.jar
+/usr/share/java/mx4j-jmx.jar org.eclipse.tomcat_5.0.30/mx4j-jmx.jar
+/usr/share/tomcat5/common/lib/naming-common.jar org.eclipse.tomcat_5.0.30/naming-common.jar
+/usr/share/tomcat5/common/lib/naming-resources.jar org.eclipse.tomcat_5.0.30/naming-resources.jar
+/usr/share/tomcat5/common/lib/jasper-compiler.jar org.eclipse.tomcat_5.0.30/jasper-compiler.jar
+/usr/share/tomcat5/common/lib/jsp-api.jar org.eclipse.tomcat_5.0.30/jsp-api.jar
+/usr/share/java/commons-el.jar org.eclipse.tomcat_5.0.30/commons-el.jar
+/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.6.5/lib/ant-apache-log4j.jar
+/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.6.5/lib/ant-apache-resolver.jar
+/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.6.5/lib/ant-commons-logging.jar
+/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.6.5/lib/ant-nodeps.jar
+/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.6.5/lib/ant-javamail.jar
+/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.6.5/lib/ant-jsch.jar
+/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.6.5/lib/ant-apache-bsf.jar
+/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.6.5/lib/ant-apache-regexp.jar
+/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.6.5/lib/ant-apache-oro.jar
+/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.6.5/lib/ant-antlr.jar
+/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.6.5/lib/ant-jdepend.jar
+/usr/share/ant/lib/ant-junit.jar org.apache.ant_1.6.5/lib/ant-junit.jar
+/usr/share/ant/lib/ant.jar org.apache.ant_1.6.5/lib/ant.jar
+/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant_1.6.5/lib/ant-apache-bcel.jar
+/usr/share/ant/lib/ant-launcher.jar org.apache.ant_1.6.5/lib/ant-launcher.jar
+/usr/share/ant/lib/ant-jmf.jar org.apache.ant_1.6.5/lib/ant-jmf.jar
+/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.6.5/lib/ant-commons-net.jar
+/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.6.5/lib/ant-trax.jar
+/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.6.5/lib/ant-swing.jar
+/usr/share/java/lucene-1.4.3.jar org.apache.lucene_1.4.3/lucene-1.4.3.jar
+/usr/share/java/junit.jar org.junit_3.8.1/junit.jar
+/usr/share/java/jsch.jar org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar
Modified: trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -21,24 +21,26 @@
exit 0
@DPATCH@
-diff -r -u ../source-tree.orig/features/org.eclipse.jdt/build.xml source-tree/features/org.eclipse.jdt/build.xml
---- ../source-tree.orig/features/org.eclipse.jdt/build.xml 2005-10-01 22:55:25.000000000 +0200
-+++ source-tree/features/org.eclipse.jdt/build.xml 2005-10-01 22:58:21.000000000 +0200
-@@ -47,11 +47,6 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.jdt/build.xml source-tree/features/org.eclipse.jdt/build.xml
+--- source-tree.orig/features/org.eclipse.jdt/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.jdt/build.xml 2006-01-28 15:13:55.000000000 +0100
+@@ -52,11 +52,13 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.launching.macosx" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.debug.ui" target="${target}">
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.launching.macosx" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="macosx"/>
+ <property name="ws" value="carbon"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-diff -r -u ../source-tree.orig/features/org.eclipse.jdt.source/build.xml source-tree/features/org.eclipse.jdt.source/build.xml
---- ../source-tree.orig/features/org.eclipse.jdt.source/build.xml 2005-10-01 22:55:25.000000000 +0200
-+++ source-tree/features/org.eclipse.jdt.source/build.xml 2005-10-01 22:59:04.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.jdt.source/build.xml source-tree/features/org.eclipse.jdt.source/build.xml
+--- source-tree.orig/features/org.eclipse.jdt.source/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.jdt.source/build.xml 2006-01-28 15:11:19.000000000 +0100
@@ -17,11 +17,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
@@ -51,223 +53,213 @@
</target>
<target name="all.features" depends="init">
</target>
-diff -r -u ../source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
---- ../source-tree.orig/features/org.eclipse.platform/build.xml 2005-10-01 22:55:25.000000000 +0200
-+++ source-tree/features/org.eclipse.platform/build.xml 2005-10-01 23:00:23.000000000 +0200
-@@ -87,11 +87,6 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
+--- source-tree.orig/features/org.eclipse.platform/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.platform/build.xml 2006-01-28 15:15:11.000000000 +0100
+@@ -77,11 +77,13 @@
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.win32" target="${target}">
+ <property name="arch" value="x86"/>
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.win32" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}">
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.help.base" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -172,11 +167,6 @@
+@@ -182,11 +184,13 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.team.cvs.ssh" target="${target}">
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="macosx"/>
+ <property name="ws" value="carbon"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.views" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -252,11 +242,6 @@
+@@ -242,11 +246,13 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.win32" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.debug.ui" target="${target}">
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.win32" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-diff -r -u ../source-tree.orig/features/org.eclipse.platform.source/build.xml source-tree/features/org.eclipse.platform.source/build.xml
---- ../source-tree.orig/features/org.eclipse.platform.source/build.xml 2005-10-01 22:55:24.000000000 +0200
-+++ source-tree/features/org.eclipse.platform.source/build.xml 2005-10-01 23:02:51.000000000 +0200
-@@ -27,16 +27,6 @@
+ <property name="ws" value="win32"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.compare" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform.source/build.xml source-tree/features/org.eclipse.platform.source/build.xml
+--- source-tree.orig/features/org.eclipse.platform.source/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.platform.source/build.xml 2006-01-28 15:17:43.000000000 +0100
+@@ -27,6 +27,7 @@
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.win32.win32.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.ia64_32" target="${target}">
-- <property name="arch" value="ia64_32"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.x86_64" target="${target}">
- <property name="arch" value="x86_64"/>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.ia64" target="${target}">
+ <property name="arch" value="ia64"/>
+ <property name="os" value="hpux"/>
+@@ -37,11 +38,13 @@
+ <property name="os" value="hpux"/>
+ <property name="ws" value="motif"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.ppc64" target="${target}">
+ <property name="arch" value="ppc64"/>
<property name="os" value="linux"/>
-@@ -52,26 +42,6 @@
+ <property name="ws" value="gtk"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="linux"/>
+@@ -52,11 +55,13 @@
+ <property name="os" value="qnx"/>
+ <property name="ws" value="photon"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.ia64" target="${target}">
+ <property name="arch" value="ia64"/>
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.win32.win32.x86" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+@@ -72,6 +77,7 @@
<property name="os" value="hpux"/>
<property name="ws" value="motif"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}">
-- <property name="arch" value="PA_RISC"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.qnx.photon.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="qnx"/>
-- <property name="ws" value="photon"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="linux"/>
-- <property name="ws" value="motif"/>
-- </ant>
++-->
<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.doc.isv" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-diff -r -u ../source-tree.orig/features/org.eclipse.rcp/build.xml source-tree/features/org.eclipse.rcp/build.xml
---- ../source-tree.orig/features/org.eclipse.rcp/build.xml 2005-10-01 22:55:25.000000000 +0200
-+++ source-tree/features/org.eclipse.rcp/build.xml 2005-10-01 23:07:08.000000000 +0200
-@@ -22,56 +22,16 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.rcp/build.xml source-tree/features/org.eclipse.rcp/build.xml
+--- source-tree.orig/features/org.eclipse.rcp/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.rcp/build.xml 2006-01-28 15:20:08.000000000 +0100
+@@ -22,6 +22,7 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}">
-- <property name="arch" value="PA_RISC"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="linux"/>
+@@ -42,21 +43,25 @@
+ <property name="os" value="solaris"/>
+ <property name="ws" value="motif"/>
+ </ant>
++-->
<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}">
<property name="arch" value="x86_64"/>
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="linux"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}">
-- <property name="arch" value="sparc"/>
-- <property name="os" value="solaris"/>
-- <property name="ws" value="gtk"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}">
-- <property name="arch" value="sparc"/>
-- <property name="os" value="solaris"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="qnx"/>
-- <property name="ws" value="photon"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}">
-- <property name="arch" value="ia64_32"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}">
- <property name="arch" value="ppc"/>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}">
+ <property name="arch" value="ia64"/>
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}">
+ <property name="arch" value="ia64_32"/>
+ <property name="os" value="hpux"/>
+@@ -67,6 +72,7 @@
+ <property name="os" value="macosx"/>
+ <property name="ws" value="carbon"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+@@ -77,21 +83,25 @@
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}">
+ <property name="arch" value="sparc"/>
+ <property name="os" value="solaris"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++-->
<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="linux"/>
-@@ -87,11 +47,6 @@
- <property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="aix"/>
-- <property name="ws" value="motif"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.expressions" target="${target}">
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="aix"/>
+ <property name="ws" value="motif"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.configurator" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-diff -r -u ../source-tree.orig/features/org.eclipse.rcp.source/build.xml source-tree/features/org.eclipse.rcp.source/build.xml
---- ../source-tree.orig/features/org.eclipse.rcp.source/build.xml 2005-10-01 22:55:25.000000000 +0200
-+++ source-tree/features/org.eclipse.rcp.source/build.xml 2005-10-01 23:10:18.000000000 +0200
-@@ -17,46 +17,6 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.rcp.source/build.xml source-tree/features/org.eclipse.rcp.source/build.xml
+--- source-tree.orig/features/org.eclipse.rcp.source/build.xml 2006-01-28 15:08:20.000000000 +0100
++++ source-tree/features/org.eclipse.rcp.source/build.xml 2006-01-28 15:21:51.000000000 +0100
+@@ -12,6 +12,7 @@
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.motif.x86" target="${target}">
+ <property name="arch" value="x86"/>
<property name="os" value="linux"/>
- <property name="ws" value="gtk"/>
+@@ -37,6 +38,7 @@
+ <property name="os" value="solaris"/>
+ <property name="ws" value="motif"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.ia64_32" target="${target}">
-- <property name="arch" value="ia64_32"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.win32.win32.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.motif.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="linux"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.aix.motif.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="aix"/>
-- <property name="ws" value="motif"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.qnx.photon.x86" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="qnx"/>
-- <property name="ws" value="photon"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.sparc" target="${target}">
-- <property name="arch" value="sparc"/>
-- <property name="os" value="solaris"/>
-- <property name="ws" value="gtk"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.motif.sparc" target="${target}">
-- <property name="arch" value="sparc"/>
-- <property name="os" value="solaris"/>
-- <property name="ws" value="motif"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86_64" target="${target}">
- <property name="arch" value="x86_64"/>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86" target="${target}">
+ <property name="arch" value="x86"/>
<property name="os" value="linux"/>
-@@ -72,11 +32,6 @@
+@@ -47,6 +49,7 @@
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.PA_RISC" target="${target}">
-- <property name="arch" value="PA_RISC"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
- </target>
- <target name="all.features" depends="init">
- </target>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="macosx"/>
+@@ -62,16 +65,19 @@
+ <property name="os" value="solaris"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ppc" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ </ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.ia64_32" target="${target}">
+ <property name="arch" value="ia64_32"/>
+ <property name="os" value="hpux"/>
+ <property name="ws" value="motif"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ia64" target="${target}">
+ <property name="arch" value="ia64"/>
+ <property name="os" value="linux"/>
Modified: trunk/eclipse/debian/patches/eclipse-disable-tomcat.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-tomcat.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-disable-tomcat.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -21,41 +21,50 @@
exit 0
@DPATCH@
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml
---- ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2005-10-20 11:16:17.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -43,12 +43,14 @@
- <mkdir dir="${archiveParentFolder}"/>
- <mkdir dir="${assemblyTempDir}"/>
- <mkdir dir="${buildLabel}"/>
-+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-01-28 14:20:11.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-01-28 14:38:51.000000000 +0100
+@@ -67,9 +67,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
++<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -76,9 +78,11 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+@@ -100,9 +102,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -346,10 +350,12 @@
- <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
- <property name="feature.base" value="${eclipse.base}"/>
+@@ -238,9 +242,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+@@ -526,10 +532,12 @@
+ <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.ltk.ui.refactoring_3.1.1"/>
+ </antcall>
++<!--
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.help.appserver_3.1.0"/>
@@ -63,46 +72,50 @@
+-->
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ant.ui_3.1.1"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
---- ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2005-10-20 11:16:17.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -43,15 +43,19 @@
- <mkdir dir="${archiveParentFolder}"/>
- <mkdir dir="${assemblyTempDir}"/>
- <mkdir dir="${buildLabel}"/>
+ <param name="elementName" value="org.eclipse.core.variables_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-01-28 14:20:11.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-01-28 14:40:47.000000000 +0100
+@@ -67,9 +67,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.linux.gtk.ppc64" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+@@ -97,9 +99,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -79,9 +83,11 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+@@ -232,9 +236,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -337,10 +343,12 @@
- <ant antfile="build.xml" dir="features/org.eclipse.jdt/" target="gather.bin.parts">
- <property name="feature.base" value="${eclipse.base}"/>
- </ant>
+@@ -513,10 +519,12 @@
+ <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.ltk.ui.refactoring_3.1.1"/>
+ </antcall>
+<!--
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -111,42 +124,51 @@
+-->
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ant.ui_3.1.1"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
---- ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2005-10-20 11:16:17.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -43,12 +43,14 @@
- <mkdir dir="${archiveParentFolder}"/>
- <mkdir dir="${assemblyTempDir}"/>
- <mkdir dir="${buildLabel}"/>
-+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+ <param name="elementName" value="org.eclipse.core.variables_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-01-28 14:20:11.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-01-28 14:41:49.000000000 +0100
+@@ -67,9 +67,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
++<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -76,9 +78,11 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+@@ -100,9 +102,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -346,10 +350,12 @@
- <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
- <property name="feature.base" value="${eclipse.base}"/>
+@@ -241,9 +245,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+@@ -526,10 +532,12 @@
+ <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.ltk.ui.refactoring_3.1.1"/>
+ </antcall>
++<!--
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.help.appserver_3.1.0"/>
@@ -154,42 +176,51 @@
+-->
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ant.ui_3.1.1"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
---- ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2005-10-20 11:16:17.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -43,12 +43,14 @@
- <mkdir dir="${archiveParentFolder}"/>
- <mkdir dir="${assemblyTempDir}"/>
- <mkdir dir="${buildLabel}"/>
-+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+ <param name="elementName" value="org.eclipse.core.variables_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-01-28 14:20:11.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-01-28 14:42:42.000000000 +0100
+@@ -67,9 +67,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
++<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -76,9 +78,11 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+@@ -103,9 +105,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -346,10 +350,12 @@
- <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
- <property name="feature.base" value="${eclipse.base}"/>
+@@ -241,9 +245,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+@@ -526,10 +532,12 @@
+ <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.ltk.ui.refactoring_3.1.1"/>
+ </antcall>
++<!--
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.help.appserver_3.1.0"/>
@@ -197,42 +228,51 @@
+-->
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ant.ui_3.1.1"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml
---- ../source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2005-10-20 11:16:17.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -43,12 +43,14 @@
- <mkdir dir="${archiveParentFolder}"/>
- <mkdir dir="${assemblyTempDir}"/>
- <mkdir dir="${buildLabel}"/>
-+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+ <param name="elementName" value="org.eclipse.core.variables_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-01-28 14:20:11.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-01-28 14:43:32.000000000 +0100
+@@ -67,9 +67,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
++<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -76,9 +78,11 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+@@ -97,9 +99,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+-->
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -346,10 +350,12 @@
- <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
- <property name="feature.base" value="${eclipse.base}"/>
+@@ -238,9 +242,11 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+<!--
+ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+@@ -522,10 +528,12 @@
+ <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.ltk.ui.refactoring_3.1.1"/>
+ </antcall>
++<!--
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.help.appserver_3.1.0"/>
@@ -240,11 +280,11 @@
+-->
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ant.ui_3.1.1"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
---- ../source-tree.orig/features/org.eclipse.platform/build.xml 2005-10-20 11:16:13.000000000 +0200
-+++ source-tree/features/org.eclipse.platform/build.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -47,6 +47,7 @@
+ <param name="elementName" value="org.eclipse.core.variables_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
+--- source-tree.orig/features/org.eclipse.platform/build.xml 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/features/org.eclipse.platform/build.xml 2006-01-28 14:45:23.000000000 +0100
+@@ -42,11 +42,13 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -252,17 +292,29 @@
<ant antfile="build.xml" dir="../../plugins/org.eclipse.help.appserver" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -57,6 +58,7 @@
+ <property name="ws" value="win32"/>
+ </ant>
++-->
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.variables" target="${target}">
+ <property name="arch" value="x86"/>
<property name="os" value="win32"/>
+@@ -62,11 +64,13 @@
+ <property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
++<!--
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.tomcat" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
+-->
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core" target="${target}">
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -122,11 +124,13 @@
- <property name="os" value="macosx"/>
- <property name="ws" value="carbon"/>
+@@ -92,11 +96,13 @@
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
</ant>
+<!--
<ant antfile="build.xml" dir="../../plugins/org.eclipse.help.webapp" target="${target}">
@@ -271,12 +323,12 @@
<property name="ws" value="win32"/>
</ant>
+-->
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.compatibility" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/features/org.eclipse.platform/feature.xml source-tree/features/org.eclipse.platform/feature.xml
---- ../source-tree.orig/features/org.eclipse.platform/feature.xml 2005-10-20 11:16:13.000000000 +0200
-+++ source-tree/features/org.eclipse.platform/feature.xml 2005-10-20 11:32:07.000000000 +0200
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.macosx" target="${target}">
+ <property name="arch" value="ppc"/>
+ <property name="os" value="macosx"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/feature.xml source-tree/features/org.eclipse.platform/feature.xml
+--- source-tree.orig/features/org.eclipse.platform/feature.xml 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/features/org.eclipse.platform/feature.xml 2006-01-28 14:35:05.000000000 +0100
@@ -120,11 +120,11 @@
unpack="false"/>
@@ -320,16 +372,16 @@
<plugin
id="org.eclipse.text"
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help/component.xml source-tree/plugins/org.eclipse.help/component.xml
---- ../source-tree.orig/plugins/org.eclipse.help/component.xml 2005-10-20 11:15:58.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help/component.xml 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help/component.xml source-tree/plugins/org.eclipse.help/component.xml
+--- source-tree.orig/plugins/org.eclipse.help/component.xml 2006-01-28 14:20:26.000000000 +0100
++++ source-tree/plugins/org.eclipse.help/component.xml 2006-01-28 14:35:05.000000000 +0100
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="Platform Help System"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.help" fragment="false"/><plugin id="org.eclipse.help.appserver" fragment="false"/><plugin id="org.eclipse.help.base" fragment="false"/><plugin id="org.eclipse.help.ui" fragment="false"/><plugin id="org.eclipse.help.webapp" fragment="false"/><package name="org.eclipse.help"><type name="IHelpContentProducer"/><type name="IContext2"/><type name="ILiveHelpAction"/><type name="IToc"/><type name="IContextProvider"/><type name="IHelpResource"/><type name="HelpSystem" subclass="false" instantiate="false"/><type name="IHelp"/><type name="IContext"/><type name="ITopic"/></package><package name="org.eclipse.help.browser"><type name="IBrowserFactory"/><type name="IBrowser"/></package><package name="org.eclipse.help.search"><type name="HelpIndexBuilder"/><type name="ISearchEngineResult"/><type name="ISearchEngine"/><type name="ISearchScope"/><type name="ISearchEngineResultCollector"/></package><package name="org.eclipse.help.ui"><type name="ISearchScopeFactory"/><type name="ISearchScopePage"/><type name="RootScopePage"/><type name="IEngineDescriptor" implement="false" subclass="false"/></package><package name="org.eclipse.help.ui.browser"><type name="LaunchURL" subclass="false" instantiate="false"/></package></component>
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="Platform Help System"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.help" fragment="false"/><plugin id="org.eclipse.help.base" fragment="false"/><plugin id="org.eclipse.help.ui" fragment="false"/><package name="org.eclipse.help"><type name="IHelpContentProducer"/><type name="IContext2"/><type name="ILiveHelpAction"/><type name="IToc"/><type name="IContextProvider"/><type name="IHelpResource"/><type name="HelpSystem" subclass="false" instantiate="false"/><type name="IHelp"/><type name="IContext"/><type name="ITopic"/></package><package name="org.eclipse.help.browser"><type name="IBrowserFactory"/><type name="IBrowser"/></package><package name="org.eclipse.help.search"><type name="HelpIndexBuilder"/><type name="ISearchEngineResult"/><type name="ISearchEngine"/><type name="ISearchScope"/><type name="ISearchEngineResultCollector"/></package><package name="org.eclipse.help.ui"><type name="ISearchScopeFactory"/><type name="ISearchScopePage"/><type name="RootScopePage"/><type name="IEngineDescriptor" implement="false" subclass="false"/></package><package name="org.eclipse.help.ui.browser"><type name="LaunchURL" subclass="false" instantiate="false"/></package></component>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
---- ../source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2005-10-20 11:16:00.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2006-01-28 14:35:05.000000000 +0100
@@ -19,7 +19,6 @@
org.eclipse.help.standalone
Require-Bundle: org.apache.lucene,
@@ -338,9 +390,9 @@
org.eclipse.core.runtime,
org.eclipse.ant.core;resolution:=optional
Eclipse-AutoStart: true
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
---- ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2005-10-20 11:16:00.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2006-01-28 14:35:05.000000000 +0100
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.*;
import org.eclipse.help.ILiveHelpAction;
@@ -411,9 +463,9 @@
}
/**
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
---- ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2005-10-20 11:16:00.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
+--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2006-01-28 14:35:05.000000000 +0100
@@ -14,7 +14,6 @@
import java.util.*;
@@ -448,9 +500,9 @@
}
private void obtainLock() {
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
---- ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2005-10-20 11:16:00.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2006-01-28 14:35:05.000000000 +0100
@@ -16,7 +16,6 @@
import org.eclipse.core.runtime.*;
import org.eclipse.help.*;
@@ -489,9 +541,9 @@
}
private String getFramesetURL() {
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF
---- ../source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2005-10-20 11:16:11.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2006-01-28 14:35:05.000000000 +0100
@@ -15,7 +15,6 @@
org.eclipse.help.ui.internal.util;x-internal:=true,
org.eclipse.help.ui.internal.views;x-internal:=true
@@ -500,9 +552,9 @@
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.forms
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java
---- ../source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2005-10-20 11:16:11.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2005-10-20 11:32:07.000000000 +0200
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java
+--- source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2006-01-28 14:35:05.000000000 +0100
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.help.ui.internal;
@@ -559,24 +611,24 @@
return true;
}
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.platform.source/build.xml source-tree/plugins/org.eclipse.platform.source/build.xml
---- ../source-tree.orig/plugins/org.eclipse.platform.source/build.xml 2005-10-20 11:15:57.000000000 +0200
-+++ source-tree/plugins/org.eclipse.platform.source/build.xml 2005-10-20 11:32:07.000000000 +0200
-@@ -53,10 +53,12 @@
- <ant antfile="build.xml" dir="../org.eclipse.update.core" target="gather.sources">
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.platform.source/build.xml source-tree/plugins/org.eclipse.platform.source/build.xml
+--- source-tree.orig/plugins/org.eclipse.platform.source/build.xml 2006-01-28 14:20:12.000000000 +0100
++++ source-tree/plugins/org.eclipse.platform.source/build.xml 2006-01-28 14:46:35.000000000 +0100
+@@ -81,10 +81,12 @@
+ <ant antfile="build.xml" dir="../org.eclipse.core.filebuffers" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="../org.eclipse.tomcat" target="build.sources"/>
- <ant antfile="build.xml" dir="../org.eclipse.tomcat" target="gather.sources">
+ <ant antfile="build.xml" dir="../org.eclipse.help.webapp" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.help.webapp" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+-->
- <ant antfile="build.xml" dir="../org.eclipse.help.base" target="build.sources"/>
- <ant antfile="build.xml" dir="../org.eclipse.help.base" target="gather.sources">
+ <ant antfile="build.xml" dir="../org.eclipse.jface.text" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.jface.text" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
-@@ -65,10 +67,12 @@
- <ant antfile="build.xml" dir="../org.eclipse.ui.workbench.compatibility" target="gather.sources">
+@@ -137,18 +139,22 @@
+ <ant antfile="build.xml" dir="../org.apache.ant" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+<!--
@@ -585,19 +637,16 @@
<property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+-->
- <ant antfile="build.xml" dir="../org.eclipse.text" target="build.sources"/>
- <ant antfile="build.xml" dir="../org.eclipse.text" target="gather.sources">
+ <ant antfile="build.xml" dir="../org.eclipse.core.variables" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.core.variables" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
-@@ -109,10 +113,12 @@
- <ant antfile="build.xml" dir="../org.eclipse.team.cvs.core" target="gather.sources">
- <property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+<!--
- <ant antfile="build.xml" dir="../org.eclipse.help.webapp" target="build.sources"/>
- <ant antfile="build.xml" dir="../org.eclipse.help.webapp" target="gather.sources">
+ <ant antfile="build.xml" dir="../org.eclipse.tomcat" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.tomcat" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
</ant>
+-->
- <ant antfile="build.xml" dir="../org.eclipse.core.boot" target="build.sources"/>
- <ant antfile="build.xml" dir="../org.eclipse.core.boot" target="gather.sources">
+ <ant antfile="build.xml" dir="../org.eclipse.team.cvs.ssh" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.team.cvs.ssh" target="gather.sources">
<property name="destination.temp.folder" value="${basedir}/src"/>
Added: trunk/eclipse/debian/patches/eclipse-heapstatus.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-heapstatus.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-heapstatus.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+##
+## DP: Show the HeapStatus monitor always
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
+ at DPATCH@
+--- source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java.orig 2006-01-27 12:06:11.000000000 +0000
++++ source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java 2006-01-27 12:06:45.000000000 +0000
+@@ -1003,9 +1003,7 @@
+ * @return <code>true</code> to show the heap status indicator, <code>false</code> otherwise
+ */
+ private boolean getShowHeapStatus() {
+- return Boolean.valueOf(
+- Platform.getDebugOption(PlatformUI.PLUGIN_ID
+- + "/perf/showHeapStatus")).booleanValue(); //$NON-NLS-1$
++ return true;
+ }
+
+ /**
Property changes on: trunk/eclipse/debian/patches/eclipse-heapstatus.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/eclipse/debian/patches/eclipse-javadoc-bootclasspath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-javadoc-bootclasspath.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-javadoc-bootclasspath.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -21,9 +21,9 @@
exit 0
@DPATCH@
-diff -r -u source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml
---- source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml 2005-11-08 13:55:10.000000000 +0100
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml 2005-11-08 14:01:30.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml
+--- source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml 2006-01-28 14:56:59.000000000 +0100
++++ source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml 2006-01-28 14:59:50.000000000 +0100
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.jdt.doc.isv" default="build.jars" basedir=".">
@@ -42,29 +42,29 @@
</target>
-</project>
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
+</project>
-diff -r -u source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml source-tree/plugins/org.eclipse.pde.doc.user/build.xml
---- source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml 2005-11-08 13:55:10.000000000 +0100
-+++ source-tree/plugins/org.eclipse.pde.doc.user/build.xml 2005-11-08 14:02:04.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml source-tree/plugins/org.eclipse.pde.doc.user/build.xml
+--- source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml 2006-01-28 14:56:59.000000000 +0100
++++ source-tree/plugins/org.eclipse.pde.doc.user/build.xml 2006-01-28 15:01:34.000000000 +0100
@@ -1,6 +1,13 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <project name="org.eclipse.pde.doc.user" default="build.jars" basedir=".">
-
-+ <path id="path_bootclasspath">
-+ <fileset dir="${java.home}/lib">
-+ <include name="*.jar"/>
-+ </fileset>
-+ </path>
-+ <property name="bootclasspath" refid="path_bootclasspath"/>
-+
- <target name="init">
- <property name="plugin" value="org.eclipse.pde.doc.user"/>
- <property name="version.suffix" value="_3.1.1"/>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project name="org.eclipse.pde.doc.user" default="build.jars" basedir=".">
+
++ <path id="path_bootclasspath">
++ <fileset dir="${java.home}/lib">
++ <include name="*.jar"/>
++ </fileset>
++ </path>
++ <property name="bootclasspath" refid="path_bootclasspath"/>
++
+ <target name="init">
+ <property name="plugin" value="org.eclipse.pde.doc.user"/>
+ <property name="version.suffix" value="_3.1.2"/>
@@ -69,4 +76,4 @@
- <delete dir="${temp.folder}"/>
- </target>
-
+ <delete dir="${temp.folder}"/>
+ </target>
+
-</project>
-\ Kein Zeilenumbruch am Dateiende.
-+</project>
+\ No newline at end of file
++</project>
Property changes on: trunk/eclipse/debian/patches/eclipse-javadoc-bootclasspath.dpatch
___________________________________________________________________
Name: svn:eol-style
- native
Modified: trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -21,234 +21,17 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2005-03-03 10:02:42.072310342 -0500
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-03-03 10:14:53.994542649 -0500
-@@ -24,6 +24,20 @@
+diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+--- source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:46:37.000000000 +0100
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:54:42.000000000 +0100
+@@ -23,6 +23,10 @@
case $OS in
"Linux")
-+ GECKO_INCLUDES="\
-+ -include mozilla-config.h \
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
-+ GECKO_LIBS="\
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
-+ -lgtkembedmoz -lxpcom"
++ GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom`
++ GECKO_LIBS=`pkg-config --libs firefox-xpcom`
+ # Set this to something to override the presets
+ GECKO_SDK="_"
case $MODEL in
"x86_64")
CC=gcc
---- source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:17.104814056 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:27.740162576 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/bin/library/build.sh.orig 2006-01-07 18:19:38.094894760 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/bin/library/build.sh 2006-01-07 18:38:27.796154064 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:14:25.647394000 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:27.832148592 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/bin/library/build.sh.orig 2006-01-07 18:19:30.367069568 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/bin/library/build.sh 2006-01-07 18:38:28.719013768 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:35.917954024 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:28.753008600 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/bin/library/build.sh.orig 2006-01-07 18:19:47.201510344 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/bin/library/build.sh 2006-01-07 18:38:28.788003280 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:57.623654256 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:28.822997960 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
---- source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/bin/library/build.sh.orig 2006-01-07 18:19:54.694371256 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/bin/library/build.sh 2006-01-07 18:38:28.872990360 +0100
-@@ -25,15 +25,15 @@
- "Linux")
- GECKO_INCLUDES="\
- -include mozilla-config.h \
-- -I/usr/include/mozilla \
-- -I/usr/include/mozilla/xpcom \
-- -I/usr/include/mozilla/string \
-- -I/usr/include/mozilla/nspr \
-- -I/usr/include/mozilla/embed_base \
-- -I/usr/include/mozilla/gfx"
-+ -I/usr/include/mozilla-firefox \
-+ -I/usr/include/mozilla-firefox/xpcom \
-+ -I/usr/include/mozilla-firefox/string \
-+ -I/usr/include/mozilla-firefox/nspr \
-+ -I/usr/include/mozilla-firefox/embed_base \
-+ -I/usr/include/mozilla-firefox/gfx"
- GECKO_LIBS="\
-- -L/usr/lib/mozilla \
-- -L/usr/lib/mozilla/components \
-+ -L/usr/lib/mozilla-firefox \
-+ -L/usr/lib/mozilla-firefox/components \
- -lgtkembedmoz -lxpcom"
- # Set this to something to override the presets
- GECKO_SDK="_"
Modified: trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -21,24 +21,15 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2005-03-03 10:02:42.072310342 -0500
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-03-03 10:14:53.994542649 -0500
-@@ -24,6 +24,20 @@
+diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+--- source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:46:37.000000000 +0100
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:50:18.000000000 +0100
+@@ -23,6 +23,10 @@
case $OS in
"Linux")
-+ GECKO_INCLUDES="\
-+ -include mozilla-config.h \
-+ -I/usr/include/mozilla \
-+ -I/usr/include/mozilla/xpcom \
-+ -I/usr/include/mozilla/string \
-+ -I/usr/include/mozilla/nspr \
-+ -I/usr/include/mozilla/embed_base \
-+ -I/usr/include/mozilla/gfx"
-+ GECKO_LIBS="\
-+ -L/usr/lib/mozilla \
-+ -L/usr/lib/mozilla/components \
-+ -lgtkembedmoz -lxpcom"
++ GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
++ GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
+ # Set this to something to override the presets
+ GECKO_SDK="_"
case $MODEL in
Modified: trunk/eclipse/debian/patches/eclipse-tomcat5.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-tomcat5.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-tomcat5.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -23,137 +23,118 @@
exit 0
@DPATCH@
-
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml
---- source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-11-10 23:54:03.000000000 +0100
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/aix.motif.ppc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml 2006-01-31 07:32:50.000000000 +0100
+@@ -608,7 +608,7 @@
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2006-01-31 07:32:50.000000000 +0100
+@@ -617,7 +617,7 @@
<exec executable="zip" dir="${assemblyTempDir}">
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml
---- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2005-11-10 23:54:38.000000000 +0100
-@@ -594,7 +594,7 @@
- <eclipse.brand root="${eclipse.base}/hpux.motif.ia64_32/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml
---- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-11-10 23:55:29.000000000 +0100
-@@ -580,7 +580,7 @@
- </antcall>
- <eclipse.brand root="${eclipse.base}/hpux.motif.ia64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <zip destfile="${archiveFullPath}" filesonly="false" whenempty="skip" update="true">
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2006-01-31 07:32:50.000000000 +0100
+@@ -597,7 +597,7 @@
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.expressions_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.pde.doc.user_3.1.2" prefix="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.ui_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.ui_3.1.1.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.pde.runtime_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.1.1.jar" />
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
---- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-11-10 23:56:06.000000000 +0100
-@@ -594,7 +594,7 @@
- <eclipse.brand root="${eclipse.base}/hpux.motif.PA_RISC/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.1" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0" />
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2006-01-31 07:32:50.000000000 +0100
+@@ -618,7 +618,7 @@
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml
---- source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml 2005-11-10 23:56:27.000000000 +0100
-@@ -594,7 +594,7 @@
- <eclipse.brand root="${eclipse.base}/qnx.photon.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml 2006-01-31 07:32:50.000000000 +0100
+@@ -619,7 +619,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt.photon.qnx.x86_3.1.1.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2006-01-31 07:32:51.000000000 +0100
+@@ -607,7 +607,7 @@
<exec executable="zip" dir="${assemblyTempDir}">
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
---- source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-11-10 23:56:48.000000000 +0100
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/solaris.gtk.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml
---- source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-11-10 23:57:03.000000000 +0100
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/solaris.motif.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2006-01-31 07:32:51.000000000 +0100
+@@ -609,7 +609,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.motif.sparc_3.1.2"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml
---- source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-11-10 23:57:26.000000000 +0100
-@@ -608,7 +608,7 @@
- <eclipse.brand root="${eclipse.base}/win32.win32.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml 2006-01-31 07:32:51.000000000 +0100
+@@ -634,7 +634,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.win32.win32.x86_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
---- source-tree.orig/features/org.eclipse.platform/build.xml 2005-11-10 23:42:08.000000000 +0100
-+++ source-tree/features/org.eclipse.platform/build.xml 2005-11-10 23:57:58.000000000 +0100
-@@ -331,7 +331,7 @@
- <copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" failonerror="true" overwrite="false">
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
+--- source-tree.orig/features/org.eclipse.platform/build.xml 2006-01-31 07:30:22.000000000 +0100
++++ source-tree/features/org.eclipse.platform/build.xml 2006-01-31 07:32:51.000000000 +0100
+@@ -352,7 +352,7 @@
+ <copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
</copy>
-- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml" selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
-+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml" selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
<target name="rootFileswin32_win32_x86">
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml
---- source-tree.orig/plugins/org.eclipse.help.webapp/build.xml 2005-11-10 23:42:05.000000000 +0100
-+++ source-tree/plugins/org.eclipse.help.webapp/build.xml 2005-11-10 23:43:44.000000000 +0100
-@@ -74,7 +74,7 @@
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
- <pathelement path="../org.eclipse.help.appserver"/>
-- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
-+ <pathelement path="../org.eclipse.tomcat/servlet-api.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- </classpath>
- <src path="src/" />
-@@ -126,7 +126,7 @@
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
- <pathelement path="../org.eclipse.help.appserver"/>
-- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
-+ <pathelement path="../org.eclipse.tomcat/servlet-api.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- </classpath>
- <src path="src_servlets/" />
-@@ -155,9 +155,12 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml
+--- source-tree.orig/plugins/org.eclipse.help.webapp/build.xml 2006-01-31 07:30:45.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.webapp/build.xml 2006-01-31 07:33:13.000000000 +0100
+@@ -155,8 +155,11 @@
<path id="jasper.classpath" >
<pathelement location="../org.apache.ant/lib/ant.jar"/>
<pathelement location="../org.apache.ant/lib/optional.jar"/>
@@ -161,12 +142,10 @@
+ <pathelement location="../org.eclipse.tomcat/commons-el.jar" />
<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
-- <pathelement location="../org.eclipse.tomcat/servlet.jar" />
+ <pathelement location="../org.eclipse.tomcat/jsp-api.jar" />
-+ <pathelement location="../org.eclipse.tomcat/servlet-api.jar" />
+ <pathelement location="../org.eclipse.tomcat/servlet.jar" />
<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />
</path>
- <delete dir="${temp.folder}/jsp.jar.src"/>
@@ -165,10 +168,9 @@
<java
classname="org.apache.jasper.JspC"
@@ -179,20 +158,17 @@
<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
<arg value="-die" />
<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
-@@ -202,8 +204,9 @@
- <pathelement path="../org.eclipse.help"/>
- <pathelement path="../org.eclipse.help.base"/>
+@@ -204,6 +206,7 @@
<pathelement path="../org.eclipse.help.appserver"/>
-- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
-+ <pathelement path="../org.eclipse.tomcat/servlet-api.jar"/>
+ <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/jsp-api.jar"/>
</classpath>
<src path="${temp.folder}/jsp.jar.src/" />
<!-- custom begin -->
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/about.html source-tree/plugins/org.eclipse.tomcat/about.html
---- source-tree.orig/plugins/org.eclipse.tomcat/about.html 2005-11-10 23:42:04.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/about.html 2005-11-10 23:43:44.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/about.html source-tree/plugins/org.eclipse.tomcat/about.html
+--- source-tree.orig/plugins/org.eclipse.tomcat/about.html 2006-01-31 07:31:06.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/about.html 2006-01-31 07:32:51.000000000 +0100
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
@@ -283,9 +259,9 @@
<p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
with the Content in the file <a href="mx4j.license">mx4j.license</a>. More specifically: </p>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/build.xml source-tree/plugins/org.eclipse.tomcat/build.xml
---- source-tree.orig/plugins/org.eclipse.tomcat/build.xml 2005-11-10 23:42:04.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/build.xml 2005-11-10 23:50:52.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/build.xml source-tree/plugins/org.eclipse.tomcat/build.xml
+--- source-tree.orig/plugins/org.eclipse.tomcat/build.xml 2006-01-31 07:31:05.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/build.xml 2006-01-31 07:33:04.000000000 +0100
@@ -45,7 +45,7 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
@@ -295,27 +271,79 @@
<delete dir="${temp.folder}"/>
</target>
-@@ -117,6 +117,8 @@
+@@ -115,50 +115,28 @@
+ <pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
+ <pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
- <pathelement path="catalina.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
-+ <pathelement path="catalina-optional.jar"/>
-+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina-optional.jar"/>
+- <pathelement path="catalina.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
<pathelement path="bootstrap.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
- <pathelement path="commons-beanutils.jar"/>
-@@ -143,8 +145,8 @@
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
- <pathelement path="naming-resources.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
+- <pathelement path="commons-beanutils.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
+- <pathelement path="commons-collections.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
+- <pathelement path="commons-digester.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
+- <pathelement path="commons-logging-api.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
+- <pathelement path="commons-modeler.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
+- <pathelement path="jakarta-regexp-1.3.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
+- <pathelement path="jasper-compiler.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
+- <pathelement path="jasper-runtime.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
+- <pathelement path="mx4j-jmx.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
+- <pathelement path="naming-common.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
+- <pathelement path="naming-factory.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
+- <pathelement path="naming-resources.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
- <pathelement path="servlet.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
-+ <pathelement path="servlet-api.jar"/>
-+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet-api.jar"/>
- <pathelement path="servlets-common.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
- <pathelement path="servlets-default.jar"/>
-@@ -189,11 +191,11 @@
+- <pathelement path="servlets-common.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
+- <pathelement path="servlets-default.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
+- <pathelement path="servlets-invoker.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
+- <pathelement path="servlets-manager.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
+- <pathelement path="tomcat-coyote.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
+- <pathelement path="tomcat-http11.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
+- <pathelement path="tomcat-util.jar"/>
+- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
++ <pathelement path="catalina.jar"/>
++ <pathelement path="catalina-optional.jar"/>
++ <pathelement path="commons-beanutils.jar"/>
++ <pathelement path="commons-collections.jar"/>
++ <pathelement path="commons-digester.jar"/>
++ <pathelement path="commons-logging-api.jar"/>
++ <pathelement path="commons-modeler.jar"/>
++ <pathelement path="jakarta-regexp-1.3.jar"/>
++ <pathelement path="jasper-compiler.jar"/>
++ <pathelement path="jasper-runtime.jar"/>
++ <pathelement path="mx4j-jmx.jar"/>
++ <pathelement path="naming-common.jar"/>
++ <pathelement path="naming-factory.jar"/>
++ <pathelement path="naming-resources.jar"/>
++ <pathelement path="servlet.jar"/>
++ <pathelement path="servlets-common.jar"/>
++ <pathelement path="servlets-default.jar"/>
++ <pathelement path="servlets-invoker.jar"/>
++ <pathelement path="tomcat-coyote.jar"/>
++ <pathelement path="tomcat-http11.jar"/>
++ <pathelement path="tomcat-util.jar"/>
+ </classpath>
+ <src path="src/" />
+ </javac>
+@@ -189,11 +167,11 @@
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
@@ -330,7 +358,7 @@
<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,*.license,META-INF/" />
</copy>
</target>
-@@ -202,23 +204,23 @@
+@@ -202,23 +180,23 @@
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
@@ -361,7 +389,7 @@
<delete dir="${temp.folder}"/>
</target>
-@@ -241,7 +243,7 @@
+@@ -241,7 +219,7 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log" />
</delete>
@@ -370,9 +398,9 @@
<delete dir="${temp.folder}"/>
</target>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/.classpath source-tree/plugins/org.eclipse.tomcat/.classpath
---- source-tree.orig/plugins/org.eclipse.tomcat/.classpath 2005-11-10 23:42:04.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/.classpath 2005-11-10 23:43:44.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/.classpath source-tree/plugins/org.eclipse.tomcat/.classpath
+--- source-tree.orig/plugins/org.eclipse.tomcat/.classpath 2006-01-31 07:31:06.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/.classpath 2006-01-31 07:32:51.000000000 +0100
@@ -1,29 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
@@ -435,47 +463,43 @@
+ <classpathentry kind="lib" path="regexp.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
---- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 2005-11-10 23:42:04.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 2005-11-10 23:46:13.000000000 +0100
-@@ -2,7 +2,7 @@
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 2006-01-31 07:31:06.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 2006-01-31 07:34:01.000000000 +0100
+@@ -2,18 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
-Bundle-Version: 4.1.30.1
+-Bundle-ClassPath: tomcatwrapper.jar,
+Bundle-Version: 5.0.30
- Bundle-ClassPath: tomcatwrapper.jar,
++Bundle-ClassPath: bootstrap.jar,
catalina.jar,
- bootstrap.jar,
-@@ -11,21 +11,24 @@
+- bootstrap.jar,
++ catalina-optional.jar,
+ commons-beanutils.jar,
+ commons-collections.jar,
commons-digester.jar,
++ commons-el.jar,
commons-logging-api.jar,
commons-modeler.jar,
-- jakarta-regexp-1.3.jar,
+ jakarta-regexp-1.3.jar,
jasper-compiler.jar,
jasper-runtime.jar,
-- mx4j-jmx.jar,
++ jsp-api.jar,
++ mx4j-impl.jar,
+ mx4j-jmx.jar,
naming-common.jar,
naming-factory.jar,
- naming-resources.jar,
-- servlet.jar,
+@@ -22,7 +25,7 @@
servlets-common.jar,
servlets-default.jar,
servlets-invoker.jar,
- servlets-manager.jar,
+- servlets-manager.jar,
++ tomcatwrapper.jar,
tomcat-coyote.jar,
tomcat-http11.jar,
-- tomcat-util.jar
-+ tomcat-util.jar,
-+ mx4j-jmx.jar,
-+ servlet-api.jar,
-+ jakarta-regexp-1.3.jar,
-+ catalina-optional.jar,
-+ jsp-api.jar,
-+ commons-el.jar
- Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
- Bundle-Vendor: %providerName
- Bundle-Localization: plugin
+ tomcat-util.jar
@@ -43,6 +46,7 @@
javax.servlet;x-internal:=true,
javax.servlet.http;x-internal:=true,
@@ -556,9 +580,9 @@
- org.eclipse.tomcat.internal;x-internal:=true,
- org.eclipse.tomcat.internal.extensions;x-internal:=true
+ org.apache.tomcat.util.threads;x-internal:=true
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
---- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 2005-11-10 23:42:04.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 2005-11-10 23:43:44.000000000 +0100
+diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
+--- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 2006-01-31 07:31:05.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 2006-01-31 07:32:51.000000000 +0100
@@ -30,8 +30,8 @@
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.realm.MemoryRealm;
Modified: trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch 2006-02-04 15:39:26 UTC (rev 1859)
@@ -23,111 +23,285 @@
exit 0
@DPATCH@
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
---- ../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-09-20 12:06:46.000000000 +0200
-+++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-09-20 14:18:57.000000000 +0200
-@@ -10,6 +10,7 @@
- *******************************************************************************/
- package org.eclipse.update.internal.ui.wizards;
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 2006-01-28 13:36:31.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 2006-01-28 13:39:54.000000000 +0100
+@@ -11,18 +11,51 @@
+ package org.eclipse.update.internal.core;
-+import org.eclipse.core.runtime.Platform;
- import org.eclipse.jface.dialogs.Dialog;
- import org.eclipse.jface.dialogs.IDialogSettings;
- import org.eclipse.swt.SWT;
-@@ -70,10 +71,17 @@
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- updatesButton = new Button(composite, SWT.RADIO);
-- updatesButton.setText(UpdateUIMessages.ModeSelectionPage_updates);
-+ updatesButton.setText(UpdateUIMessages.ModeSelectionPage_updates);
- updateMode = !getSettings().getBoolean(P_NEW_FEATURES_MODE);
-+ // don't allow updates if the installation location is readonly
-+ if (Platform.getInstallLocation().isReadOnly()) {
-+ updatesButton.setEnabled(false);
-+ updateMode = false;
-+ }
- updatesButton.setSelection(updateMode);
-
-+
-+
- final Label updatesText = new Label(composite, SWT.WRAP);
- updatesText.setText(UpdateUIMessages.ModeSelectionPage_updatesText);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java
---- ../source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-09-20 12:06:46.000000000 +0200
-+++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-09-20 14:22:32.000000000 +0200
-@@ -13,6 +13,9 @@
- import java.io.*;
- import java.util.*;
-+import org.eclipse.core.runtime.Platform;
+-import java.io.*;
+-import java.net.*;
+-import java.util.*;
+-
+-import org.eclipse.core.runtime.*;
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.FileOutputStream;
++import java.io.IOException;
++import java.io.InputStream;
++import java.io.OutputStream;
++import java.io.OutputStreamWriter;
++import java.net.MalformedURLException;
++import java.net.URL;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Date;
++import java.util.HashSet;
++import java.util.Iterator;
++import java.util.List;
++import java.util.MissingResourceException;
++import java.util.PropertyResourceBundle;
++import java.util.Set;
++
+import org.eclipse.core.runtime.CoreException;
++import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
- import org.eclipse.jface.dialogs.Dialog;
- import org.eclipse.jface.resource.*;
- import org.eclipse.jface.viewers.*;
-@@ -150,7 +153,7 @@
- label.setLayoutData(gd);
++import org.eclipse.core.runtime.MultiStatus;
++import org.eclipse.core.runtime.Platform;
+ import org.eclipse.osgi.util.NLS;
+-import org.eclipse.update.configuration.*;
+-import org.eclipse.update.core.*;
+-import org.eclipse.update.core.model.*;
+-import org.eclipse.update.internal.model.*;
+-import org.eclipse.update.internal.operations.*;
+-import org.eclipse.update.configurator.*;
++import org.eclipse.update.configuration.IActivity;
++import org.eclipse.update.configuration.IConfiguredSite;
++import org.eclipse.update.configuration.IConfiguredSiteChangedListener;
++import org.eclipse.update.configuration.IInstallConfiguration;
++import org.eclipse.update.configuration.IProblemHandler;
++import org.eclipse.update.configurator.ConfiguratorUtils;
++import org.eclipse.update.configurator.IPlatformConfiguration;
++import org.eclipse.update.core.IFeature;
++import org.eclipse.update.core.IFeatureReference;
++import org.eclipse.update.core.IIncludedFeatureReference;
++import org.eclipse.update.core.IPluginEntry;
++import org.eclipse.update.core.ISite;
++import org.eclipse.update.core.ISiteFeatureReference;
++import org.eclipse.update.core.IVerificationListener;
++import org.eclipse.update.core.SiteManager;
++import org.eclipse.update.core.Utilities;
++import org.eclipse.update.core.VersionedIdentifier;
++import org.eclipse.update.core.model.InstallAbortedException;
++import org.eclipse.update.internal.model.ConfiguredSiteModel;
++import org.eclipse.update.internal.operations.UpdateUtils;
- installLocation = new Label(client, SWT.NULL);
-- installLocation.setText("foo"); //$NON-NLS-1$
-+ installLocation.setText(""); //$NON-NLS-1$
- gd = new GridData(GridData.FILL_HORIZONTAL);
- installLocation.setLayoutData(gd);
-
-@@ -360,7 +363,27 @@
- continue;
+ /**
+ * A Configured site manages the Configured and unconfigured features of a Site
+@@ -770,7 +803,9 @@
}
+ } else {
+ File container = getSiteContaining(file);
+- if (container != null) {
++ // allow the install location to pass even though it looks like this
++ // site is contained in another site
++ if (container != null && !siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) {
+ verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null);
+ return verifyStatus;
+ }
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 2006-01-28 13:36:31.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 2006-01-28 13:39:54.000000000 +0100
+@@ -76,6 +76,13 @@
+ public IQueryUpdateSiteAdapter getQuerySearchSite() {
+ return null;
+ }
++
++ /* (non-Javadoc)
++ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
++ */
++ public IFeature getFeature() {
++ return null;
++ }
+ }
-- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
-+ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
-+ if (csite == null && Platform.getInstallLocation().isReadOnly()) {
-+ // there are no updateable sites and the installation location is read only
-+ // make an update site in the user's home direcotry
-+ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator +
-+ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$ //$NON-NLS-2$
+ public void addVersionedIdentifier(VersionedIdentifier vid) {
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 2006-01-28 13:36:31.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 2006-01-28 13:39:54.000000000 +0100
+@@ -80,6 +80,13 @@
+ public IQueryUpdateSiteAdapter getQuerySearchSite() {
+ return null;
+ }
+
-+ try {
-+ csite = config.createConfiguredSite(new File(sitePath));
-+ config.addConfiguredSite(csite);
-+ IStatus status = csite.verifyUpdatableStatus();
-+ if (!status.isOK())
-+ throw new CoreException(status);
-+
-+ } catch (CoreException e) {
-+ // there was a problem, the user must choose an installation site
-+ csite = null;
-+ }
-+ }
-+
-+ jobs[i].setTargetSite(csite);
++ /* (non-Javadoc)
++ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
++ */
++ public IFeature getFeature() {
++ return null;
++ }
+ }
+ public SiteSearchCategory() {
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 2006-01-28 13:36:31.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 2006-01-28 13:39:54.000000000 +0100
+@@ -285,6 +285,10 @@
+ monitor.worked(1);
+ monitor.done();
}
++
++ public IFeature getFeature() {
++ return candidate;
++ }
}
-@@ -370,7 +393,7 @@
- IConfiguredSite[] sites = config.getConfiguredSites();
- for (int i = 0; i < sites.length; i++) {
- IConfiguredSite csite = sites[i];
-- if (getSiteVisibility(csite, job))
-+ if (getSiteVisibility(csite, job) && csite.verifyUpdatableStatus().isOK() == true)
- return csite;
- }
- return null;
-@@ -388,12 +411,11 @@
-
- void removeAddedSites() {
- if (added != null) {
-- Iterator it = added.iterator();
-- while (it.hasNext()) {
-- config.removeConfiguredSite((IConfiguredSite) it.next());
-- // the config listener no longer removes the site so we need to cleanup the collection at the end
-- }
-- added.clear();
-+ while (!added.isEmpty()) {
-+ Iterator it = added.iterator();
-+ if (it.hasNext())
-+ config.removeConfiguredSite((IConfiguredSite) it.next());
-+ }
- }
- }
-
+
+ private ArrayList candidates;
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 2006-01-28 13:36:32.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 2006-01-28 13:39:54.000000000 +0100
+@@ -7,6 +7,7 @@
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
++ * Red Hat Incorporated - getFeature() API addition
+ *******************************************************************************/
+ package org.eclipse.update.search;
+
+@@ -50,4 +51,12 @@
+ * @param monitor a progress monitor to report search progress within the provided site
+ */
+ public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor);
++
++/**
++ * Returns IFeature associated with the IUpdateSearchQuery
++ *
++ * @return the IFeature that is associated with the IUpdateSearchQuery
++ * @since 3.2
++ */
++ public IFeature getFeature();
+ }
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
+--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 2006-01-28 13:36:32.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 2006-01-28 13:39:54.000000000 +0100
+@@ -10,6 +10,7 @@
+ *******************************************************************************/
+ package org.eclipse.update.search;
+
++import java.io.File;
+ import java.net.URL;
+ import java.util.ArrayList;
+
+@@ -140,11 +141,11 @@
+ this.category = category;
+ this.scope = scope;
+ }
++
+ /**
+ * Returns the search catagory used in this request.
+ * @return the search category
+ */
+-
+ public IUpdateSearchCategory getCategory() {
+ return category;
+ }
+@@ -242,6 +243,11 @@
+ // currently, the next conditional is only executed (qsite!=null) when
+ // running an update search.
+ if (qsite != null && searchFeatureProvidedSites) {
++ // do not update features that are installed in read-only locations
++ IFeature feature = query.getFeature();
++ if (feature != null &&
++ !feature.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
++ continue;
+ // check for mapping
+ IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite);
+ // when there is no mapped site the feature is not updatable
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
+--- source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 2006-01-28 13:36:21.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 2006-01-28 13:40:51.000000000 +0100
+@@ -151,7 +151,7 @@
+ addPage(licensePage);
+ optionalFeaturesPage = new OptionalFeaturesPage(config);
+ addPage(optionalFeaturesPage);
+- targetPage = new TargetPage(config);
++ targetPage = new TargetPage(config, isUpdate);
+ addPage(targetPage);
+ }
+
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java
+--- source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2006-01-28 13:36:21.000000000 +0100
++++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2006-01-28 13:40:51.000000000 +0100
+@@ -13,6 +13,9 @@
+ import java.io.*;
+ import java.util.*;
+
++import org.eclipse.core.runtime.Platform;
++import org.eclipse.core.runtime.CoreException;
++import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.jface.dialogs.Dialog;
+ import org.eclipse.jface.resource.*;
+ import org.eclipse.jface.viewers.*;
+@@ -41,6 +44,7 @@
+ private Label installLocation;
+ private Button changeLocation;
+ static HashSet added;
++ private boolean isUpdate; // whether the wizard is updating a feature or installing a new one
+
+ class JobsContentProvider
+ extends DefaultContentProvider
+@@ -113,13 +117,14 @@
+ /**
+ * Constructor for ReviewPage2
+ */
+- public TargetPage(IInstallConfiguration config) {
++ public TargetPage(IInstallConfiguration config, boolean isUpdate) {
+ super("Target"); //$NON-NLS-1$
+ setTitle(UpdateUIMessages.InstallWizard_TargetPage_title);
+ setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc);
+ this.config = config;
+ UpdateUI.getDefault().getLabelProvider().connect(this);
+ configListener = new ConfigListener();
++ this.isUpdate = isUpdate;
+ }
+
+ public void setJobs(IInstallFeatureOperation[] jobs) {
+@@ -150,7 +155,7 @@
+ label.setLayoutData(gd);
+
+ installLocation = new Label(client, SWT.NULL);
+- installLocation.setText("foo"); //$NON-NLS-1$
++ installLocation.setText(""); //$NON-NLS-1$
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ installLocation.setLayoutData(gd);
+
+@@ -360,8 +365,27 @@
+ continue;
+ }
+
+- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
++ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
++ if (csite == null && Platform.getInstallLocation().isReadOnly() && isUpdate == false) {
++ // there are no updateable sites, the installation location is read-only and we are installing a new feature
++ // make an update site in the user's home direcotry
++ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator + //$NON-NLS-1$
++ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$
++
++ try {
++ csite = config.createConfiguredSite(new File(sitePath));
++ config.addConfiguredSite(csite);
++ IStatus status = csite.verifyUpdatableStatus();
++ if (!status.isOK())
++ throw new CoreException(status);
++
++ } catch (CoreException e) {
++ // there was a problem, the user must choose an installation site
++ csite = null;
++ }
++ }
+
++ jobs[i].setTargetSite(csite);
+ }
+ }
+
+@@ -370,7 +394,8 @@
+ IConfiguredSite[] sites = config.getConfiguredSites();
+ for (int i = 0; i < sites.length; i++) {
+ IConfiguredSite csite = sites[i];
+- if (getSiteVisibility(csite, job))
++ if (getSiteVisibility(csite, job) &&
++ csite.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
+ return csite;
+ }
+ return null;
Property changes on: trunk/eclipse/debian/patches/eclipse-updatehomedir.dpatch
___________________________________________________________________
Name: svn:eol-style
- native
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-02-02 06:51:06 UTC (rev 1858)
+++ trunk/eclipse/debian/rules 2006-02-04 15:39:26 UTC (rev 1859)
@@ -33,7 +33,7 @@
ECLIPSE_PLATFORM=$(DEB_HOST_ARCH)
endif
-SOURCE=$(shell ls upstream/*.zip)
+SOURCE=$(shell ls upstream/*.tar.bz2)
SOURCE_TREE=$(CURDIR)/source-tree
BUILD_TREE=$(CURDIR)/build-tree
@@ -101,8 +101,8 @@
BUILD_DEPS += , libtomcat5-java
endif
-with_browser := mozilla
-#with_browser := firefox
+#with_browser := mozilla
+with_browser := firefox
with_dpatch = yes
#with_dpatch = no
@@ -117,7 +117,6 @@
eclipse-fileinitializer \
eclipse-gnuformatterjdt \
eclipse-icon \
- eclipse-java-model-cache \
eclipse-libjawt \
eclipse-libswt-cairo1.0 \
eclipse-disable-filelog \
@@ -135,11 +134,14 @@
eclipse-javadoc-bootclasspath \
eclipse-link-classpathdoc \
eclipse-gjdoc-reflection \
- eclipse-public-applypatch
+ eclipse-public-applypatch \
+ eclipse-heapstatus
+# eclipse-java-model-cache \
+
ifeq ($(with_tomcat),yes)
eclipse_patches += \
- eclipse-tomcat5
+ eclipse-tomcat5
else
eclipse_patches += \
eclipse-disable-tomcat
@@ -148,6 +150,7 @@
ifeq ($(with_browser),mozilla)
eclipse_patches += \
eclipse-libswt-mozilla
+
BUILD_DEPS += , mozilla-dev
MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) | mozilla-firefox (>= 1.0.7)
endif
@@ -155,6 +158,7 @@
ifeq ($(with_browser),firefox)
eclipse_patches += \
eclipse-libswt-firefox
+
BUILD_DEPS += , firefox-dev
MOZILLA_DEP = firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7)
endif
@@ -185,7 +189,7 @@
# The building happens inside the source-tree directory. This makes
# cleanup much easier.
mkdir -p "$(SOURCE_TREE)"
- (cd "$(SOURCE_TREE)" && unzip ../"$(SOURCE)" > /dev/null)
+ (cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
touch uncompress-stamp
@@ -277,89 +281,16 @@
find . -type f -name "build.xml" -exec \
perl -pi -e 's| verbose="true"| verbose="false"|g' \
{} ';'
-
- # The Eclipse source drop is fairly dirty. There are native binaries
- # and libraries floating around. There are pre-built Jar files. Some of
- # these Jar files don't even have a build system. What we are going to
- # do here is remove all of this stuff so that we can be sure we build
- # it correctly later.
-
- # Remove platform-dependent libs and executables.
- find $(SOURCE_TREE) -type f -name "*.s[lo]" -exec rm -f {} ';'
-
- # A number of pre-built Jar files. We will rebuild these later. We choose
- # not to remove a few of these because leaving their originals behind let
- # us use a glob to link them.
- -rm $(SOURCE_TREE)/plugins/org.junit/*.jar
- -rm $(SOURCE_TREE)/plugins/org.eclipse.swt.tools/swttools.jar
- -rm $(SOURCE_TREE)/plugins/org.eclipse.swt.win32.win32.x86/swt.jar
- -rm $(SOURCE_TREE)/features/org.eclipse.platform.launchers/bin/startup.jar
-
- # Eclipse comes with it's own pre-compiled copy of Ant. This step takes
- # all of the distributed Ant Jar files and replaces them with links to
- # files with the same name on the local system. A proper installation
- # of Ant 1.5 and 1.6 should cover all of these. Because some are
- # missing, we simply remove them at the end.
- plugin_dir=$(SOURCE_TREE)/plugins/org.apache.ant; \
- for ant_dir in \
- /usr/share/ant/lib; \
- do \
- test -d $$ant_dir || continue; \
- test $$(find $$ant_dir -maxdepth 1 -name '*.jar' | wc -l) -gt 0 || exit 1; \
- for ant_jar in $$ant_dir/*.jar; do \
- if test -f $$plugin_dir/lib/$$(basename $$ant_jar); then \
- ln -sf $$ant_jar $$plugin_dir/lib/$$(basename $$ant_jar) || exit 1; \
- fi; \
- done; \
- done; \
- find $$plugin_dir/lib/ -type f -name '*.jar' -exec rm {} ';' || exit 1
-
- # Lucene is an Apache Jakarta project. Eclipse included their own pre-
- # built copy of the two Jar files. We previously removed these Jars.
- # Now, for the build to succeed, we link these Jar files in from the
- # local Lucene installation.
- plugin_dir=$(SOURCE_TREE)/plugins/org.apache.lucene && \
- ln -sf /usr/share/java/lucene-1.*.jar $$plugin_dir/lucene-*.jar && \
- ln -sf /usr/share/java/lucene-demos-*.jar $$plugin_dir/parser.jar
-
- # Java Secure Shell.
- plugin_dir=$(SOURCE_TREE)/plugins/org.eclipse.team.cvs.ssh2 && \
- ln -sf /usr/share/java/jsch.jar $$plugin_dir/jsch-*.jar
-
- # A similar situation exists with JUnit. We link the plug-in to the
- # Debian supplied version.
- plugin_dir=$(SOURCE_TREE)/plugins/org.junit && \
- ln -sf /usr/share/java/junit.jar $$plugin_dir/junit.jar
-
+
+ # Replace all jars by links to previous install libraries.
ifeq ($(with_tomcat),yes)
- # Similar to our Ant linking routine. We replace every Jar distributed by
- # Eclipse for Tomcat with the Debian version. This errors if any Jars are
- # left over because they should not be.
- plugin_dir=$(SOURCE_TREE)/plugins/org.eclipse.tomcat; \
- for tomcat_dir in \
- /usr/share/tomcat5/bin \
- /usr/share/tomcat5/common/lib \
- /usr/share/tomcat5/server/lib; \
- do \
- test -d $$tomcat_dir || continue; \
- test $$(find $$tomcat_dir -maxdepth 1 -name '*.jar' | wc -l) -gt 0 || exit 1; \
- for tomcat_jar in $$tomcat_dir/*.jar; do \
- echo "linking jar: $$plugin_dir/$$(basename $$tomcat_jar)"; \
- if test -f $$plugin_dir/$$(basename $$tomcat_jar); then \
- ln -sf $$tomcat_jar $$plugin_dir/$$(basename $$tomcat_jar) || exit 1; \
- fi; \
- done; \
- done; \
- ln -sf /usr/share/java/commons-collections.jar $$plugin_dir/commons-collections.jar && \
- ln -sf /usr/share/java/commons-el.jar $$plugin_dir/commons-el.jar && \
- ln -sf /usr/share/java/regexp.jar $$plugin_dir/jakarta-regexp-1.3.jar && \
- ln -sf /usr/share/java/jsp-api.jar $$plugin_dir/jsp-api.jar && \
- ln -sf /usr/share/java/mx4j.jar $$plugin_dir/mx4j-jmx.jar && \
- ln -sf /usr/share/java/servlet-api-2.4.jar $$plugin_dir/servlet-api.jar && \
- ln -sf /usr/share/tomcat5/server/lib/catalina-optional.jar $$plugin_dir/catalina-optional.jar && \
- rm $$plugin_dir/servlet.jar && \
- rm $$plugin_dir/servlets-manager.jar && \
- test $$(find $$plugin_dir/ -type f -name '*.jar' | wc -l) -eq 0
+ cat $(EXTRA)/links.txt | while read FROM TO; do \
+ ln -sf $$FROM $(SOURCE_TREE)/plugins/$$TO; \
+ done
+else
+ cat $(EXTRA)/links.txt | grep -v tomcat | while read FROM TO; do \
+ ln -sf $$FROM $(SOURCE_TREE)/plugins/$$TO; \
+ done
endif
# Update build ids in configuration files
@@ -456,7 +387,7 @@
# extract the jdtCompilerAdapter.jar file
mkdir -p $(DEBIAN_TMP)/usr/share/ant/lib
cd $(DEBIAN_TMP)/usr/share/ant/lib && \
- jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_3.1.1.jar jdtCompilerAdapter.jar
+ jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar
# Builds any Debian-specific extra files.
@@ -464,7 +395,7 @@
# Put debian version into about.mappings of org.eclipse.sdk to show it
# in Eclispe about dialog.
- plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_3.1.1 ; \
+ plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_3.1.2 ; \
sed -e "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" < $$plugin_dir/about.mappings > $$plugin_dir/about.mappings.tmp ; \
mv $$plugin_dir/about.mappings.tmp $$plugin_dir/about.mappings
@@ -485,55 +416,15 @@
# Because Java cannot read Unix soft links, it simply copies the data
# of all our previously replaced Jar files. We must now go through the
# process of linking them back to the Debian versions.
-
- # Begin with Ant. Basically the same procedure as above.
- plugin_dir="$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_"*; \
- for ant_dir in \
- /usr/share/ant/lib; \
- do \
- test -d "$$ant_dir" || continue; \
- test $$(find "$$ant_dir" -maxdepth 1 -name '*.jar' | wc -l) -gt 0 || exit 1; \
- for ant_jar in "$$ant_dir"/*.jar; do \
- if test -f $$plugin_dir/lib/$$(basename "$$ant_jar"); then \
- echo "linking Ant jar: $$(basename "$$ant_jar")"; \
- ln -sf "$$ant_jar" $$plugin_dir/lib/$$(basename "$$ant_jar") || exit 1; \
- fi; \
- done; \
- done; \
- test $$(find $$plugin_dir -type f -name '*.jar' | wc -l) -eq 0
-
- # Fix up the links to the local Jar files.
- plugin_dir=$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/ && \
- ln -sf /usr/share/java/lucene-1.*.jar $${plugin_dir}/org.apache.lucene_*/lucene-*.jar && \
- ln -sf /usr/share/java/lucene-demos-*.jar $${plugin_dir}/org.apache.lucene_*/parser.jar && \
- ln -sf /usr/share/java/junit.jar $${plugin_dir}/org.junit_*/junit.jar && \
- ln -sf /usr/share/java/jsch.jar $${plugin_dir}/org.eclipse.team.cvs.ssh2_*/jsch-*.jar
-
+
ifeq ($(with_tomcat),yes)
- # Tomcat re-linking.
- plugin_dir="$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_"*; \
- for tomcat_dir in \
- /usr/share/tomcat5/bin \
- /usr/share/tomcat5/common/lib \
- /usr/share/tomcat5/server/lib; \
- do \
- test -d "$$tomcat_dir" || continue; \
- test $$(find "$$tomcat_dir" -maxdepth 1 -name '*.jar' | wc -l) -gt 0 || exit 1; \
- for tomcat_jar in "$$tomcat_dir"/*.jar; do \
- if test -f $$plugin_dir/$$(basename "$$tomcat_jar"); then \
- echo "linking Tomcat jar: $$(basename "$$tomcat_jar")"; \
- ln -sf "$$tomcat_jar" $$plugin_dir/"$$(basename "$$tomcat_jar")" || exit 1; \
- fi; \
- done; \
- done; \
- ln -sf /usr/share/java/commons-collections.jar $$plugin_dir/commons-collections.jar && \
- ln -sf /usr/share/java/commons-el.jar $$plugin_dir/commons-el.jar && \
- ln -sf /usr/share/java/regexp.jar $$plugin_dir/jakarta-regexp-1.3.jar && \
- ln -sf /usr/share/java/jsp-api.jar $$plugin_dir/jsp-api.jar && \
- ln -sf /usr/share/java/mx4j.jar $$plugin_dir/mx4j-jmx.jar && \
- ln -sf /usr/share/java/servlet-api-2.4.jar $$plugin_dir/servlet-api.jar && \
- ln -sf /usr/share/tomcat5/server/lib/catalina-optional.jar $$plugin_dir/catalina-optional.jar && \
- test ! $$(find $$plugin_dir -type f -name '*.jar' | wc -l) -gt 1
+ cat $(EXTRA)/package-links.txt | while read FROM TO; do \
+ ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \
+ done
+else
+ cat $(EXTRA)/package-links.txt | grep -v tomcat | while read FROM TO; do \
+ ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \
+ done
endif
# Preinitialize the Eclipse directory. This extracts bundles
@@ -567,8 +458,8 @@
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.dom.txt
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.sax.txt
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_*/mx4j.license
- rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.1/src/org.apache.ant_*/LICENSE.sax.txt
- rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.1/src/org.eclipse.tomcat_*/mx4j.license
+ rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.2/src/org.apache.ant_*/LICENSE.sax.txt
+ rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.2/src/org.eclipse.tomcat_*/mx4j.license
# Move architecture dependent files from ECLIPSE_HOME into
# ECLIPSE_ARCH. All non-moved files will be symlinked instead.
More information about the pkg-java-commits
mailing list