[pkg-java] r8622 - in trunk/eclipse/debian: . extra patches
Matthias Klose
doko at alioth.debian.org
Sun Jun 28 12:33:32 UTC 2009
Author: doko
Date: 2009-06-28 12:33:30 +0000 (Sun, 28 Jun 2009)
New Revision: 8622
Added:
trunk/eclipse/debian/control.in.gcj
trunk/eclipse/debian/eclipse-cvs.install
trunk/eclipse/debian/libswt3.4-gtk-java.install
trunk/eclipse/debian/libswt3.4-gtk-jni.dirs
trunk/eclipse/debian/libswt3.4-gtk-jni.install
trunk/eclipse/debian/patches/eclipse-disabledocindexes.dpatch
trunk/eclipse/debian/patches/eclipse-ini-more-memory.dpatch
trunk/eclipse/debian/patches/eclipse-osgi-bootclasspath.dpatch
trunk/eclipse/debian/patches/eclipse-swt-build.dpatch
trunk/eclipse/debian/patches/eclipse-swt-location.dpatch
Removed:
trunk/eclipse/debian/libswt3.3-gtk-gcj.install
trunk/eclipse/debian/libswt3.3-gtk-java.install
trunk/eclipse/debian/libswt3.3-gtk-jni.dirs
trunk/eclipse/debian/libswt3.3-gtk-jni.install
trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
trunk/eclipse/debian/patches/eclipse-libswt-xpcomgcc4.dpatch
trunk/eclipse/debian/patches/eclipse-libupdatebuild.dpatch
trunk/eclipse/debian/patches/eclipse-libupdatebuild2.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-pde.install
trunk/eclipse/debian/eclipse-platform.install
trunk/eclipse/debian/eclipse-rcp.install
trunk/eclipse/debian/eclipse-source.install
trunk/eclipse/debian/eclipse.install
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/extra/java_home
trunk/eclipse/debian/extra/links.txt
trunk/eclipse/debian/extra/package-links.txt
trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch
trunk/eclipse/debian/patches/eclipse-disable-buildHelpIndex.dpatch
trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch
trunk/eclipse/debian/patches/eclipse-fileinitializer.dpatch
trunk/eclipse/debian/patches/eclipse-gnuformatterjdt.dpatch
trunk/eclipse/debian/patches/eclipse-java-home.dpatch
trunk/eclipse/debian/patches/eclipse-jsch.dpatch
trunk/eclipse/debian/patches/eclipse-nativepresentation.dpatch
trunk/eclipse/debian/patches/eclipse-swttools.dpatch
trunk/eclipse/debian/rules
Log:
* Fix build dependencies.
* Disable building the -gcj packages (not updated for 3.4.x).
* TODO's before uploading to a distribution:
- Clean tarball (no binaries included, no third party libs included).
- Add OSGi information to required build dependencies.
- Build using dependencies from the distribution repository.
- Disable the eclipse updater for components shipped with the distribution.
* Remove everybody from the uploaders control field.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/changelog 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,7 +1,128 @@
-eclipse (3.4-1) UNRELEASED; urgency=low
+eclipse (3.4.1-1~exp1) UNRELEASED; urgency=low
+ * Fix build dependencies.
+ * Disable building the -gcj packages (not updated for 3.4.x).
+ * TODO's before uploading to a distribution:
+ - Clean tarball (no binaries included, no third party libs included).
+ - Add OSGi information to required build dependencies.
+ - Build using dependencies from the distribution repository.
+ - Disable the eclipse updater for components shipped with the distribution.
+ * Remove everybody from the uploaders control field.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 28 Jun 2009 12:18:44 +0200
+
+eclipse (3.4.1-0ubuntu1~ppa3) intrepid; urgency=low
+
+ * Cleaned up lintian warning.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 04 Feb 2009 14:07:49 -0500
+
+eclipse (3.4.1-0ubuntu1~ppa2) intrepid; urgency=low
+
+ * Merged swt-building patch from the eclipse-debian tree.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 04 Feb 2009 13:04:56 -0500
+
+eclipse (3.4.1-0ubuntu1~ppa1) jaunty; urgency=low
+
+ * Upload to the PPA.
+
+ -- Mikhail Zabaluev <mikhail.zabaluev at gmail.com> Sun, 01 Feb 2009 16:10:56 +0200
+
+eclipse (3.4.1-0ubuntu1~mhz2) UNRELEASED; urgency=low
+
+ * Aliased the JDK dependency to default-jdk.
+ * Depend on bootstrap ecj of the same major version.
+ * Removed most of the legacy entries from debian/extra/java_home;
+ default-java is tried first.
+ * Updated the junit link in debian/extra/package-links.txt.
+ * Run the install ant target in the build rule to avoid OpenJDK
+ deadlocks under fakeroot.
+
+ -- Mikhail Zabaluev <mikhail.zabaluev at gmail.com> Sat, 31 Jan 2009 16:37:03 +0200
+
+eclipse (3.4.1-0ubuntu1~mhz1) UNRELEASED; urgency=low
+
* New upstream version.
+ * Build with OpenJDK 6.
+ * Fixed the patch rule to invoke uncompress before patching.
+ * Removed the patch made unnecessary by JDK 1.6: eclipse-disable-apt
+ * Removed patch included in upstream:
+ eclipse-pde-string-casting.
+ * Added patch: eclipse-osgi-bootclasspath
+
+ -- Mikhail Zabaluev <mikhail.zabaluev at gmail.com> Sat, 11 Oct 2008 13:50:58 +0300
+
+eclipse (3.4.0-0ubuntu1~ppa6) hardy; urgency=low
+
+ * We still require junit4.
+
+ -- Nathan Summers <rock at gimp.org> Mon, 07 Jul 2008 13:23:03 -0400
+
+eclipse (3.4.0-0ubuntu1~ppa5.1) feisty; urgency=low
+
+ * Re-upload.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 02 Jul 2008 20:43:39 -0400
+
+
+eclipse (3.4.0-0ubuntu1~ppa5) feisty; urgency=low
+
+ * Removed another unnecessary dependency that prevents building on feisty.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 02 Jul 2008 20:30:36 -0400
+
+
+eclipse (3.4.0-0ubuntu1~ppa4) feisty; urgency=low
+
+ * Removed unnecessary dependencies that prevent building on feisty.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 02 Jul 2008 18:19:40 -0400
+
+
+eclipse (3.4.0-0ubuntu1~ppa3) hardy; urgency=low
+
+ * Reinstated eclipse-disable-buildIndexHelp, since it was crashing anyway.
+ Hopefully this will fix the buildd timeouts.
+
+ -- Nathan Summers <rock at gimp.org> Wed, 02 Jul 2008 12:11:23 -0400
+
+
+eclipse (3.4.0-0ubuntu1~ppa2) hardy; urgency=low
+
+ * Removed some files from debian/eclipse.install.
+
+ -- Nathan Summers <rock at gimp.org> Tue, 01 Jul 2008 10:45:05 -0400
+
+
+eclipse (3.4.0-0ubuntu1~ppa1) hardy; urgency=low
+
+ * New upstream version.
- Renamed Packages with version number in name.
+ * Updated eclipse-ecj-gcj.dpatch to latest from ecj package.
+ * Eclipse no longer ships with tomcat, so removed tomcat-related package
+ machinery.
+ * Removed patches included in upstream:
+ eclipse-libupdatebuild.dpatch, eclipse-updatehomedir.
+ * Removed no longer necessary patches: eclipse-libupdatebuild2.dpatch,
+ eclipse-fileinitializer.dpatch
+ eclipse-jsch-sftpexception.dpatch, eclipse-libswt-xpcomgcc4.dpatch,
+ eclipse-tomcat55.dpatch, eclipse-tomcat55-build.dpatch,
+ eclipse-webapp-tomcat55.dpatch.
+ * Disabled eclipse-icu4j-build-files.dpatch, eclipse-jsch-build-files.dpatch;
+ didn't apply cleanly and seemed unnecessary.
+ * Commented out for right now: eclipse-libswt-firefox.dpatch,
+ eclipse-libswt-firefox2.dpatch
+ * Needs work: eclipse-gnuformatterjdt.patch
+ * Added patches: eclipse-swt-location.dpatch, eclipse-pde-string-casting.dpatch
+ * Increased default maximum memory usage to 512 MB.
+
+ -- Nathan Summers <rock at gimp.org> Mon, 30 Jun 2008 17:16:43 -0400
+
+eclipse (3.3.2-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ - Renamed Packages with version number in name.
* Suppress warnings from javac.
* Make Debian version injection work more reliable.
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/control 2009-06-28 12:33:30 UTC (rev 8622)
@@ -2,8 +2,16 @@
Section: devel
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, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libicu4j-java, liblucene2-java, jetty, libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
+ openjdk-6-jdk, ecj (>= 3.4.0),
+ liblucene-java (>= 1.4.2),
+ junit (>= 3.8), junit4, libicu4j-java,
+ libgtk2.0-dev (>= 2.4), libcairo2-dev,
+ pkg-config, ant-optional (>= 1.6.5-3), xulrunner-dev
+# liblucene-java-doc (>= 1.4.2),
+# libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
+# libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev,
+# classpath-doc,
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eclipse
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eclipse
@@ -11,7 +19,7 @@
Package: eclipse-rcp
Architecture: any
-Depends: libswt3.3-gtk-java (= ${binary:Version})
+Depends: libswt3.4-gtk-java (= ${binary:Version})
Recommends: eclipse-rcp-gcj, eclipse
Replaces: eclipse-rcp-common, libswt3.1-gtk-java (<= 3.1.2-1)
Conflicts: eclipse-rcp-common
@@ -32,31 +40,10 @@
.
This package is the base for all Eclipse applications.
-Package: eclipse-rcp-gcj
-Architecture: any
-Depends: eclipse-rcp (= ${binary:Version}), libswt3.3-gtk-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Eclipse rich client platform (GCJ version)
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package provides only the Eclipse Rich Client Platform upon which any
- other Eclipse-based application can be constructed. It doesn't include any
- development plug-ins. These are available in different packages:
- .
- * eclipse-jdt Java Development Tools
- * eclipse-pde Plug-in Development Tools
- * eclipse Complete development environment
- .
- This package is the base for all Eclipse applications.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.36), libtomcat5.5-java,
+Depends: openjdk-6-jre, default-jre | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), ${shlibs:Depends}
+# liblucene-java-doc (>= 1.4.2)
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -77,26 +64,14 @@
.
This package is the base for all eclipse plug-ins.
-Package: eclipse-platform-gcj
+Package: eclipse-cvs
Architecture: any
-Depends: eclipse-platform (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Eclipse platform without plug-ins to develop any language (GCJ version)
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package provides only the Eclipse Platform. It doesn't include any
- development plug-ins. These are available in different packages:
- .
- * eclipse-jdt Java Development Tools
- * eclipse-pde Plug-in Development Tools
- * eclipse Complete development environment
- .
- This package is the base for all eclipse plug-ins.
- .
- This package contains native GCJ-compiled plugins.
+Depends: eclipse-platform (= ${binary:Version})
+Recommends: eclipse-cvs-gcj
+Suggests: cvs
+Description: cvs integration for Eclipse
+ These are the plugins required for using the Concurrent Versions System with
+ eclipse.
Package: eclipse-jdt
Architecture: any
@@ -110,17 +85,6 @@
JDT provides a whole Java IDE, complete with Java editor, debugger, Ant and
JUnit integration and much more.
-Package: eclipse-jdt-gcj
-Architecture: any
-Depends: eclipse-jdt (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Java Development Tools plug-ins for Eclipse (GCJ version)
- Eclipse JDT plug-ins to develop Java applications with Eclipse.
- .
- JDT provides a whole Java IDE, complete with Java editor, debugger, Ant and
- JUnit integration and much more.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-pde
Architecture: any
Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version})
@@ -131,15 +95,6 @@
Plug-in development environment provides tools to easily develop your own
Eclipse plug-ins.
-Package: eclipse-pde-gcj
-Architecture: any
-Depends: eclipse-pde (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Plug-in Development Environment to develop Eclipse plug-ins (GCJ version)
- Plug-in development environment provides tools to easily develop your own
- Eclipse plug-ins.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-source
Architecture: any
Depends: eclipse-platform (= ${binary:Version})
@@ -175,25 +130,12 @@
Package to provide the whole Eclipse SDK, which includes the Java Development
Tools and Plug-in Development Tools.
-Package: eclipse-gcj
-Architecture: all
-Depends: eclipse, java-gcj-compat-dev, ecj-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.3-gtk-gcj
-Description: Native Eclipse run with GCJ
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- Package to provide the whole native Eclipse SDK, which includes the Java
- Development Tools and Plug-in Development Tools.
-
-Package: libswt3.3-gtk-java
+Package: libswt3.4-gtk-java
Architecture: any
-Depends: libswt3.3-gtk-jni (= ${binary:Version}), java-common
-Recommends: libswt3.3-gtk-gcj,
-Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
-Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
+Depends: libswt3.4-gtk-jni (= ${binary:Version}), java-common
+Recommends: libswt3.4-gtk-gcj, ${shlibs:Depends}
+Replaces: libswt3.2-gtk-java, libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3.4-java, eclipse-rcp (<< 3.1.2-2)
+Conflicts: libswt3.2-gtk-java, libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk-3.4-java
Description: Fast and rich GUI toolkit for Java, gtk2 version
SWT (Standard Widget Toolkit) provides functionality similar to
Swing, but is much faster and open source. Mainly, it is used
@@ -201,31 +143,19 @@
.
This version of SWT is implemented using gtk2 libraries.
-Package: libswt3.3-gtk-gcj
+Package: libswt3.4-gtk-jni
Architecture: any
-Depends: libswt3.3-gtk-java (= ${binary:Version}), gij-4.2, ${shlibs:Depends}
-Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
-Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
-Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
- SWT (Standard Widget Toolkit) provides functionality similar to
- Swing, but is much faster and open source. Mainly, it is used
- for the Eclipse platform.
- .
- This version of SWT is implemented using gtk2 libraries.
-
-Package: libswt3.3-gtk-jni
-Architecture: any
Depends: ${shlibs:Depends}, libgtk2.0-0 (>= 2.12.0-3)
Recommends: ${shlibs:Recommends}
Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
-Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)
-Description: Platform dependent files for libswt3.3-gtk-java
+Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni, libswt-gnome-gtk-3.2-jni
+Description: Platform dependent files for libswt3.4-gtk-java
This packages includes all jni native libraries used by the gtk2
version of swt.
Package: eclipse-efj
Architecture: any
-Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
+Depends: openjdk-6-jre, default-jre | java1-runtime | java2-runtime, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
Recommends: ant-optional (>= 1.6.5-3)
Description: Eclipse Java code formatter
This package provides a script to launch the Eclipse JDT code formatter
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/control.in 2009-06-28 12:33:30 UTC (rev 8622)
@@ -2,8 +2,16 @@
Section: devel
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, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libicu4j-java, liblucene2-java, jetty, libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
+ openjdk-6-jdk, ecj (>= 3.4.0),
+ liblucene-java (>= 1.4.2),
+ junit (>= 3.8), junit4, libicu4j-java,
+ libgtk2.0-dev (>= 2.4), libcairo2-dev,
+ pkg-config at BUILD_DEPS@
+# liblucene-java-doc (>= 1.4.2),
+# libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
+# libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev,
+# classpath-doc,
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eclipse
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eclipse
@@ -11,7 +19,7 @@
Package: eclipse-rcp
Architecture: any
-Depends: libswt3.3-gtk-java (= ${binary:Version})
+Depends: libswt3.4-gtk-java (= ${binary:Version})
Recommends: eclipse-rcp-gcj, eclipse
Replaces: eclipse-rcp-common, libswt3.1-gtk-java (<= 3.1.2-1)
Conflicts: eclipse-rcp-common
@@ -32,31 +40,10 @@
.
This package is the base for all Eclipse applications.
-Package: eclipse-rcp-gcj
-Architecture: any
-Depends: eclipse-rcp (= ${binary:Version}), libswt3.3-gtk-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Eclipse rich client platform (GCJ version)
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package provides only the Eclipse Rich Client Platform upon which any
- other Eclipse-based application can be constructed. It doesn't include any
- development plug-ins. These are available in different packages:
- .
- * eclipse-jdt Java Development Tools
- * eclipse-pde Plug-in Development Tools
- * eclipse Complete development environment
- .
- This package is the base for all Eclipse applications.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.36), @TOMCAT_DEP@, @MOZILLA_DEP@
+Depends: openjdk-6-jre, default-jre | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), @MOZILLA_DEP@
+# liblucene-java-doc (>= 1.4.2)
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -77,26 +64,14 @@
.
This package is the base for all eclipse plug-ins.
-Package: eclipse-platform-gcj
+Package: eclipse-cvs
Architecture: any
-Depends: eclipse-platform (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Eclipse platform without plug-ins to develop any language (GCJ version)
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package provides only the Eclipse Platform. It doesn't include any
- development plug-ins. These are available in different packages:
- .
- * eclipse-jdt Java Development Tools
- * eclipse-pde Plug-in Development Tools
- * eclipse Complete development environment
- .
- This package is the base for all eclipse plug-ins.
- .
- This package contains native GCJ-compiled plugins.
+Depends: eclipse-platform (= ${binary:Version})
+Recommends: eclipse-cvs-gcj
+Suggests: cvs
+Description: cvs integration for Eclipse
+ These are the plugins required for using the Concurrent Versions System with
+ eclipse.
Package: eclipse-jdt
Architecture: any
@@ -110,17 +85,6 @@
JDT provides a whole Java IDE, complete with Java editor, debugger, Ant and
JUnit integration and much more.
-Package: eclipse-jdt-gcj
-Architecture: any
-Depends: eclipse-jdt (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Java Development Tools plug-ins for Eclipse (GCJ version)
- Eclipse JDT plug-ins to develop Java applications with Eclipse.
- .
- JDT provides a whole Java IDE, complete with Java editor, debugger, Ant and
- JUnit integration and much more.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-pde
Architecture: any
Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version})
@@ -131,15 +95,6 @@
Plug-in development environment provides tools to easily develop your own
Eclipse plug-ins.
-Package: eclipse-pde-gcj
-Architecture: any
-Depends: eclipse-pde (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
-Description: Plug-in Development Environment to develop Eclipse plug-ins (GCJ version)
- Plug-in development environment provides tools to easily develop your own
- Eclipse plug-ins.
- .
- This package contains native GCJ-compiled plugins.
-
Package: eclipse-source
Architecture: any
Depends: eclipse-platform (= ${binary:Version})
@@ -175,25 +130,12 @@
Package to provide the whole Eclipse SDK, which includes the Java Development
Tools and Plug-in Development Tools.
-Package: eclipse-gcj
-Architecture: all
-Depends: eclipse, java-gcj-compat-dev, ecj-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.3-gtk-gcj
-Description: Native Eclipse run with GCJ
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- Package to provide the whole native Eclipse SDK, which includes the Java
- Development Tools and Plug-in Development Tools.
-
-Package: libswt3.3-gtk-java
+Package: libswt3.4-gtk-java
Architecture: any
-Depends: libswt3.3-gtk-jni (= ${binary:Version}), java-common
-Recommends: libswt3.3-gtk-gcj, @MOZILLA_DEP@
-Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
-Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
+Depends: libswt3.4-gtk-jni (= ${binary:Version}), java-common
+Recommends: libswt3.4-gtk-gcj, @MOZILLA_DEP@
+Replaces: libswt3.2-gtk-java, libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3.4-java, eclipse-rcp (<< 3.1.2-2)
+Conflicts: libswt3.2-gtk-java, libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk-3.4-java
Description: Fast and rich GUI toolkit for Java, gtk2 version
SWT (Standard Widget Toolkit) provides functionality similar to
Swing, but is much faster and open source. Mainly, it is used
@@ -201,31 +143,19 @@
.
This version of SWT is implemented using gtk2 libraries.
-Package: libswt3.3-gtk-gcj
+Package: libswt3.4-gtk-jni
Architecture: any
-Depends: libswt3.3-gtk-java (= ${binary:Version}), gij-4.2, ${shlibs:Depends}
-Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
-Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
-Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
- SWT (Standard Widget Toolkit) provides functionality similar to
- Swing, but is much faster and open source. Mainly, it is used
- for the Eclipse platform.
- .
- This version of SWT is implemented using gtk2 libraries.
-
-Package: libswt3.3-gtk-jni
-Architecture: any
Depends: ${shlibs:Depends}, libgtk2.0-0 (>= 2.12.0-3)
Recommends: ${shlibs:Recommends}
Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
-Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)
-Description: Platform dependent files for libswt3.3-gtk-java
+Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni, libswt-gnome-gtk-3.2-jni
+Description: Platform dependent files for libswt3.4-gtk-java
This packages includes all jni native libraries used by the gtk2
version of swt.
Package: eclipse-efj
Architecture: any
-Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
+Depends: openjdk-6-jre, default-jre | java1-runtime | java2-runtime, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
Recommends: @ANT_DEP@
Description: Eclipse Java code formatter
This package provides a script to launch the Eclipse JDT code formatter
Added: trunk/eclipse/debian/control.in.gcj
===================================================================
--- trunk/eclipse/debian/control.in.gcj (rev 0)
+++ trunk/eclipse/debian/control.in.gcj 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,88 @@
+
+Package: eclipse-rcp-gcj
+Architecture: any
+Depends: eclipse-rcp (= ${binary:Version}), libswt3.4-gtk-gcj (= ${binary:Version}), ${shlibs:Depends}
+Description: Eclipse rich client platform (GCJ version)
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ This package provides only the Eclipse Rich Client Platform upon which any
+ other Eclipse-based application can be constructed. It doesn't include any
+ development plug-ins. These are available in different packages:
+ .
+ * eclipse-jdt Java Development Tools
+ * eclipse-pde Plug-in Development Tools
+ * eclipse Complete development environment
+ .
+ This package is the base for all Eclipse applications.
+ .
+ This package contains native GCJ-compiled plugins.
+
+Package: eclipse-platform-gcj
+Architecture: any
+Depends: eclipse-platform (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
+Description: Eclipse platform without plug-ins to develop any language (GCJ version)
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ This package provides only the Eclipse Platform. It doesn't include any
+ development plug-ins. These are available in different packages:
+ .
+ * eclipse-jdt Java Development Tools
+ * eclipse-pde Plug-in Development Tools
+ * eclipse Complete development environment
+ .
+ This package is the base for all eclipse plug-ins.
+ .
+ This package contains native GCJ-compiled plugins.
+
+Package: eclipse-jdt-gcj
+Architecture: any
+Depends: eclipse-jdt (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
+Description: Java Development Tools plug-ins for Eclipse (GCJ version)
+ Eclipse JDT plug-ins to develop Java applications with Eclipse.
+ .
+ JDT provides a whole Java IDE, complete with Java editor, debugger, Ant and
+ JUnit integration and much more.
+ .
+ This package contains native GCJ-compiled plugins.
+
+Package: eclipse-pde-gcj
+Architecture: any
+Depends: eclipse-pde (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version}), ${shlibs:Depends}
+Description: Plug-in Development Environment to develop Eclipse plug-ins (GCJ version)
+ Plug-in development environment provides tools to easily develop your own
+ Eclipse plug-ins.
+ .
+ This package contains native GCJ-compiled plugins.
+
+Package: eclipse-gcj
+Architecture: all
+Depends: eclipse, java-gcj-compat-dev, ecj-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.4-gtk-gcj
+Description: Native Eclipse run with GCJ
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ Package to provide the whole native Eclipse SDK, which includes the Java
+ Development Tools and Plug-in Development Tools.
+
+Package: libswt3.4-gtk-gcj
+Architecture: any
+Depends: libswt3.4-gtk-java (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj, libswt3.2-gtk-gcj
+Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj, libswt3.2-gtk-gcj
+Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
+ SWT (Standard Widget Toolkit) provides functionality similar to
+ Swing, but is much faster and open source. Mainly, it is used
+ for the Eclipse platform.
+ .
+ This version of SWT is implemented using gtk2 libraries.
Added: trunk/eclipse/debian/eclipse-cvs.install
===================================================================
--- trunk/eclipse/debian/eclipse-cvs.install (rev 0)
+++ trunk/eclipse/debian/eclipse-cvs.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,7 @@
+debian/tmp/usr/lib/eclipse/features/org.eclipse.cvs_*
+
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.cvs_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.core_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh2_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ui_*.jar
\ No newline at end of file
Modified: trunk/eclipse/debian/eclipse-pde.install
===================================================================
--- trunk/eclipse/debian/eclipse-pde.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/eclipse-pde.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -7,6 +7,16 @@
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.junit.runtime_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.runtime_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.ui_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.ui.templates_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views.log_*
+debian/tmp/usr/lib/eclipse/plugins/org.objectweb.asm_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.api.tools_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.api.tools.ui_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.pde.p2_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.p2.ui_*
+
+
+
debian/linda/eclipse-pde /usr/share/linda/overrides
debian/lintian/eclipse-pde /usr/share/lintian/overrides
Modified: trunk/eclipse/debian/eclipse-platform.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/eclipse-platform.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,80 +1,135 @@
-debian/tmp/usr/lib/eclipse/startup.jar
debian/tmp/usr/lib/eclipse/.eclipseproduct
-debian/tmp/usr/lib/eclipse/links
+debian/tmp/usr/lib/eclipse/links/local.link
debian/tmp/usr/lib/eclipse/eclipse.ini
debian/tmp/usr/lib/eclipse/configuration/config.ini
+debian/tmp/usr/lib/eclipse/configuration/org.eclipse.update
-debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
-
-debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*.jar
-debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu.source_*
-debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu.base_*.jar
-debian/tmp/usr/lib/eclipse/plugins/com.jcraft.jsch_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.help_*
+debian/tmp/usr/lib/eclipse/plugins/javax.servlet_*
+debian/tmp/usr/lib/eclipse/plugins/javax.servlet.jsp_*
debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*
+debian/tmp/usr/lib/eclipse/plugins/org.apache.commons.el_*
+debian/tmp/usr/lib/eclipse/plugins/org.apache.commons.logging_*
+debian/tmp/usr/lib/eclipse/plugins/org.apache.jasper_*
debian/tmp/usr/lib/eclipse/plugins/org.apache.lucene_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ant.core_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.compare_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.boot_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.contenttype_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filebuffers_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources.linux_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources.compatibility_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.apache.lucene.analysis_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.http.jetty_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.http.registry_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.http.servlet_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.jsp.jasper_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.jsp.jasper.registry_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.base_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.webapp_*
+debian/tmp/usr/lib/eclipse/plugins/org.mortbay.jetty_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.forms_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi.services_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.variables_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ant.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.variables_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.preferences_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.appserver_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.base_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.ui_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.webapp_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface.databinding_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ltk.core.refactoring_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
+
+debian/tmp/usr/lib/eclipse/features/org.eclipse.equinox.p2.user.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.director_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.engine_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.repository_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.artifact.repository_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf.filetransfer_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf.identity_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.exemplarysetup_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.console_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.sdk_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.updatechecker_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.garbagecollector_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.updatesite_*
+debian/tmp/usr/lib/eclipse/plugins/org.sat4j.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.sat4j.pb_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.extensionlocation_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ecf.ssl_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.p2.director.app_*
+
+debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
+debian/tmp/usr/lib/eclipse/plugins/com.jcraft.jsch_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.compare_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.boot_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filebuffers_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.win32.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources.compatibility_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi.util_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.debug.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.debug.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help.appserver_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ltk.core.refactoring_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.platform_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.platform.doc.isv_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.platform.doc.user_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.search_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.core_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.core_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh2_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.cvs.ui_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.ui_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.tomcat_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.text_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.browser_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.cheatsheets_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.console_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.editors_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.externaltools_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.forms_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.intro_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.search_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.team.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.text_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface.text_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jsch.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jsch.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.console_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.presentations.r21_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.intro_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.navigator_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.navigator.resources_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.presentations.r21_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.cheatsheets_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.browser_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.navigator_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.navigator.resources_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.net_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.editors_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.externaltools_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.ide_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.ide.application_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.win32_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.ui_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench.compatibility_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.configurator_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.ui_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.hpux.ia64_32_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.hpux.PA_RISC_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.ppc_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.macosx_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.qnx.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.win32.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.filesystem.win32.ia64_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources.win32.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.resources.win32.ia64_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.win32_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security.win32.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.security.macosx_*
debian/linda/eclipse-platform usr/share/linda/overrides
debian/lintian/eclipse-platform usr/share/lintian/overrides
Modified: trunk/eclipse/debian/eclipse-rcp.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/eclipse-rcp.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,14 +1,37 @@
debian/tmp/usr/lib/eclipse/features/org.eclipse.rcp_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.rcp_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.expressions_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help_*.jar
+debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.commands_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.databinding_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.databinding.beans_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.jobs_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.expressions_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt_*
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface.databinding_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.carbon_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.configurator_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.rcp_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.contenttype_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.app_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.common_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.preferences_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.s390_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.s390x_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_*
+
+
debian/linda/eclipse-rcp /usr/share/linda/overrides
debian/lintian/eclipse-rcp /usr/share/lintian/overrides
Modified: trunk/eclipse/debian/eclipse-source.install
===================================================================
--- trunk/eclipse/debian/eclipse-source.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/eclipse-source.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,3 +1,6 @@
+debian/tmp/usr/lib/eclipse/*/org.eclipse.cvs.source*_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.user.ui.source*_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.help.source*_*
debian/tmp/usr/lib/eclipse/*/org.eclipse.rcp.source*_*
debian/tmp/usr/lib/eclipse/*/org.eclipse.platform.source*_*
debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.source*_*
@@ -2,2 +5,139 @@
debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.source*_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.p2.source*_*
+debian/tmp/usr/lib/eclipse/*/javax.servlet.jsp.source_*
+debian/tmp/usr/lib/eclipse/*/javax.servlet.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.ant.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.commons.el.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.commons.logging.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.jasper.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.lucene.analysis.source_*
+debian/tmp/usr/lib/eclipse/*/org.apache.lucene.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ant.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ant.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.compare.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.commands.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.contenttype.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.databinding.beans.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.databinding.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.expressions.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.filebuffers.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.filesystem.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.jobs.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.net.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.resources.compatibility.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.resources.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.runtime.compatibility.auth.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.runtime.compatibility.registry.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.runtime.compatibility.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.runtime.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.core.variables.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.debug.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.debug.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.app.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.common.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.frameworkadmin.equinox.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.frameworkadmin.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.http.jetty.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.http.registry.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.http.servlet.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.jsp.jasper.registry.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.jsp.jasper.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.launcher.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.artifact.repository.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.console.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.director.app.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.director.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.directorywatcher.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.engine.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.exemplarysetup.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.extensionlocation.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.garbagecollector.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.jarprocessor.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.metadata.generator.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.metadata.repository.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.metadata.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.reconciler.dropins.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.touchpoint.eclipse.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.touchpoint.natives.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.ui.sdk.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.updatechecker.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.p2.updatesite.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.preferences.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.registry.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.security.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.security.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.simpleconfigurator.manipulator.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.equinox.simpleconfigurator.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.help.appserver.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.help.base.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.help.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.help.webapp.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.core.manipulation.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.core.source_3.4.0.v_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.debug.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.debug.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.junit4.runtime.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.junit.runtime.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.junit.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.launching.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jdt.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jface.databinding.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jface.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jface.text.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jsch.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.jsch.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ltk.core.refactoring.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ltk.ui.refactoring.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.osgi.services.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.osgi.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.osgi.util.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.api.tools.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.api.tools.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.build.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.junit.runtime.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.p2.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.runtime.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.pde.ui.templates.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.search.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.cvs.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.cvs.ssh2.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.cvs.ssh.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.cvs.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.team.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.text.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.browser.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.cheatsheets.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.console.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.editors.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.externaltools.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.forms.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.ide.application.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.ide.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.intro.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.intro.universal.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.navigator.resources.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.navigator.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.net.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.presentations.r21.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.views.log.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.views.properties.tabbed.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.views.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.workbench.compatibility.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.workbench.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.ui.workbench.texteditor.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.update.configurator.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.update.core.linux.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.update.core.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.update.scheduler.source_*
+debian/tmp/usr/lib/eclipse/*/org.eclipse.update.ui.source_*
+debian/tmp/usr/lib/eclipse/*/org.junit4.source_*
+debian/tmp/usr/lib/eclipse/*/org.junit.source_*
+debian/tmp/usr/lib/eclipse/*/org.mortbay.jetty.source_*
+debian/tmp/usr/lib/eclipse/*/org.objectweb.asm.source_*
Modified: trunk/eclipse/debian/eclipse.install
===================================================================
--- trunk/eclipse/debian/eclipse.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/eclipse.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -2,10 +2,9 @@
debian/tmp/usr/share/pixmaps/eclipse*.png
debian/tmp/usr/share/pixmaps/eclipse32.xpm
-debian/tmp/usr/bin/eclipse
+debian/tmp/usr/lib/eclipse/eclipse
+debian/tmp/usr/bin/eclipse usr/bin
-source-tree/launchertmp/eclipse usr/lib/eclipse
-
debian/tmp/usr/share/applications/eclipse.desktop
debian/tmp/usr/lib/eclipse/features/org.eclipse.sdk_*
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/extra/eclipse.sh 2009-06-28 12:33:30 UTC (rev 8622)
@@ -9,7 +9,7 @@
CMDLINEARGS=""
VMARGS=""
INSTALL="/usr/lib/eclipse"
-STARTUP="/usr/lib/eclipse/startup.jar"
+STARTUP=""
if [ -x /usr/bin/zenity ]; then
DIALOG=/usr/bin/zenity
@@ -67,7 +67,7 @@
shift
elif [ "$1" = "-startup" ]; then
shift
- STARTUP="$1"
+ STARTUP="-startup $1"
shift
elif [ "$1" = "-vmargs" ]; then
shift
@@ -170,7 +170,7 @@
exec /usr/lib/eclipse/eclipse \
-vm "${JAVACMD}" \
-install "${INSTALL}" \
- -startup "${STARTUP}" \
+ "${STARTUP}" \
${CMDLINEARGS} \
-vmargs -Djava.library.path=/usr/lib/jni \
-Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.2/classmap.db \
Modified: trunk/eclipse/debian/extra/java_home
===================================================================
--- trunk/eclipse/debian/extra/java_home 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/extra/java_home 2009-06-28 12:33:30 UTC (rev 8622)
@@ -2,15 +2,7 @@
# compatible JAVA_HOME. This setting may be overridden on a per-user basis by
# altering the JAVA_HOME setting in ~/.eclipse/eclipserc.
-/usr/lib/jvm/java-7-icedtea
+/usr/lib/jvm/default-java
/usr/lib/jvm/java-gcj
/usr/lib/kaffe/pthreads
-/usr/lib/jvm/java-6-sun
-/usr/lib/jvm/java-1.5.0-sun
-/usr/lib/j2se/1.5
-/usr/lib/j2se/1.4
-/usr/lib/j2sdk1.5-ibm
-/usr/lib/j2sdk1.4-ibm
-/usr/lib/j2sdk1.6-sun
-/usr/lib/j2sdk1.5-sun
-/usr/lib/j2sdk1.4-sun
+
Modified: trunk/eclipse/debian/extra/links.txt
===================================================================
--- trunk/eclipse/debian/extra/links.txt 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/extra/links.txt 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,55 +1,21 @@
-/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat/lib/tomcat-coyote.jar
-/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat/lib/servletapi5.jar
-/usr/share/java/commons-collections.jar org.eclipse.tomcat/lib/commons-collections.jar
-/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat/lib/bootstrap.jar
-/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat/lib/tomcat-http.jar
-/usr/share/java/commons-modeler.jar org.eclipse.tomcat/lib/commons-modeler.jar
-/usr/share/java/commons-logging-api.jar org.eclipse.tomcat/lib/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar org.eclipse.tomcat/lib/commons-beanutils.jar
-/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat/lib/tomcat-util.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat/lib/servlets-invoker.jar
-/usr/share/java/commons-digester.jar org.eclipse.tomcat/lib/commons-digester.jar
-/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat/lib/jasper-runtime.jar
-/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat/lib/servlets-default.jar
-/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat/lib/naming-factory.jar
-/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat/lib/catalina.jar
-/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat/lib/catalina-optional.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat/lib/mx4j-impl.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat/lib/mx4j-jmx.jar
-/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat/lib/naming-resources.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat/lib/jasper-compiler.jar
-/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat/lib/jsp-api.jar
-/usr/share/java/commons-el.jar org.eclipse.tomcat/lib/commons-el.jar
-/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
-/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
-/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
-/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
-/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
-/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
-/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
-/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
-/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
-/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
-/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
-/usr/share/ant/lib/ant-junit.jar org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
-/usr/share/ant/lib/ant.jar org.apache.ant_1.7.0.v200706080842/lib/ant.jar
-/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
-/usr/share/ant/lib/ant-launcher.jar org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
-/usr/share/ant/lib/ant-jmf.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
-/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
-/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
-/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.7.0.v200706080842/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_3.8.2.v200706111738/junit.jar
+/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-log4j.jar
+/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-resolver.jar
+/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.7.0.v200803061910/lib/ant-commons-logging.jar
+/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.7.0.v200803061910/lib/ant-nodeps.jar
+/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.7.0.v200803061910/lib/ant-javamail.jar
+/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jsch.jar
+/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-bsf.jar
+/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-regexp.jar
+/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-oro.jar
+/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.7.0.v200803061910/lib/ant-antlr.jar
+/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jdepend.jar
+/usr/share/ant/lib/ant-junit.jar org.apache.ant_1.7.0.v200803061910/lib/ant-junit.jar
+/usr/share/ant/lib/ant.jar org.apache.ant_1.7.0.v200803061910/lib/ant.jar
+/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-bcel.jar
+/usr/share/ant/lib/ant-launcher.jar org.apache.ant_1.7.0.v200803061910/lib/ant-launcher.jar
+/usr/share/ant/lib/ant-jmf.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jmf.jar
+/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.7.0.v200803061910/lib/ant-commons-net.jar
+/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.7.0.v200803061910/lib/ant-trax.jar
+/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.7.0.v200803061910/lib/ant-swing.jar
+/usr/share/java/junit.jar org.junit_3.8.2.v20080602-1318/junit.jar
/usr/share/java/junit4.jar org.junit4/junit.jar
-/usr/share/java/icu4j.jar com.ibm.icu_3.6.1.v20070906.jar
-/usr/share/java/servlet-api-2.4.jar javax.servlet_2.4.0.v200706111738.jar
-/usr/share/java/jetty.jar org.mortbay.jetty_5.1.11.v200706111724.jar
-/usr/share/java/lucene-core.jar org.apache.lucene_1.9.1.v200706111724.jar
-/usr/share/java/lucene-analyzers.jar org.apache.lucene.analyzers_1.9.1.v200706111724.jar
-/usr/share/java/lucene-analyzers.jar org.apache.lucene.analysis_1.9.1.v200706181610.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.apache.jasper_5.5.17.v200706111724.jar
-/usr/share/java/jsch.jar com.jcraft.jsch_0.1.31.jar
-/usr/share/java/commons-logging.jar org.apache.commons.logging_1.0.4.v200706111724.jar
-/usr/share/java/commons-el.jar org.apache.commons.el_1.0.0.v200706111724.jar
-/usr/share/java/jsp-api.jar javax.servlet.jsp_2.0.0.v200706191603.jar
Modified: trunk/eclipse/debian/extra/package-links.txt
===================================================================
--- trunk/eclipse/debian/extra/package-links.txt 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/extra/package-links.txt 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,56 +1,21 @@
-/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat_5.5.17/lib/tomcat-coyote.jar
-/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat_5.5.17/lib/servlet-api.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.5.17/lib/servlets-invoker.jar
-/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.5.17/lib/commons-collections.jar
-/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat_5.5.17/lib/bootstrap.jar
-/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat_5.5.17/lib/tomcat-http.jar
-/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.5.17/lib/commons-modeler.jar
-/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.5.17/lib/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.5.17/lib/commons-beanutils.jar
-/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat_5.5.17/lib/tomcat-util.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.5.17/lib/servlets-invoker.jar
-/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.5.17/lib/commons-digester.jar
-/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat_5.5.17/lib/jasper-runtime.jar
-/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat_5.5.17/lib/servlets-default.jar
-/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat_5.5.17/lib/naming-factory.jar
-/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat_5.5.17/lib/catalina.jar
-/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat_5.5.17/lib/catalina-optional.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-impl.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/lib/mx4j-jmx.jar
-/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat_5.5.17/lib/naming-resources.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat_5.5.17/lib/jasper-compiler.jar
-/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat_5.5.17/lib/jsp-api.jar
-/usr/share/java/commons-el.jar org.eclipse.tomcat_5.5.17/lib/commons-el.jar
-/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar
-/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar
-/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar
-/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar
-/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar
-/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar
-/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar
-/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar
-/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar
-/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar
-/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar
-/usr/share/ant/lib/ant-junit.jar org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar
-/usr/share/ant/lib/ant.jar org.apache.ant_1.7.0.v200706080842/lib/ant.jar
-/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar
-/usr/share/ant/lib/ant-launcher.jar org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar
-/usr/share/ant/lib/ant-jmf.jar org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar
-/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar
-/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar
-/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar
-/usr/share/java/lucene-1.4.3.jar org.apache.lucene_1.4.3/lucene-1.4.103.v20060601.jar
-/usr/share/java/junit.jar org.junit_3.8.1/junit.jar
+/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-log4j.jar
+/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-resolver.jar
+/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.7.0.v200803061910/lib/ant-commons-logging.jar
+/usr/share/ant/lib/ant-nodeps.jar org.apache.ant_1.7.0.v200803061910/lib/ant-nodeps.jar
+/usr/share/ant/lib/ant-javamail.jar org.apache.ant_1.7.0.v200803061910/lib/ant-javamail.jar
+/usr/share/ant/lib/ant-jsch.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jsch.jar
+/usr/share/ant/lib/ant-apache-bsf.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-bsf.jar
+/usr/share/ant/lib/ant-apache-regexp.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-regexp.jar
+/usr/share/ant/lib/ant-apache-oro.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-oro.jar
+/usr/share/ant/lib/ant-antlr.jar org.apache.ant_1.7.0.v200803061910/lib/ant-antlr.jar
+/usr/share/ant/lib/ant-jdepend.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jdepend.jar
+/usr/share/ant/lib/ant-junit.jar org.apache.ant_1.7.0.v200803061910/lib/ant-junit.jar
+/usr/share/ant/lib/ant.jar org.apache.ant_1.7.0.v200803061910/lib/ant.jar
+/usr/share/ant/lib/ant-apache-bcel.jar org.apache.ant_1.7.0.v200803061910/lib/ant-apache-bcel.jar
+/usr/share/ant/lib/ant-launcher.jar org.apache.ant_1.7.0.v200803061910/lib/ant-launcher.jar
+/usr/share/ant/lib/ant-jmf.jar org.apache.ant_1.7.0.v200803061910/lib/ant-jmf.jar
+/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.7.0.v200803061910/lib/ant-commons-net.jar
+/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.7.0.v200803061910/lib/ant-trax.jar
+/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.7.0.v200803061910/lib/ant-swing.jar
+/usr/share/java/junit.jar org.junit_3.8.2.v20080602-1318/junit.jar
/usr/share/java/junit4.jar org.junit4/junit.jar
-/usr/share/java/icu4j.jar com.ibm.icu_3.6.1.v20070906.jar
-/usr/share/java/servlet-api-2.4.jar javax.servlet_2.4.0.v200706111738.jar
-/usr/share/java/jetty.jar org.mortbay.jetty_5.1.11.v200706111724.jar
-/usr/share/java/lucene-core.jar org.apache.lucene_1.9.1.v200706111724.jar
-/usr/share/java/lucene-analyzers.jar org.apache.lucene.analyzers_1.9.1.v200706111724.jar
-/usr/share/java/lucene-analyzers.jar org.apache.lucene.analysis_1.9.1.v200706181610.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.apache.jasper_5.5.17.v200706111724.jar
-/usr/share/java/jsch.jar com.jcraft.jsch_0.1.31.jar
-/usr/share/java/commons-logging.jar org.apache.commons.logging_1.0.4.v200706111724.jar
-/usr/share/java/commons-el.jar org.apache.commons.el_1.0.0.v200706111724.jar
-/usr/share/java/jsp-api.jar javax.servlet.jsp_2.0.0.v200706191603.jar
Deleted: trunk/eclipse/debian/libswt3.3-gtk-gcj.install
===================================================================
--- trunk/eclipse/debian/libswt3.3-gtk-gcj.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/libswt3.3-gtk-gcj.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1 +0,0 @@
-/usr/lib/gcj/eclipse/org.eclipse.swt.gtk.linux.*_*.jar.??
Deleted: trunk/eclipse/debian/libswt3.3-gtk-java.install
===================================================================
--- trunk/eclipse/debian/libswt3.3-gtk-java.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/libswt3.3-gtk-java.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/java/*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt.gtk*
Deleted: trunk/eclipse/debian/libswt3.3-gtk-jni.dirs
===================================================================
--- trunk/eclipse/debian/libswt3.3-gtk-jni.dirs 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/libswt3.3-gtk-jni.dirs 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1 +0,0 @@
-usr/lib/jni
Deleted: trunk/eclipse/debian/libswt3.3-gtk-jni.install
===================================================================
--- trunk/eclipse/debian/libswt3.3-gtk-jni.install 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/libswt3.3-gtk-jni.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,8 +0,0 @@
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-gnome-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-awt-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-atk-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-pi-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-cairo-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-mozilla-gtk-*.so usr/lib/jni
-source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-glx-gtk-*.so usr/lib/jni
Added: trunk/eclipse/debian/libswt3.4-gtk-java.install
===================================================================
--- trunk/eclipse/debian/libswt3.4-gtk-java.install (rev 0)
+++ trunk/eclipse/debian/libswt3.4-gtk-java.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/java/*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt.gtk*
Added: trunk/eclipse/debian/libswt3.4-gtk-jni.dirs
===================================================================
--- trunk/eclipse/debian/libswt3.4-gtk-jni.dirs (rev 0)
+++ trunk/eclipse/debian/libswt3.4-gtk-jni.dirs 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1 @@
+usr/lib/jni
Added: trunk/eclipse/debian/libswt3.4-gtk-jni.install
===================================================================
--- trunk/eclipse/debian/libswt3.4-gtk-jni.install (rev 0)
+++ trunk/eclipse/debian/libswt3.4-gtk-jni.install 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,8 @@
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-gnome-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-awt-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-atk-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-pi-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-cairo-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-mozilla-gtk-*.so usr/lib/jni
+source-tree/plugins/org.eclipse.swt.gtk.linux.*/libswt-glx-gtk-*.so usr/lib/jni
Modified: trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -21,30 +21,6 @@
exit 0
@DPATCH@
---- source-tree/features/org.eclipse.rcp.source/feature.xml.old 2007-02-12 19:45:20.000000000 +0100
-+++ source-tree/features/org.eclipse.rcp.source/feature.xml 2007-03-29 14:13:43.000000000 +0200
-@@ -28,4 +28,9 @@
- <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
- <plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
- <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="hppa" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
- </feature>
---- source-tree/features/org.eclipse.platform.source/feature.xml.old 2007-02-12 19:45:20.000000000 +0100
-+++ source-tree/features/org.eclipse.platform.source/feature.xml 2007-03-29 14:14:58.000000000 +0200
-@@ -28,4 +28,9 @@
- <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+ <plugin ws="gtk" os="linux" fragment="true" arch="hppa" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- </feature>
--- source-tree/features/org.eclipse.rcp/feature.xml.old 2007-02-12 19:46:52.000000000 +0100
+++ source-tree/features/org.eclipse.rcp/feature.xml 2007-03-29 14:09:50.000000000 +0200
@@ -308,5 +308,71 @@
@@ -159,18 +135,18 @@
static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
---- source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java.old 2007-02-12 19:46:35.000000000 +0100
-+++ source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2007-03-29 14:09:50.000000000 +0200
-@@ -119,6 +119,12 @@
+--- source-tree/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig 2008-05-21 11:05:52.000000000 -0400
++++ source-tree/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2008-05-21 11:04:41.000000000 -0400
+@@ -130,6 +130,12 @@
+ * @since 3.1
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
-
++
+ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
+ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
+ public static final String ARCH_HPPA = "hppa";//$NON-NLS-1$
-+
+
/**
* Constant string (value "win32") indicating the platform is running on a
- * machine using the Windows windowing system.
Deleted: trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,884 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific patch, converted from eclipse-disable-junit4-apt.patch
-
-[ -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/assemble.org.eclipse.sdk.linux.gtk.ia64.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-02-29 21:04:10.000000000 +0100
-@@ -95,9 +95,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -185,9 +182,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.linux.gtk.ia64" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -266,9 +260,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -290,9 +281,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -383,9 +371,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -524,10 +509,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -632,10 +613,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -712,10 +689,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -744,10 +717,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -860,10 +829,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2008-02-29 21:04:13.000000000 +0100
-@@ -95,9 +95,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -185,9 +182,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -263,9 +257,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -287,9 +278,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -380,9 +368,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -515,10 +500,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -623,10 +604,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -699,10 +676,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -731,10 +704,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -847,10 +816,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2008-02-29 21:04:21.000000000 +0100
-@@ -98,9 +98,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -194,9 +191,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ppc" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -275,9 +269,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -299,9 +290,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -392,9 +380,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -534,10 +519,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -642,10 +623,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -722,10 +699,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -754,10 +727,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -870,10 +839,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.s390.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2008-02-29 21:04:23.000000000 +0100
-@@ -101,9 +101,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -188,9 +185,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -269,9 +263,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -293,9 +284,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -386,9 +374,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -531,10 +516,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -639,10 +620,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -715,10 +692,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -747,10 +720,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -863,10 +832,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2008-02-29 21:04:26.000000000 +0100
-@@ -95,9 +95,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -188,9 +185,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -266,9 +260,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -290,9 +281,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.rcp.source.linux.gtk.s390x" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -389,9 +377,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -527,10 +512,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -639,10 +620,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -715,10 +692,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -747,10 +720,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -863,10 +832,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2008-02-29 21:04:34.000000000 +0100
-@@ -98,9 +98,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -185,9 +182,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -272,9 +266,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -296,9 +287,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -389,9 +377,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.x86_64" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -530,10 +515,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -638,10 +619,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -718,10 +695,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -750,10 +723,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -866,10 +835,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig 2008-02-29 20:56:54.000000000 +0100
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2008-02-29 21:04:37.000000000 +0100
-@@ -101,9 +101,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -191,9 +188,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -272,9 +266,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -299,9 +290,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -392,9 +380,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -534,10 +519,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
- </antcall>
- <antcall target="jarUp">
-@@ -642,10 +623,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
- </antcall>
- <antcall target="jarUp">
-@@ -718,10 +695,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
- </antcall>
- <antcall target="jarUp">
-@@ -754,10 +727,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
- </antcall>
- <antcall target="jarUp">
-@@ -870,10 +839,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt.orig 2008-02-29 21:05:52.000000000 +0100
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2008-02-29 21:06:10.000000000 +0100
-@@ -22,12 +22,10 @@
- ;../org.eclipse.jdt.ui/ui refactoring
- ;../org.eclipse.jdt.ui/core extension
- ;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.jdt.apt.core/src"
-+;../org.eclipse.jdt.core.manipulation/common"
- -d reference/api
- -classpath @rt@
- ;../com.ibm.icu_3.6.1.v20070906.jar
--;../org.eclipse.jdt.apt.core/mirrorapi.jar
- ;../org.apache.ant_1.7.0.v200706080842/lib/ant.jar
- ;../org.eclipse.compare/@dot
- ;../org.eclipse.core.commands/@dot
---- source-tree/features/org.eclipse.jdt/feature.xml.orig 2008-02-29 21:07:42.000000000 +0100
-+++ source-tree/features/org.eclipse.jdt/feature.xml 2008-02-29 21:08:30.000000000 +0100
-@@ -38,43 +38,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jdt.apt.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.apt.ui"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.apt.pluggable.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.compiler.apt"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- fragment="true"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.compiler.tool"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- fragment="true"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jdt.core"
- download-size="0"
- install-size="0"
---- source-tree/features/org.eclipse.jdt/build.xml.orig 2008-02-29 21:07:55.000000000 +0100
-+++ source-tree/features/org.eclipse.jdt/build.xml 2008-02-29 21:10:50.000000000 +0100
-@@ -32,26 +32,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" 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.jdt.compiler.apt" 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.jdt.apt.core" 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.jdt.apt.pluggable.core" 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.jdt.debug" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -92,11 +72,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" 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.ant.ui" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -166,7 +141,7 @@
- <include name="license.html"/>
- </fileset>
- </copy>
-- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL/feature.xml" selfVersion="3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL" featureIds="" pluginIds="org.eclipse.jdt:0.0.0,3.3.0.v20070607-1300,org.eclipse.ant.ui:0.0.0,3.2.200.v20070825_r331,org.eclipse.jdt.apt.core:0.0.0,3.3.1.R33x_v20070831-0435,org.eclipse.jdt.apt.ui:0.0.0,3.3.1.R33x_v20070801-1930,org.eclipse.jdt.apt.pluggable.core:0.0.0,1.0.1.R33x_v20070831-0435,org.eclipse.jdt.compiler.apt:0.0.0,1.0.1.R33x_v20070831-0435,org.eclipse.jdt.compiler.tool:0.0.0,1.0.1.v_780_R33x,org.eclipse.jdt.core:0.0.0,3.3.1.v_780_R33x,org.eclipse.jdt.core.manipulation:0.0.0,1.1.0.v20070606-0010,org.eclipse.jdt.debug.ui:0.0.0,3.2.101.v20070718_r331,org.eclipse.jdt.debug:0.0.0,3.3.1.v20070719_r331,org.eclipse.jdt.junit:0.0.0,3.3.1.r331_v20070829,org.eclipse.jdt.junit.runtime:0.0.0,3.3.0.v20070606-0010,org.eclipse.jdt.junit4.runtime:0.0.0,1.0.100.v20070606-0010,org.eclipse.jdt.launching:0.0.0,3.3.1.v20070808_r331,org.eclipse.jdt.ui:0.0.0,3.3.1.r331_v20070906,org.junit:0.0.0,3.8.2.v200706111738,org.junit4:0.0.0,4.3.1,org.eclipse.jdt.doc.user:0.0.0,3.3.1.r331_v20070912a,org.eclipse.jdt.launching.macosx:0.0.0,3.1.100.v20061211,"/>
-+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL/feature.xml" selfVersion="3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL" featureIds="" pluginIds="org.eclipse.jdt:0.0.0,3.3.0.v20070607-1300,org.eclipse.ant.ui:0.0.0,3.2.200.v20070825_r331,org.eclipse.jdt.core:0.0.0,3.3.1.v_780_R33x,org.eclipse.jdt.core.manipulation:0.0.0,1.1.0.v20070606-0010,org.eclipse.jdt.debug.ui:0.0.0,3.2.101.v20070718_r331,org.eclipse.jdt.debug:0.0.0,3.3.1.v20070719_r331,org.eclipse.jdt.junit:0.0.0,3.3.1.r331_v20070829,org.eclipse.jdt.junit.runtime:0.0.0,3.3.0.v20070606-0010,org.eclipse.jdt.junit4.runtime:0.0.0,1.0.100.v20070606-0010,org.eclipse.jdt.launching:0.0.0,3.3.1.v20070808_r331,org.eclipse.jdt.ui:0.0.0,3.3.1.r331_v20070906,org.junit:0.0.0,3.8.2.v200706111738,org.junit4:0.0.0,4.3.1,org.eclipse.jdt.doc.user:0.0.0,3.3.1.r331_v20070912a,org.eclipse.jdt.launching.macosx:0.0.0,3.1.100.v20061211,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFileswin32_win32_x86">
Modified: trunk/eclipse/debian/patches/eclipse-disable-buildHelpIndex.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-buildHelpIndex.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-disable-buildHelpIndex.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -21,19 +21,6 @@
exit 0
@DPATCH@
-diff -r -u source-tree.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- source-tree.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-09-02 12:29:49.000000000 +0200
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-09-02 12:36:26.000000000 +0200
-@@ -15,7 +15,9 @@
-
-
- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
-+ <!--
- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
-+ -->
- </target>
-
- <target name="convertSchemaToHtml" if="eclipse.running">
diff -r -u source-tree.orig/plugins/org.eclipse.jdt.doc.user/build.xml source-tree/plugins/org.eclipse.jdt.doc.user/build.xml
--- source-tree.orig/plugins/org.eclipse.jdt.doc.user/build.xml 2005-09-02 12:29:49.000000000 +0200
+++ source-tree/plugins/org.eclipse.jdt.doc.user/build.xml 2005-09-02 12:36:06.000000000 +0200
@@ -73,16 +60,34 @@
</target>
<target name="convertSchemaToHtml" if="eclipse.running">
-diff -r -u source-tree.orig/plugins/org.eclipse.platform.doc.user/build.xml source-tree/plugins/org.eclipse.platform.doc.user/build.xml
---- source-tree.orig/plugins/org.eclipse.platform.doc.user/build.xml 2005-09-02 12:29:43.000000000 +0200
-+++ source-tree/plugins/org.eclipse.platform.doc.user/build.xml 2005-09-02 12:35:46.000000000 +0200
-@@ -54,7 +54,9 @@
+--- ../eclipse/upstream/expanded/plugins/org.eclipse.platform.doc.user/customBuildCallbacks.xml 2008-06-17 20:49:14.000000000 -0400
++++ source-tree/plugins/org.eclipse.platform.doc.user/customBuildCallbacks.xml 2008-07-02 11:57:46.000000000 -0400
+@@ -94,7 +94,9 @@
</target>
-
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.platform.doc.user." if="eclipse.running">
+
+ <target name="build.index" description="Builds search index for the plug-in: org.eclipse.platform.doc.user." if="eclipse.running">
++ <!--
+ <help.buildHelpIndex manifest="plugin.xml" destination="."/>
++ -->
+ </target>
+
+ <!-- ===================================================================== -->
+--- ../eclipse/upstream/expanded/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2008-06-17 20:49:13.000000000 -0400
++++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2008-07-02 12:05:59.000000000 -0400
+@@ -15,7 +15,9 @@
+
+
+ <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
+ <!--
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
+ <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+ -->
</target>
- <target name="build.sources" depends="init">
+ <target name="convertSchemaToHtml" if="eclipse.running">
+@@ -116,4 +118,4 @@
+ />
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
Modified: trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -20,11 +20,9 @@
esac
exit 0
- at DPATCH@
-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 2006-10-28 11:34:46.000000000 +0200
-+++ source-tree/features/org.eclipse.platform/build.xml 2006-10-28 12:36:05.000000000 +0200
-@@ -17,11 +17,6 @@
+ at DPATCH@--- source-tree/features/org.eclipse.platform/build.xml.orig 2008-05-20 22:25:46.000000000 -0400
++++ source-tree/features/org.eclipse.platform/build.xml 2008-05-20 22:25:49.000000000 -0400
+@@ -137,11 +137,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -36,226 +34,139 @@
<ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.linux" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="linux"/>
-@@ -122,11 +117,6 @@
- <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.ui.forms" target="${target}">
+@@ -251,12 +246,7 @@
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -192,11 +182,6 @@
- <property name="os" value="win32"/>
<property name="ws" value="win32"/>
- </ant>
+- </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.ui.navigator.resources" target="${target}">
++ </ant>
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ltk.core.refactoring" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-Nur in source-tree/features/org.eclipse.platform: build.xml.orig.
-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 2006-10-28 11:34:46.000000000 +0200
-+++ source-tree/features/org.eclipse.platform.source/build.xml 2006-10-28 12:39:49.000000000 +0200
-@@ -12,26 +12,11 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
+--- source-tree/features/org.eclipse.rcp/build.xml.orig 2008-05-20 22:28:21.000000000 -0400
++++ source-tree/features/org.eclipse.rcp/build.xml 2008-05-20 22:29:14.000000000 -0400
+@@ -117,31 +117,6 @@
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}">
- <property name="arch" value="x86"/>
-- <property name="os" value="linux"/>
-- <property name="ws" value="motif"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="wpf"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.win32.win32.x86" target="${target}">
-- <property name="arch" value="x86"/>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86_64" target="${target}">
+- <property name="arch" value="x86_64"/>
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.x86" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="linux"/>
- <property name="ws" value="gtk"/>
- </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 antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.ia64" target="${target}">
+- <property name="arch" value="ia64"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
- </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"/>
-@@ -42,31 +27,16 @@
- <property name="os" value="linux"/>
- <property name="ws" value="gtk"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}">
-- <property name="arch" value="PA_RISC"/>
+- <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.platform.source.linux.gtk.ppc" 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.swt.gtk.linux.ppc" target="${target}">
<property name="arch" value="ppc"/>
<property name="os" value="linux"/>
+@@ -157,11 +132,6 @@
+ <property name="os" value="solaris"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.qnx.photon.x86" target="${target}">
+- <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.platform.source.linux.gtk.ia64" target="${target}">
- <property name="arch" value="ia64"/>
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}">
+ <property name="arch" value="s390x"/>
<property name="os" value="linux"/>
- <property name="ws" value="gtk"/>
- </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.doc.isv" target="${target}">
- <property name="arch" value="x86"/>
+--- source-tree/features/org.eclipse.rcp.source/build.xml.orig 2008-05-20 22:30:02.000000000 -0400
++++ source-tree/features/org.eclipse.rcp.source/build.xml 2008-05-20 22:27:45.000000000 -0400
+@@ -42,46 +42,11 @@
<property name="os" value="win32"/>
-Nur in source-tree/features/org.eclipse.platform.source: build.xml.orig.
-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 2006-10-28 11:34:46.000000000 +0200
-+++ source-tree/features/org.eclipse.rcp/build.xml 2006-10-28 12:45:04.000000000 +0200
-@@ -17,41 +17,11 @@
- <property name="os" value="win32"/>
<property name="ws" value="win32"/>
</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.photon.qnx.x86" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86.source" 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.solaris.sparc" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc.source" 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.gtk.linux.ia64" target="${target}">
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64.source" 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.motif.linux.x86" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86.source" 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.motif.hpux.PA_RISC" target="${target}">
-- <property name="arch" value="PA_RISC"/>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32.source" 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.motif.aix.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="aix"/>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC.source" 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.carbon.macosx" target="${target}">
- <property name="arch" value="ppc"/>
- <property name="os" value="macosx"/>
-@@ -157,11 +127,6 @@
- <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.gtk.linux.x86_64" target="${target}">
- <property name="arch" value="x86_64"/>
- <property name="os" value="linux"/>
-Nur in source-tree/features/org.eclipse.rcp: build.xml.orig.
-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 2006-10-28 11:34:46.000000000 +0200
-+++ source-tree/features/org.eclipse.rcp.source/build.xml 2006-10-28 12:49:32.000000000 +0200
-@@ -12,41 +12,11 @@
- <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.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.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.aix.motif.ppc" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc.source" 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.linux.gtk.x86" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="linux"/>
- <property name="ws" value="gtk"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx.source" 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.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.gtk.x86" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="solaris"/>
-@@ -57,31 +27,16 @@
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64.source" 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.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>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ppc" target="${target}">
- <property name="arch" value="ppc"/>
+@@ -117,26 +82,6 @@
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.qnx.photon.x86" target="${target}">
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.ia64.source" target="${target}">
+- <property name="arch" value="ia64"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86.source" target="${target}">
- <property name="arch" value="x86"/>
-- <property name="os" value="qnx"/>
-- <property name="ws" value="photon"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="wpf"/>
- </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"/>
- <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 antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86_64.source" target="${target}">
+- <property name="arch" value="x86_64"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
- </ant>
- </target>
- <target name="all.features" depends="init">
- </target>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86.source" 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.equinox.simpleconfigurator.source" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
Added: trunk/eclipse/debian/patches/eclipse-disabledocindexes.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disabledocindexes.dpatch (rev 0)
+++ trunk/eclipse/debian/patches/eclipse-disabledocindexes.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,11 @@
+--- upstream/expanded/build.xml 2008-06-25 15:04:10.000000000 -0400
++++ source-tree/build.xml 2008-07-02 11:38:25.000000000 -0400
+@@ -106,7 +106,7 @@
+ and help indeces.-->
+ <property name="index.present" value="true" />
+ </ant>
+- <antcall target="build.doc.plugins" />
++ <!-- <antcall target="build.doc.plugins" /> -->
+ <echo message="Done." />
+ </target>
+
Modified: trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -21,13 +21,9 @@
exit 0
@DPATCH@
-Index: source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
-===================================================================
-RCS file: source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
-diff -N source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,495 @@
+--- /dev/null 2008-04-22 14:04:15.000000000 -0400
++++ source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 2008-05-21 13:59:30.000000000 -0400
+@@ -0,0 +1,481 @@
+/**
+ *
+ */
@@ -56,6 +52,7 @@
+import org.eclipse.jdt.core.compiler.InvalidInputException;
+import org.eclipse.jdt.internal.compiler.ClassFile;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
++import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
+import org.eclipse.jdt.internal.compiler.env.AccessRule;
+import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
@@ -200,20 +197,8 @@
+ private void addPath(ArrayList result, String currentClasspathName) {
+ String customEncoding = null;
+ AccessRule[] accessRules = new AccessRule[0];
-+ String templates[] = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH];
-+ templates[0] = this.bind(
-+ "template.restrictedAccess.type", //$NON-NLS-1$
-+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
-+ templates[1] = this.bind(
-+ "template.restrictedAccess.constructor", //$NON-NLS-1$
-+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
-+ templates[2] = this.bind(
-+ "template.restrictedAccess.method", //$NON-NLS-1$
-+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
-+ templates[3] = this.bind(
-+ "template.restrictedAccess.field", //$NON-NLS-1$
-+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
-+ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, templates);
++
++ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName);
+ FileSystem.Classpath currentClasspath = FileSystem
+ .getClasspath(currentClasspathName,
+ customEncoding, accessRuleSet);
@@ -229,8 +214,8 @@
+ }
+ }
+
-+ protected void handleWarningToken(String token, boolean isEnabling,
-+ boolean useEnableJavadoc) throws InvalidInputException {
++ protected void handleWarningToken(String token, boolean isEnabling)
++ throws InvalidInputException {
+ // Recognize this for compatibility with older versions of gcj.
+ if ("deprecated".equals(token)) //$NON-NLS-1$
+ token = "deprecation"; //$NON-NLS-1$
@@ -258,7 +243,7 @@
+ }
+ token = newToken.toString();
+ }
-+ super.handleWarningToken(token, isEnabling, useEnableJavadoc);
++ super.handleWarningToken(token, isEnabling);
+ }
+
+ private void turnWarningsToErrors() {
@@ -317,24 +302,24 @@
+ // A somewhat arbitrary list. We use the GCC names
+ // here, and the local handleWarningToken translates
+ // for us.
-+ handleWarningToken("constructor-name", enable, false);
-+ handleWarningToken("pkg-default-method", enable, false);
-+ handleWarningToken("masked-catch-block", enable, false);
-+ handleWarningToken("all-deprecation", enable, false);
-+ handleWarningToken("unused-local", enable, false);
-+ handleWarningToken("unused-label", enable, false);
-+ handleWarningToken("static-receiver", enable, false);
-+ handleWarningToken("indirect-static", enable, false);
-+ handleWarningToken("no-effect-assign", enable, false);
-+ handleWarningToken("char-concat", enable, false);
-+ handleWarningToken("useless-type-check", enable, false);
-+ handleWarningToken("final-bound", enable, false);
-+ handleWarningToken("assert-identifier", enable, false);
-+ handleWarningToken("enum-identifier", enable, false);
-+ handleWarningToken("finally", enable, false);
-+ handleWarningToken("varargs-cast", enable, false);
-+ handleWarningToken("unused", enable, false);
-+ handleWarningToken("forbidden", enable, false);
++ handleWarningToken("constructor-name", enable);
++ handleWarningToken("pkg-default-method", enable);
++ handleWarningToken("masked-catch-block", enable);
++ handleWarningToken("all-deprecation", enable);
++ handleWarningToken("unused-local", enable);
++ handleWarningToken("unused-label", enable);
++ handleWarningToken("static-receiver", enable);
++ handleWarningToken("indirect-static", enable);
++ handleWarningToken("no-effect-assign", enable);
++ handleWarningToken("char-concat", enable);
++ handleWarningToken("useless-type-check", enable);
++ handleWarningToken("final-bound", enable);
++ handleWarningToken("assert-identifier", enable);
++ handleWarningToken("enum-identifier", enable);
++ handleWarningToken("finally", enable);
++ handleWarningToken("varargs-cast", enable);
++ handleWarningToken("unused", enable);
++ handleWarningToken("forbidden", enable);
+ }
+
+ public void configure(String[] argv) throws InvalidInputException {
@@ -374,7 +359,6 @@
+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ }
+ this.destinationPath = arg;
-+ // this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
@@ -406,9 +390,9 @@
+ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
+ handleWall(false);
+ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
-+ handleWarningToken(currentArg.substring(5), false, false);
++ handleWarningToken(currentArg.substring(5), false);
+ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
-+ handleWarningToken(currentArg.substring(2), true, false);
++ handleWarningToken(currentArg.substring(2), true);
+ } else if (currentArg.equals("-w")) { //$NON-NLS-1$
+ inhibitAllWarnings = true;
+ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
@@ -497,8 +481,6 @@
+ this.logger.logCommandLineArguments(argv);
+ this.logger.logOptions(this.options);
+ this.logger.logClasspath(this.checkedClasspaths);
-+
-+ this.repetitions = 1;
+ }
+
+ public boolean compile(String[] argv) {
@@ -523,3 +505,19 @@
+ System.exit(result ? 0 : 1);
+ }
+}
+--- source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties.orig 2008-05-21 12:47:50.000000000 -0400
++++ source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 2008-05-21 12:46:40.000000000 -0400
+@@ -37,6 +37,12 @@
+ compile.oneClassFileGenerated = [1 .class file generated]
+ compile.severalClassFilesGenerated = [{0} .class files generated]
+
++# GCCMain messages.
++gcc.zipArg=-fzip-target requires argument
++gcc.zipDepArg=-fzip-dependency requires argument
++gcc.noClasspath=no classpath specified
++
++
+ ### configure
+ configure.requiresJDK1.2orAbove = Need to use a JVM >= 1.2
+ configure.duplicateLog = duplicate log specification: {0}
+
\ No newline at end of file
Modified: trunk/eclipse/debian/patches/eclipse-fileinitializer.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-fileinitializer.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-fileinitializer.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -40,23 +40,6 @@
+ </initializer>
+ </extension>
</plugin>
---- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java.orig 2006-01-11 19:20:41.000000000 +0000
-+++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2006-01-11 19:22:12.000000000 +0000
-@@ -39,6 +39,14 @@
- public static String meta_unableToReadAuthorization;
- public static String meta_unableToWriteAuthorization;
-
-+ // initializer
-+ public static String initializer_error;
-+
-+ // file initializer
-+ public static String fileInitializer_fileNotFound;
-+ public static String fileInitializer_IOError;
-+ public static String fileInitializer_missingFileName;
-+
- // parsing/resolve
- public static String plugin_deactivatedLoad;
-
--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2006-01-11 19:28:23.000000000 +0000
+++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2006-01-11 19:30:05.000000000 +0000
@@ -86,6 +86,15 @@
@@ -436,3 +419,21 @@
+ }
+
+}
+--- upstream/expanded/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2008-05-22 14:48:08.000000000 -0400
++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2008-05-23 23:24:44.000000000 -0400
+@@ -26,6 +26,15 @@
+ // metadata
+ public static String meta_appNotInit;
+ public static String meta_exceptionParsingLog;
++
++// initializer
++ public static String initializer_error;
++
++ // file initializer
++ public static String fileInitializer_fileNotFound;
++ public static String fileInitializer_IOError;
++ public static String fileInitializer_missingFileName;
++
+ // parsing/resolve
+ public static String plugin_deactivatedLoad;
+
Modified: trunk/eclipse/debian/patches/eclipse-gnuformatterjdt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-gnuformatterjdt.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-gnuformatterjdt.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -65,13 +65,11 @@
public static DefaultCodeFormatterOptions getJavaConventionsSettings() {
DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions();
options.setJavaConventionsSettings();
-@@ -2036,6 +2042,190 @@
+@@ -2036,6 +2042,188 @@
this.tab_size = 4;
}
+ public void setGNUDefaultSettings() {
-+ this.comment_clear_blank_lines = true;
-+ this.comment_format = true;
+ this.comment_format_header = false;
+ this.comment_format_html = true;
+ this.comment_format_source = true;
Added: trunk/eclipse/debian/patches/eclipse-ini-more-memory.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-ini-more-memory.dpatch (rev 0)
+++ trunk/eclipse/debian/patches/eclipse-ini-more-memory.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,31 @@
+#! /bin/sh -e
+##
+## DP: Increases the default size of the Java heap
+
+[ -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@
+--- upstream/expanded/features/org.eclipse.platform/gtk/eclipse.ini 2008-06-17 20:52:18.000000000 -0400
++++ source-tree/features/org.eclipse.platform/gtk/eclipse.ini 2008-06-26 12:31:20.000000000 -0400
+@@ -4,4 +4,4 @@
+ 256m
+ -vmargs
+ -Xms40m
+--Xmx256m
++-Xmx512m
Property changes on: trunk/eclipse/debian/patches/eclipse-ini-more-memory.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/eclipse/debian/patches/eclipse-java-home.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-java-home.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-java-home.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -28,7 +28,7 @@
#Set this to be the location of your JRE
-JAVA_HOME = ~/vm/sun142
-+JAVA_HOME ?= /usr/lib/jvm/java-gcj
++JAVA_HOME ?= /usr/lib/jvm/java-6-openjdk
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
COMMON_INCLUDE = -I include
@@ -39,7 +39,7 @@
defaultWS="gtk"
defaultJava=DEFAULT_JAVA_JNI
-javaHome=""
-+javaHome="/usr/lib/jvm/java-gcj"
++javaHome="/usr/lib/jvm/java-6-openjdk"
makefile=""
if [ "$OS" = "" ]; then
OS=`uname -s`
Deleted: trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific patch, converted from eclipse-jsch.patch
-
-[ -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.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java.orig 2008-02-29 13:21:18.000000000 +0100
-+++ source-tree/plugins/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java 2008-02-29 13:23:01.000000000 +0100
-@@ -886,7 +886,11 @@
- channel.connect();
- ChannelSftp c=(ChannelSftp)channel;
-
-- /* String pwd= */c.pwd(); // Read off the channel
-+ try{ /* String pwd=*/ c.pwd(); } // Read off the channel
-+ catch(SftpException ee){
-+ setErrorMessage(ee.getMessage());
-+ return;
-+ }
- SftpATTRS attr=null;
-
- try{
Modified: trunk/eclipse/debian/patches/eclipse-jsch.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-jsch.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -21,46 +21,47 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.eclipse.team.cvs.core/build.xml.orig 2006-08-02 16:35:47.000000000 +0000
-+++ source-tree/plugins/org.eclipse.team.cvs.core/build.xml 2006-08-02 16:36:24.000000000 +0000
-@@ -116,7 +116,7 @@
- <pathelement path="../org.eclipse.core.filesystem.win32.x86/@dot"/>
- <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.win32.x86/@dot"/>
+--- source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF.orig 2008-05-20 16:02:58.000000000 -0400
++++ source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF 2008-05-20 16:21:55.000000000 -0400
+@@ -20,7 +20,7 @@
+ org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
+- com.jcraft.jsch;bundle-version="[0.1.27,2.0.0)",
++ com.jcraft.jsch;bundle-version="[0.1.37,2.0.0)",
+ org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
+--- source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF.orig 2008-05-20 16:02:58.000000000 -0400
++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF 2008-05-20 16:23:36.000000000 -0400
+@@ -11,7 +11,7 @@
+ org.eclipse.team.cvs.core;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.team.cvs.ssh;bundle-version="[3.2.0,4.0.0)",
+- com.jcraft.jsch;bundle-version="[0.1.27,2.0.0)",
++ com.jcraft.jsch;bundle-version="[0.1.37,2.0.0)",
+ org.eclipse.jsch.core;bundle-version="[1.1.0,2.0.0)"
+ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4
+--- upstream/expanded/plugins/org.eclipse.team.cvs.core/build.xml 2008-05-22 17:45:12.000000000 -0400
++++ source-tree/plugins/org.eclipse.team.cvs.core/build.xml 2008-05-22 18:02:47.000000000 -0400
+@@ -163,7 +163,7 @@
+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20071126/@dot"/>
<pathelement path="${build.result.folder}/../org.eclipse.team.core/@dot"/>
-- <pathelement path="../../baseLocation/plugins/com.jcraft.jsch_0.1.28.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.team.core_3.4.0.I20080521/@dot"/>
+- <pathelement path="../com.jcraft.jsch_0.1.37.v200803061811.jar"/>
+ <pathelement path="/usr/share/java/jsch.jar"/>
- </path>
- <!-- compile the source code -->
- <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
---- source-tree/plugins/org.eclipse.team.cvs.ssh2/build.xml.orig 2006-08-02 17:10:53.000000000 +0000
-+++ source-tree/plugins/org.eclipse.team.cvs.ssh2/build.xml 2006-08-02 17:12:48.000000000 +0000
-@@ -118,7 +118,7 @@
- <pathelement path="${build.result.folder}/../org.eclipse.team.cvs.core/@dot"/>
- <pathelement path="../../baseLocation/plugins/com.ibm.icu.base_3.4.4.1.jar"/>
+ <pathelement path="../org.eclipse.jsch.core/bin/"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jsch.core_1.1.100.I20080415/bin/"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jsch.core/@dot"/>
+--- upstream/expanded/plugins/org.eclipse.team.cvs.ssh2/build.xml 2008-05-22 17:45:12.000000000 -0400
++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/build.xml 2008-05-22 18:08:03.000000000 -0400
+@@ -165,7 +165,7 @@
+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20071126/@dot"/>
<pathelement path="${build.result.folder}/../org.eclipse.team.core/@dot"/>
-- <pathelement path="../../baseLocation/plugins/com.jcraft.jsch_0.1.28.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.team.core_3.4.0.I20080521/@dot"/>
+- <pathelement path="../com.jcraft.jsch_0.1.37.v200803061811.jar"/>
+ <pathelement path="/usr/share/java/jsch.jar"/>
- <pathelement path="../org.eclipse.swt/@dot"/>
- <pathelement path="${build.result.folder}/../org.eclipse.swt/@dot"/>
- <pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
---- source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF.orig 2006-10-04 14:57:52.000000000 +0000
-+++ source-tree/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF 2006-10-04 14:58:03.000000000 +0000
-@@ -20,7 +20,7 @@
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.team.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
-- com.jcraft.jsch;bundle-version="[0.1.27,2.0.0)"
-+ com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)"
- Eclipse-LazyStart: true
- Import-Package: com.ibm.icu.text,
- com.ibm.icu.util
---- source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF.orig 2006-10-04 12:31:47.000000000 +0000
-+++ source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF 2006-10-04 12:32:04.000000000 +0000
-@@ -15,6 +15,6 @@
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.team.cvs.ssh;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.team.ui;bundle-version="[3.2.0,4.0.0)",
-- com.jcraft.jsch;bundle-version="[0.1.18,2.0.0)"
-+ com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)"
- Eclipse-LazyStart: true
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+ <pathelement path="../org.eclipse.jsch.core/bin/"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jsch.core_1.1.100.I20080415/bin/"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jsch.core/@dot"/>
\ No newline at end of file
Deleted: trunk/eclipse/debian/patches/eclipse-libswt-xpcomgcc4.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-xpcomgcc4.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-libswt-xpcomgcc4.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,124 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Fix swt mozilla build.
-
-[ -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.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig 2006-09-21 16:57:23.000000000 +0200
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2006-10-09 18:10:42.081686750 +0200
-@@ -141,7 +141,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, PR_1Malloc_FUNC);
-- rc = (jint)PR_Malloc(arg0);
-+ rc = (long)PR_Malloc(arg0);
- XPCOM_NATIVE_EXIT(env, that, PR_1Malloc_FUNC);
- return rc;
- }
-@@ -2091,7 +2091,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
-- rc = (jint)((nsEmbedCString *)arg0)->get();
-+ rc = (long)((nsEmbedCString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
- return rc;
- }
-@@ -2103,7 +2103,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
-- rc = (jint)new nsEmbedCString();
-+ rc = (long)new nsEmbedCString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
- return rc;
- }
-@@ -2117,7 +2117,7 @@
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
- if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-- rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
-+ rc = (long)new nsEmbedCString((const char *)lparg0, arg1);
- fail:
- if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
-@@ -2131,7 +2131,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
-- rc = (jint)((nsEmbedString *)arg0)->Length();
-+ rc = (long)((nsEmbedString *)arg0)->Length();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
- return rc;
- }
-@@ -2153,7 +2153,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
-- rc = (jint)((nsEmbedString *)arg0)->get();
-+ rc = (long)((nsEmbedString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
- return rc;
- }
-@@ -2165,7 +2165,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
-- rc = (jint)new nsEmbedString();
-+ rc = (long)new nsEmbedString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
- return rc;
- }
-@@ -2179,7 +2179,7 @@
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
- if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-- rc = (jint)new nsEmbedString(lparg0);
-+ rc = (long)new nsEmbedString(lparg0);
- fail:
- if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
-@@ -2193,7 +2193,7 @@
- {
- jboolean rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
-- rc = (jboolean)((nsID *)arg0)->Equals(*(nsID *)arg1);
-+ rc = (long)((nsID *)arg0)->Equals(*(nsID *)arg1);
- XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
- return rc;
- }
-@@ -2207,7 +2207,7 @@
- jboolean rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1Parse_FUNC);
- if (arg1) if ((lparg1 = env->GetStringUTFChars(arg1, NULL)) == NULL) goto fail;
-- rc = (jboolean)((nsID *)arg0)->Parse((const char *)lparg1);
-+ rc = (long)((nsID *)arg0)->Parse((const char *)lparg1);
- fail:
- if (arg1 && lparg1) env->ReleaseStringUTFChars(arg1, lparg1);
- XPCOM_NATIVE_EXIT(env, that, nsID_1Parse_FUNC);
-@@ -2231,7 +2231,7 @@
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
-- rc = (jint)new nsID();
-+ rc = (long)new nsID();
- XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
- return rc;
- }
Deleted: trunk/eclipse/debian/patches/eclipse-libupdatebuild.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libupdatebuild.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-libupdatebuild.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,52 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific patch, converted from eclipse-libupdatebuild.patch
-
-[ -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.update.core.linux/src/build.xml.orig 2005-02-07 14:16:05.353485675 -0500
-+++ source-tree/plugins/org.eclipse.update.core.linux/src/build.xml 2005-02-07 14:17:04.365259400 -0500
-@@ -47,7 +47,7 @@
- <property name="header-path" value="${jdk-path}/../include"/>
- <property name="header-linux-path" value="${header-path}/linux" />
-
-- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
-+ <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} -fPIC ${library-file}"/>
-
- <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
- <arg value="-o"/>
-@@ -56,9 +56,8 @@
- <arg value="-I${src-path}"/>
- <arg value="-I${header-path}"/>
- <arg value="-I${header-linux-path}"/>
-+ <arg value="-fPIC"/>
- <srcfile/>
-- <arg value="-static"/>
-- <arg value="-lc"/>
- <fileset dir="${src-path}" includes="*.c"/>
- <mapper type="glob" from="*.c" to="*.o"/>
- </apply>
-@@ -67,4 +66,4 @@
- </target>
-
-
--</project>
-\ No newline at end of file
-+</project>
Deleted: trunk/eclipse/debian/patches/eclipse-libupdatebuild2.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libupdatebuild2.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-libupdatebuild2.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific patch, converted from eclipse-libupdatebuild2.patch
-
-[ -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.update.core.linux/src/build.xml.orig 2005-02-07 15:33:34.513890526 -0500
-+++ source-tree/plugins/org.eclipse.update.core.linux/src/build.xml 2005-02-07 15:33:50.705301151 -0500
-@@ -5,7 +5,7 @@
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}/../.."/>
- <property name="jdk-path" value="${java.home}"/>
-- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
-+ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${installArch}/"/>
- <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
- <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
Modified: trunk/eclipse/debian/patches/eclipse-nativepresentation.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-nativepresentation.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-nativepresentation.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -22,17 +22,6 @@
exit 0
@DPATCH@
-diff -r -u source-tree/plugins.orig/org.eclipse.ui/plugin.properties source-tree/plugins/org.eclipse.ui/plugin.properties
---- source-tree/plugins.orig/org.eclipse.ui/plugin.properties 2006-10-22 10:31:55.000000000 +0200
-+++ source-tree/plugins/org.eclipse.ui/plugin.properties 2006-10-22 10:39:38.000000000 +0200
-@@ -73,6 +73,7 @@
- Presentation.default=View and Editor Folders
- Presentation.default.desc=Colors and fonts used by the default Eclipse presentation.
- Presentation.default.name=Default
-+Presentation.native.name=Native presentation (experimental)
-
- SystemSummary.sectionTitle.platform=Platform Details
-
diff -r -u source-tree/plugins.orig/org.eclipse.ui/plugin.xml source-tree/plugins/org.eclipse.ui/plugin.xml
--- source-tree/plugins.orig/org.eclipse.ui/plugin.xml 2006-10-22 10:31:55.000000000 +0200
+++ source-tree/plugins/org.eclipse.ui/plugin.xml 2006-10-22 10:39:33.000000000 +0200
@@ -480,3 +469,25 @@
+ return text;
}
}
+--- source-tree/plugins/org.eclipse.ui/plugin.properties.orig 2008-05-20 17:44:30.000000000 -0400
++++ source-tree/plugins/org.eclipse.ui/plugin.properties 2008-05-20 17:48:16.000000000 -0400
+@@ -77,6 +77,7 @@
+ Presentation.default=View and Editor Folders
+ Presentation.default.desc=Colors and fonts used by the default Eclipse presentation.
+ Presentation.default.name=Default
++Presentation.native.name=Native presentation (experimental)
+ Presentation.30.name=Classic Presentation
+
+ SystemSummary.sectionTitle.platform=Platform Details
+--- source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java.orig 2008-05-21 11:52:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java 2008-05-21 11:48:55.000000000 -0400
+@@ -15,6 +15,9 @@
+ * The IPreferenceConstants are the internal constants used by the Workbench.
+ */
+ public interface IPreferenceConstants {
++ //Do we show tabs up or down for views
++ public static final String VIEW_TAB_POSITION = "VIEW_TAB_POSITION"; //$NON-NLS-1$
++
+
+ //Boolean: true = single click opens editor; false = double click opens
+ // it.
Added: trunk/eclipse/debian/patches/eclipse-osgi-bootclasspath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-osgi-bootclasspath.dpatch (rev 0)
+++ trunk/eclipse/debian/patches/eclipse-osgi-bootclasspath.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,94 @@
+#! /bin/sh -e
+## eclipse-osgi-bootclasspath.dpatch by Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Sanitized boot classpath entries for the org.eclipse.osgi plugin
+
+[ -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@
+
+diff -ur source-tree.orig/plugins/org.eclipse.osgi/build.properties source-tree/plugins/org.eclipse.osgi/build.properties
+--- source-tree.orig/plugins/org.eclipse.osgi/build.properties 2008-09-12 00:26:36.000000000 +0300
++++ source-tree/plugins/org.eclipse.osgi/build.properties 2008-10-12 00:06:14.000000000 +0300
+@@ -31,4 +31,3 @@
+ security/src/
+ output.. = bin/
+ jre.compilation.profile = CDC-1.0/Foundation-1.0
+-bootClasspath=osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}
+diff -ur source-tree.orig/plugins/org.eclipse.osgi/build.xml source-tree/plugins/org.eclipse.osgi/build.xml
+--- source-tree.orig/plugins/org.eclipse.osgi/build.xml 2008-09-12 00:23:42.000000000 +0300
++++ source-tree/plugins/org.eclipse.osgi/build.xml 2008-10-11 23:54:26.000000000 +0300
+@@ -16,19 +16,36 @@
+ <property name="compilerArg" value=""/>
+ <property name="javacSource" value="1.3"/>
+ <property name="javacTarget" value="1.2"/>
+- <property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}"/>
++ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
++ <os family="mac"/>
++ </condition>
++ <property name="dir_bootclasspath" value="${java.home}/lib"/>
++ <path id="path_bootclasspath">
++ <fileset dir="${dir_bootclasspath}">
++ <include name="*.jar"/>
++ </fileset>
++ </path>
++<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}" >
++ <isset property="CDC-1.0/Foundation-1.0"/>
++ </condition>
+ <condition property="bundleJavacSource" value="1.3" >
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.1" >
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
++<condition property="bundleBootClasspath" value="${J2SE-1.5}" >
++ <isset property="J2SE-1.5"/>
++ </condition>
+ <condition property="bundleJavacSource" value="1.5" >
+ <isset property="J2SE-1.5"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.5" >
+ <isset property="J2SE-1.5"/>
+ </condition>
++<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.1}" >
++ <isset property="OSGi/Minimum-1.1"/>
++ </condition>
+ <condition property="bundleJavacSource" value="1.3" >
+ <isset property="OSGi/Minimum-1.1"/>
+ </condition>
+@@ -37,6 +54,7 @@
+ </condition>
+ <property name="bundleJavacSource" value="${javacSource}"/>
+ <property name="bundleJavacTarget" value="${javacTarget}"/>
++ <property name="bundleBootClasspath" value="${bootclasspath}"/>
+
+ <target name="init" depends="properties">
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins" >
+diff -ur source-tree.orig/plugins/org.eclipse.osgi/.classpath source-tree/plugins/org.eclipse.osgi/.classpath
+--- source-tree.orig/plugins/org.eclipse.osgi/.classpath 2008-09-12 00:27:00.000000000 +0300
++++ source-tree/plugins/org.eclipse.osgi/.classpath 2008-10-11 23:57:34.000000000 +0300
+@@ -1,7 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+- <classpathentry kind="lib" path="osgi/exceptions.jar"/>
+- <classpathentry kind="lib" path="osgi/xmlParserAPIs.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OSGi%Minimum-1.1"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="console/src"/>
Property changes on: trunk/eclipse/debian/patches/eclipse-osgi-bootclasspath.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/eclipse/debian/patches/eclipse-swt-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-swt-build.dpatch (rev 0)
+++ trunk/eclipse/debian/patches/eclipse-swt-build.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,175 @@
+#! /bin/sh -e
+##
+## DP: fixes build for swt libraries
+
+[ -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@
+--- upstream/expanded/build.xml 2008-06-08 00:58:25.000000000 -0400
++++ source-tree/build.xml 2008-06-08 17:26:10.000000000 -0400
+@@ -71,26 +71,10 @@
+ <record name="compilelog.txt" action="stop" />
+ </target>
+
+- <target name="compilelibs" depends="init,clean,compile" if="libsconfig">
+- <property name="swtlibs" value="${buildDirectory}/swttmp" />
+- <mkdir dir="${swtlibs}" />
+-
+- <!-- unzip swt zips -->
+- <unzip dest="${swtlibs}">
+- <fileset dir="${buildDirectory}/plugins/org.eclipse.rcp.source.${installOs}.${installWs}.${installArch}/src/">
+- <include name="org.eclipse.swt.${installWs}.${installOs}.${installArch}_*/*.zip" />
+- </fileset>
+- </unzip>
+- <exec dir="${swtlibs}/" executable="sh" failonerror="true">
+- <arg line="build.sh" />
+- </exec>
+- <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
+- <mkdir dir="${swtdir}" />
+- <move todir="${swtdir}/">
+- <fileset dir="${swtlibs}">
+- <include name="**/*.so" />
+- </fileset>
+- </move>
++ <target name="compilelibs" depends="init,clean,compile" if="libsconfig">
++ <property name="swtlibs" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
++ <ant dir="${swtlibs}" target="build.nativeLibraries" />
++
+
+ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+ <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
+diff -up ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2008-07-25 09:08:15.000000000 -0400
+@@ -272,6 +272,11 @@
+ </target>
+
+ <target name="build.cfiles" depends="build.jars">
++ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++ <!--compile swtools.jar in org.eclipse.swt.tools-->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ <!-- generate the C code from the (64 bit) SWT PI java classes -->
+ <!-- assumes the swt.jar has already been built -->
+ <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+@@ -293,6 +298,7 @@
+ <fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/"/>
+ <fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
++ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/build.xml 2008-07-25 09:07:58.000000000 -0400
+@@ -141,6 +141,28 @@
+ <antcall target="@dot"/>
+ </target>
+
++ <target name="build.cfiles" depends="init">
++ <mkdir dir="${build.result.folder}/library"/>
++ <copy todir="${build.result.folder}/library">
++ <fileset dir="${plugindir}/Eclipse SWT/common/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
++ </copy>
++ </target>
++
++ <target name="build.nativeLibraries" depends="build.cfiles">
++ <exec dir="${build.result.folder}/library" executable="sh">
++ <env key="OUTPUT_DIR" value="${build.result.folder}"/>
++ <arg line="${build.result.folder}/library/build.sh"/>
++ <arg line="install"/>
++ </exec>
++ </target>
+ <target name="src.zip" depends="init" unless="src.zip">
+ <mkdir dir="${build.result.folder}/"/>
+ <zip zipfile="${build.result.folder}/src.zip">
+@@ -346,4 +368,4 @@
+ <mapper type="glob" from="*._properties" to="*.properties"/>
+ </move>
+ </target>
+-</project>
+\ No newline at end of file
++</project>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.s390x/build.xml 2008-07-25 09:07:58.000000000 -0400
+@@ -272,6 +272,11 @@
+ </target>
+
+ <target name="build.cfiles" depends="build.jars">
++ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++ <!--compile swtools.jar in org.eclipse.swt.tools-->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ <!-- generate the C code from the (64 bit) SWT PI java classes -->
+ <!-- assumes the swt.jar has already been built -->
+ <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+@@ -294,6 +299,7 @@
+ <fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
++ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
+ <fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2008-07-25 09:07:58.000000000 -0400
+@@ -271,6 +271,11 @@
+ </target>
+
+ <target name="build.cfiles" depends="build.jars">
++ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++ <!--compile swtools.jar in org.eclipse.swt.tools-->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
+ <!-- generate the C code from the (64 bit) SWT PI java classes -->
+ <!-- assumes the swt.jar has already been built -->
+ <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
+diff -up ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml
+--- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86/build.xml 2008-07-25 09:07:58.000000000 -0400
+@@ -149,13 +149,14 @@
+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
+ </copy>
+ </target>
+
+- <target name="build.jnilibs" depends="build.cfiles">
++ <target name="build.nativeLibraries" depends="build.cfiles">
+ <exec dir="${build.result.folder}/library" executable="sh">
+ <env key="OUTPUT_DIR" value="${build.result.folder}"/>
+ <arg line="${build.result.folder}/library/build.sh"/>
Added: trunk/eclipse/debian/patches/eclipse-swt-location.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-swt-location.dpatch (rev 0)
+++ trunk/eclipse/debian/patches/eclipse-swt-location.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+##
+## DP: moves swt source zip location from rcp.source to swt.source
+
+[ -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@
+--- upstream/expanded/build.xml 2008-05-23 12:31:07.000000000 -0400
++++ source-tree/build.xml 2008-05-23 13:13:31.000000000 -0400
+@@ -77,10 +77,10 @@
+
+ <!-- unzip swt zips -->
+ <unzip dest="${swtlibs}">
+- <fileset dir="${buildDirectory}/plugins/org.eclipse.rcp.source.${installOs}.${installWs}.${installArch}/src/">
++ <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.source.${installOs}.${installWs}.${installArch}/src/">
+ <include name="org.eclipse.swt.${installWs}.${installOs}.${installArch}_*/*.zip" />
+ </fileset>
+ </unzip>
+ <exec dir="${swtlibs}/" executable="sh" failonerror="true">
+ <arg line="build.sh" />
+ </exec>
Modified: trunk/eclipse/debian/patches/eclipse-swttools.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-swttools.dpatch 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/patches/eclipse-swttools.dpatch 2009-06-28 12:33:30 UTC (rev 8622)
@@ -55,10 +55,10 @@
</target>
<target name="refresh" depends="init" if="eclipse.running">
-diff -r -u source-tree.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
---- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2005-11-18 15:13:30.000000000 +0100
-+++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2005-11-18 15:14:47.000000000 +0100
-@@ -21,7 +21,6 @@
+
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.orig 2008-05-20 18:15:42.000000000 -0400
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2008-05-20 18:14:06.000000000 -0400
+@@ -39,7 +39,6 @@
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -66,20 +66,19 @@
</target>
<target name="build.update.jar" depends="init">
-@@ -190,8 +189,11 @@
- </target>
+@@ -271,7 +270,10 @@
<target name="build.cfiles" depends="build.jars">
-+ <!--compile the jar in org.eclipse.swt.tools-->
-+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
-+
<!-- generate the C code from the (64 bit) SWT PI java classes -->
- <!-- assumes the swt.jar has already been built -->
-+ <!-- assumes the swttools.jar has already been built -->
++ <!--compile the jar in org.eclipse.swt.tools-->
++ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
++ <!-- assumes the swttools.jar has already been built -->
+ <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
- <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -291,6 +293,8 @@
+@@ -392,6 +394,8 @@
<delete file="${plugin.destination}/${full.name}.jar"/>
<delete file="${plugin.destination}/${full.name}.zip"/>
<delete dir="${temp.folder}"/>
@@ -88,4 +87,3 @@
</target>
<target name="refresh" depends="init" if="eclipse.running">
-Nur in source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64: build.xml.orig.
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2009-06-28 00:52:09 UTC (rev 8621)
+++ trunk/eclipse/debian/rules 2009-06-28 12:33:30 UTC (rev 8622)
@@ -10,7 +10,7 @@
export DH_OPTIONS =
export SHELL = /bin/bash
-DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.3-gtk
+DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-cvs eclipse-jdt eclipse-pde libswt3.4-gtk
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# The ppc64 port in eclipse 3.3 is incomplete.
@@ -43,6 +43,9 @@
ECLIPSE_PLATFORM=$(DEB_HOST_ARCH)
endif
+# FIXME: Not updated for 3.4.x
+enable_native := no
+
ifeq ($(enable_native),yes)
ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
AVAIL_CPUS := $(shell echo $(DEB_BUILD_OPTIONS) | sed -e 's/^.*parallel=\([1-9]*\).*/\1/' )
@@ -66,14 +69,14 @@
SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/')
UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
-REL=v3347
+REL=v3449
-export JAVA_HOME=/usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
# GCJ configuration
# GCJ_RUN command line to launch gcj
# AOT_COMPILE command line to AOT compile jars to native
-GCJ_VERSION=4.2
+GCJ_VERSION=4.4
GCJ_RUN=/usr/bin/gcj-$(GCJ_VERSION)
GCJ_DBTOOL=/usr/bin/gcj-dbtool-$(GCJ_VERSION)
GCJ_JARDIR=/usr/lib/gcj/eclipse
@@ -82,14 +85,13 @@
# Virtual machine configuration.
# JAVA_RUN command line to start the virtual machine
# JAVA_CLASSPATH classpath components neccassary for the VM to function
-JAVA_RUN=/usr/lib/jvm/java-gcj/bin/java
+JAVA_RUN=/usr/lib/jvm/java-6-openjdk/bin/java
JAVA_CLASSPATH=
# Ant configuration.
# ANT_CLASSPATH classpath components required to run Ant
# ANT_CLASS class containing the Main method for Ant
# ANT_OPTS properties to be added to the VM when running Ant
-ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar
# use ecj-bootstrap as compiler
ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/ant/lib/ant-nodeps.jar:/usr/share/java/ecj.jar
ANT_CLASS=org.apache.tools.ant.Main
@@ -108,12 +110,6 @@
DEBIAN_TMP=$(CURDIR)/debian/tmp
EXTRA=$(CURDIR)/debian/extra
-with_tomcat := yes
-ifeq ($(with_tomcat),yes)
- TOMCAT_DEP = libtomcat5.5-java
- BUILD_DEPS += , libtomcat5.5-java
-endif
-
with_browser := xulrunner
#with_browser := mozilla
#with_browser := firefox
@@ -127,29 +123,27 @@
eclipse_patches = \
eclipse-ant-manifest \
- eclipse-fileinitializer \
eclipse-gnuformatterjdt \
eclipse-gnuformatterjdtui \
eclipse-libswt-enableall \
- eclipse-libupdatebuild \
- eclipse-libupdatebuild2 \
- eclipse-jsch \
- eclipse-jsch-sftpexception \
- eclipse-disable-apt \
- eclipse-libswt-xpcomgcc4 \
- eclipse-icu4j-build-files \
- eclipse-jsch-build-files \
eclipse-awt-libpath \
eclipse-nativepresentation \
- eclipse-updatehomedir \
eclipse-swttools \
- eclipse-swt-x11 \
- eclipse-build \
eclipse-disable-motif \
eclipse-ecj-gcj \
+ eclipse-disable-buildHelpIndex \
eclipse-add-ppc64-sparc64-s390-s390x \
eclipse-java-home \
+ eclipse-ini-more-memory \
+ eclipse-osgi-bootclasspath
+# eclipse-disable-apt \
+# eclipse-swt-x11 \
+# eclipse-fileinitializer \
+# eclipse-jsch \
+# eclipse-build \
+# eclipse-jsch-build-files \
+# eclipse-icu4j-build-files \
# eclipse-icon \
# eclipse-efj \
# eclipse-disable-filelog \
@@ -160,25 +154,29 @@
# eclipse-public-applypatch \
# eclipse-helpindexbuilder \
-ifeq ($(with_tomcat),yes)
- eclipse_patches += \
- eclipse-tomcat55-build.dpatch \
- eclipse-tomcat55.dpatch \
- eclipse-webapp-tomcat55.dpatch
+#ifeq ($(with_tomcat),yes)
+# eclipse_patches += \
+# eclipse-webapp-tomcat55.dpatch
+# eclipse-tomcat55-build.dpatch \
# eclipse-webapp-tomcat55-newarches.dpatch
-else
- eclipse_patches += \
- eclipse-disable-tomcat
-endif
+# eclipse-tomcat55.dpatch \
+#else
+# eclipse_patches += \
+# eclipse-disable-tomcat
+#endif
ifeq ($(with_browser),xulrunner)
- eclipse_patches += \
- eclipse-libswt-xulrunner \
- eclipse-libswt-firefox2 \
+# eclipse_patches += \
+# eclipse-libswt-xulrunner \
+# eclipse-libswt-firefox2 \
# eclipse-libswt-mozilla-profiles
- BUILD_DEPS += , libxul-dev
+ ifeq ($(DISTRIBUTION),Ubuntu)
+ BUILD_DEPS += , libxul-dev
+ else
+ BUILD_DEPS += , xulrunner-dev
+ endif
MOZILLA_DEP = $${shlibs:Depends}
MOZILLA_HOME = /usr/lib/mozilla
endif
@@ -195,9 +193,9 @@
endif
ifeq ($(with_browser),firefox)
- eclipse_patches += \
- eclipse-libswt-firefox \
- eclipse-libswt-firefox2
+# eclipse_patches += \
+# eclipse-libswt-firefox2
+# eclipse-libswt-firefox \
BUILD_DEPS += , firefox-dev
# MOZILLA_DEP = firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7)
@@ -209,12 +207,13 @@
debian/control: debian/control.in debian/rules
sed -e 's/@ANT_DEP@/$(ANT_DEP)/g' \
- -e 's/@TOMCAT_DEP@/$(TOMCAT_DEP)/g' \
-e 's/@MOZILLA_DEP@/$(MOZILLA_DEP)/g' \
-e 's/@BUILD_DEPS@/$(BUILD_DEPS)/g' \
-e 's, at SECTION_PREFIX@,$(SECTION_PREFIX),g' \
-e 's/ ,/,/g' \
- debian/control.in > debian/control.tmp
+ debian/control.in \
+ $(if $(filter yes, $(enable_native)),debian/control.in.gcj) \
+ > debian/control.tmp
if cmp -s debian/control debian/control.tmp; then \
rm debian/control.tmp; \
else \
@@ -232,14 +231,14 @@
# cleanup much easier.
mkdir -p "$(SOURCE_TREE)"
(cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
+ touch uncompress-stamp
ifeq ($(with_dpatch),yes)
+patch-stamp: uncompress-stamp
+
# Include dpatch stuff.
-DPATCH_STAMPFN=dpatch-stamp
include /usr/share/dpatch/dpatch.make
-patch-stamp: uncompress-stamp dpatch-stamp
- cp dpatch-stamp patch-stamp
else
patch_ext = dpatch
@@ -365,8 +364,7 @@
# Update build ids in configuration files
cd $(SOURCE_TREE) && \
$(ECJ_ANT_RUN) \
- -Djava5.home=/usr/lib/jvm/java-gcj \
- -Djava.endorsed.dirs=$(SOURCE_TREE)/plugins/org.eclipse.tomcat \
+ -Djava5.home=/usr/lib/jvm/default-java \
-Dnobootstrap=true \
-DinstallOs=linux \
-DinstallWs=gtk \
@@ -377,7 +375,7 @@
touch prepare-stamp
-build: build-java
+build: build-java install-eclipse
build-java: build-java-stamp
build-java-stamp: prepare-stamp
dh_testdir
@@ -387,14 +385,14 @@
# components as well.
cd $(SOURCE_TREE) && \
$(ECJ_ANT_RUN) \
- -Djava5.home=/usr/lib/jvm/java-gcj \
- -Djava.endorsed.dirs=$(SOURCE_TREE)/plugins/org.eclipse.tomcat \
+ -Djava5.home=/usr/lib/jvm/default-java \
-Dnobootstrap=true \
-DinstallOs=linux \
-DinstallWs=gtk \
-DinstallArch=$(ECLIPSE_PLATFORM) \
-Dlibsconfig=true \
- compilelibs
+ -DJavaSE-1.6=/usr/lib/jvm/default-java/jre/lib/rt.jar \
+ compile
# Build done
touch build-java-stamp
@@ -408,7 +406,7 @@
# debugging purposes: it takes a long time.
cd $(SOURCE_TREE) && \
$(ECJ_ANT_RUN) \
- -Djava5.home=/usr/lib/jvm/java-gcj \
+ -Djava5.home=/usr/lib/jvm/default-java \
-Dconfiguration=linux.gtk.$(ECLIPSE_PLATFORM) \
-DinstallOs=linux \
-DinstallWs=gtk \
@@ -425,7 +423,7 @@
dh_installdirs
dh_install $(foreach p,$(DEB_GCJ_PACKAGES),-N$(p)-gcj)
ifeq ($(enable_native),yes)
- dh_install --sourcedir=debian/tmp-native $(foreach p,$(DEB_GCJ_PACKAGES),-p$(p)-gcj)
+ dh_install --sourcedir=debian/tmp-native --list-missing $(foreach p,$(DEB_GCJ_PACKAGES),-p$(p)-gcj)
endif
touch install-stamp
@@ -446,8 +444,7 @@
plugin_dir=$$(ls -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.sdk_*) ; \
sed --in-place "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" $$plugin_dir/about.mappings
- # Extract our icon. It is uuencoded because binary files cannot be
- # included in a source package.
+ # Install our icon.
mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps
cp $(SOURCE_TREE)/plugins/org.eclipse.platform/eclipse*.png $(DEBIAN_TMP)/usr/share/pixmaps/
@@ -455,37 +452,30 @@
# of all our previously replaced Jar files. We must now go through the
# process of linking them back to the Debian versions.
-ifeq ($(with_tomcat),yes)
cat $(EXTRA)/package-links.txt | while read FROM TO; do \
if [ ! -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \
mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \
fi; \
ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \
done
-else
- cat $(EXTRA)/package-links.txt | grep -v tomcat | while read FROM TO; do \
- if [ ! -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO) ]; then \
- mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$(dirname $$TO); \
- fi; \
- ln -sf $$FROM $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/$$TO; \
- done
-endif
# Preinitialize the Eclipse directory. This extracts bundles
# which contain .so files. This prevents the .so files from being
# extracted to the user's workspace during runtime.
cd $(DEBIAN_TMP)/$(ECLIPSE_HOME) && \
- $(JAVA_RUN) -cp startup.jar \
- org.eclipse.core.launcher.Main -consolelog \
- -application org.eclipse.core.runtime.initializer \
- -fileInitializer $(EXTRA)/filenamepatterns.txt
+ ./eclipse \
+ -nosplash -consolelog \
+ -initialize
+
+ # -application org.eclipse.core.runtime.initializer \
+ # -fileInitializer $(EXTRA)/filenamepatterns.txt
# Version-less SWT Jar links.
mkdir -p $(DEBIAN_TMP)/usr/lib/java && \
cd $(DEBIAN_TMP)/usr/lib/java && \
- ln -sf ../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_$(UPSTREAM_VERSION).$(REL).jar swt3.3-gtk.jar && \
- ln -sf swt3.3-gtk.jar swt-gtk.jar && \
- ln -sf swt3.3-gtk.jar swt.jar
+ ln -sf ../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_$(UPSTREAM_VERSION).$(REL).jar swt3.4-gtk.jar && \
+ ln -sf swt3.4-gtk.jar swt-gtk.jar && \
+ ln -sf swt3.4-gtk.jar swt.jar
# Missing permissions.
chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/ant
@@ -497,7 +487,6 @@
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/complete-ant-cmd.pl
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/about_files/LICENSE.dom.txt
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
- rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_*/about_files/mx4j.license
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.source_*/src/org.eclipse.jdt.apt.core_*/mirror-api-license.txt
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.apache.ant_*/about_files/LICENSE.sax.txt
rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.eclipse.tomcat_*/mx4j.license
@@ -587,7 +576,7 @@
for p in $(DEB_GCJ_PACKAGES); do \
mkdir -p debian/$$p-gcj/usr/share/gcj/classmap.d; \
mv debian/$$p-gcj/usr/lib/gcj/eclipse/*.db \
- debian/$$p-gcj/usr/share/gcj/classmap.d/; \
+ debian/$$p-gcj/usr/share/gcj/classmap.d/ || true; \
done
# don't merge classmaps yet. makes debugging easier
# $(MAKE) -f debian/rules generate-classmaps
@@ -604,20 +593,20 @@
dh_strip
dh_compress
+ dh_makeshlibs
dpkg-shlibdeps \
-dDepends \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-atk-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-awt-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-pi-gtk-3347.so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-atk-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-awt-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-cairo-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-pi-gtk-$(REL).so \
-dRecommends \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3347.so \
- debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-glx-gtk-3347.so \
- -Tdebian/libswt3.3-gtk-jni.substvars
- dh_shlibdeps -Nlibswt3.3-gtk-jni
- dh_makeshlibs
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-gnome-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-$(REL).so \
+ debian/libswt3.4-gtk-jni/usr/lib/jni/libswt-glx-gtk-$(REL).so \
+ -Tdebian/libswt3.4-gtk-jni.substvars
+ dh_shlibdeps -Nlibswt3.4-gtk-jni
dh_installdeb
dh_gencontrol
dh_md5sums
@@ -646,7 +635,7 @@
done
# TODO: Is this the second time to do this?
- @for package in libswt3.3-gtk; do \
+ @for package in libswt3.4-gtk; do \
echo "generating classmaps for $${package} ... "; \
mkdir -p debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d; \
if test -d debian/$${package}-java/$(ECLIPSE_HOME)/plugins; then \
@@ -665,7 +654,7 @@
clean:
dh_testdir
- rm -rf $(SOURCE_TREE) $(BUILD_TREE) *-stamp patch-stampT dpatch-stampT
+ rm -rf $(SOURCE_TREE) $(BUILD_TREE) *-stamp patch-stampT
rm -rf $(DEBIAN_TMP) debian/tmp-native compilelog.txt
rm -rf debian/patched
rm -f debian/patches/00list
More information about the pkg-java-commits
mailing list