--- eclipse-3.4.1.orig/svn-commit.tmp +++ eclipse-3.4.1/svn-commit.tmp @@ -0,0 +1,53 @@ + * 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. +--This line, and those below, will be ignored-- + +M debian/control +D debian/libswt3.3-gtk-gcj.install +A debian/eclipse-cvs.install +M debian/control.in +M debian/patches/eclipse-ecj-gcj.dpatch +M debian/patches/eclipse-java-home.dpatch +A debian/patches/eclipse-disabledocindexes.dpatch +A debian/patches/eclipse-swt-build.dpatch +D debian/patches/eclipse-libupdatebuild2.dpatch +M debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch +M debian/patches/eclipse-nativepresentation.dpatch +M debian/patches/eclipse-fileinitializer.dpatch +D debian/patches/eclipse-disable-apt.dpatch +D debian/patches/eclipse-libupdatebuild.dpatch +D debian/patches/eclipse-libswt-xpcomgcc4.dpatch +M debian/patches/eclipse-swttools.dpatch +M debian/patches/eclipse-disable-buildHelpIndex.dpatch +AM debian/patches/eclipse-osgi-bootclasspath.dpatch +M debian/patches/eclipse-disable-motif.dpatch +M debian/patches/eclipse-gnuformatterjdt.dpatch +D debian/patches/eclipse-jsch-sftpexception.dpatch +A debian/patches/eclipse-swt-location.dpatch +AM debian/patches/eclipse-ini-more-memory.dpatch +M debian/patches/eclipse-ant-manifest.dpatch +M debian/patches/eclipse-jsch.dpatch +A debian/control.in.gcj +A debian/libswt3.4-gtk-jni.dirs +A debian/libswt3.4-gtk-java.install +M debian/eclipse-rcp.install +M debian/extra/package-links.txt +M debian/extra/java_home +M debian/extra/eclipse.sh +M debian/extra/links.txt +M debian/changelog +M debian/eclipse-source.install +D debian/libswt3.3-gtk-jni.dirs +M debian/eclipse.install +M debian/rules +D debian/libswt3.3-gtk-jni.install +M debian/eclipse-pde.install +D debian/libswt3.3-gtk-java.install +A debian/libswt3.4-gtk-jni.install +M debian/eclipse-platform.install --- eclipse-3.4.1.orig/debian/eclipse-efj.manpages +++ eclipse-3.4.1/debian/eclipse-efj.manpages @@ -0,0 +1 @@ +debian/extra/efj.1 --- eclipse-3.4.1.orig/debian/changelog +++ eclipse-3.4.1/debian/changelog @@ -0,0 +1,1375 @@ +eclipse (3.4.1-0ubuntu1) karmic; urgency=low + + * Fix build dependencies. + * Disable building the -gcj packages (not updated for 3.4.x). + * TODO's before releasing with 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. + - Depend on the third party libraries shipped with the distribution, + don't include the copies included in eclipse. + - Disable the eclipse updater for components shipped with the distribution. + + -- Matthias Klose Sun, 28 Jun 2009 12:18:44 +0200 + +eclipse (3.4.1-0ubuntu1~ppa3) intrepid; urgency=low + + * Cleaned up lintian warning. + + -- Nathan Summers 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 Wed, 04 Feb 2009 13:04:56 -0500 + +eclipse (3.4.1-0ubuntu1~ppa1) jaunty; urgency=low + + * Upload to the PPA. + + -- Mikhail Zabaluev 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 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 Sat, 11 Oct 2008 13:50:58 +0300 + +eclipse (3.4.0-0ubuntu1~ppa6) hardy; urgency=low + + * We still require junit4. + + -- Nathan Summers Mon, 07 Jul 2008 13:23:03 -0400 + +eclipse (3.4.0-0ubuntu1~ppa5.1) feisty; urgency=low + + * Re-upload. + + -- Nathan Summers 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 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 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 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 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 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. + + -- Michael Koch Thu, 14 Feb 2008 16:11:12 +0100 + +eclipse (3.2.2-5) unstable; urgency=low + + * Added junit4 support. + * Added ant-nodeps.jar to ant classpath. Needed for replaceregexp tag. + * Simplified debian/rules by removing all JVM_* variables. + * Updated watch file to match upstream correctly. Closes: #449647. + * Added Homepage, Vcs-Svn and Vcs-Browser fields. + * Updated Standards-Version to 3.7.3. + * debian/eclipse-rcp.dirs. Removed, unneeded. + * Updated debian/patches/eclipse-jsch-sftpexception.dpatch for jsch 0.1.36. + Closes: #460364. + * Updated (Build-)Depends on libjsch-java (>= 0.1.36). + * Added JAVA_HOME for icedtea to debian/extra/java_home. + * Add additional Depends on libgtk2.0-0 (>= 2.12.0-3) for libswt3.2-gtk-jni. + * Added eclipse to Recommends of all plugin packages. Closes: #447202. + * Added debian/source.lintian-overrides to shut up lintian a bit. + * Added ${shlibs:Depends} to Depends of all -gcj packages with native jars. + + -- Michael Koch Tue, 12 Feb 2008 22:01:22 +0100 + +eclipse (3.2.2-4) unstable; urgency=low + + [ Michael Koch ] + * Explicitely build for i386. Closes: #443490. + * Use GCJ 4.2. + * Added debian/patches/eclipse-jsch-sftpexception.dpatch. Closes: #443485. + * Updated Depends on jsch. + * Remove *lucene*.jar from native compilation. + * Introduce build option 'nonative' to disable native compilation easily. + * debian/patches/eclipse-ant-manifest.dpatch: Don't remove ant-launcher.jar + from ant plugin classpath. Needed for Ant 1.7. + * debian/rules: Honor 'parallel=X' setting in DEB_BUILD_OPTIONS. + + [ Flávio Martins ] + * Make eclipse-gcj depend on ecj-gcj instead of ecj-bootstrap-gcj. + Closes: #445578. + * Added support for lpia architecture + * Fix powerpc FTBFS issue for real now. Closes: #432648 + + -- Michael Koch Sun, 07 Oct 2007 11:46:03 +0200 + +eclipse (3.2.2-3) unstable; urgency=low + + [ Michael Koch ] + * debian/control.in: eclipse-platform: Removed zenity alternatives from + Depends. Closes: #419668. + * Fixed debian/eclipse.menu and debian/eclipse/extra/eclipse.desktop to be + policy compliant. + + [ Flávio Martins ] + * Resurrected and tweaked eclipse-java-home.dpatch to fix FTBFS. + Closes: #432648. + + -- Michael Koch Wed, 22 Aug 2007 15:43:49 +0200 + +eclipse (3.2.2-2) unstable; urgency=low + + * debian/extra/java_home: Use /usr/lib/jvm/java-6-sun instead of + /usr/lib/jvm/java-1.6.0-sun. Closes: #415712. + * debian/rules: Build with source and target version 1.5. + * debian/control.in: Replaced all ${Source-Version} by ${binary:Version}. + + -- Michael Koch Sun, 15 Jul 2007 11:01:20 +0200 + +eclipse (3.2.2-1) unstable; urgency=low + + [ Michael Koch ] + * Sparc build fixes. + * debian/extra/java_home: Added paths for SUN JDK 6. + Closes: #415712, #418877. + * debian/rules: Don't force empty bootclasspath. + * lintian/*: fixed lintian warnings for eclipse 3.2.2. + + -- Michael Koch Mon, 04 Jun 2007 08:18:23 -0100 + +eclipse (3.2.2-0ubuntu2) feisty; urgency=low + + [ Michael Koch ] + * Added debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch, which + adds support for ppc64, sparc, sparc64, s390 and hppa. + * debian/rules: Added support for unofficial ports. + * debian/control.in: Added build-dependency on zip. + + [ Matthias Klose ] + * Update the platform patch for 3.2.2. + * On ia64, skip some jar files for native compilation to avoid ICEs. + + [ Vladimír Lapáček ] + * Fixed disable-junit4-apt patch for ppc. + + -- Vladimír Lapáček Sun, 1 Apr 2007 14:17:45 +0200 + +eclipse (3.2.2-0ubuntu1) feisty; urgency=low + + * New upstream release + * Updated debian/rules for the new upstream + * Added com.ibm.icu.source plugin to satisfy dependencies + * Update junit4 patch for the new upstream + * Updated the eclipse-ecj-gcj patch from Fedora + + -- Vladimír Lapáček Thu, 8 Mar 2007 08:28:48 -0500 + +eclipse (3.2.1-6) unstable; urgency=low + + * Rebuilt with unstables libc6. + + -- Michael Koch Thu, 22 Feb 2007 10:14:17 +0000 + +eclipse (3.2.1-5) unstable; urgency=low + + [ Matthias Klose ] + * libswt3.2-gtk-jni: Conflict with libswt-gnome-gtk-3.2-jni as well. + Closes: #401570. + * debian/patches/eclipse-ecj-gcj.dpatch: New, same as in ecj-bootstrap. + + [ Michael Koch ] + * debian/control.in: libswt3.2-gtk-java: Conflicts with libswt-gtk-3.2-java + (<< 3.2.1-5). Closes: #407384. + + -- Michael Koch Sun, 28 Jan 2007 12:30:36 +0100 + +eclipse (3.2.1-4) unstable; urgency=low + + [ Matthias Klose ] + * debian/patches/eclipse-libswt-xulrunner.dpatch: Add chunks from + eclipse-libswt-firefox.dpatch. + * debian/rules: For the xulrunner case, apply eclipse-libswt-firefox2, + don't apply eclipse-libswt-mozilla-profiles. + * eclipse-platform: Unconditionally depend on xulrunner. Closes: #396636. + * debian/extra/eclipse.sh: Don't honor MOZILLA_FIVE_HOME anymore. + + -- Matthias Klose Sun, 7 Jan 2007 10:53:12 +0100 + +eclipse (3.2.1-3) unstable; urgency=low + + [ Vladimír Lapáček ] + * debian/patches/eclipse-tomcat55-dpatch: link to mx4j-jmx.jar + rather then to jmx.jar. + + [ Matthias Klose ] + * Unconditionally depend on zenity. Closes: #403204. + + -- Matthias Klose Wed, 20 Dec 2006 01:10:10 +0100 + +eclipse (3.2.1-2) unstable; urgency=low + + [ Matthias Klose ] + * libswt3.2-gtk-jni: Add conflict with duplicate copy in the + Debian archive. Closes: #401819. + + -- Matthias Klose Wed, 6 Dec 2006 13:45:37 +0100 + +eclipse (3.2.1-1) unstable; urgency=low + + [ Matthias Klose ] + * debian/control.in: eclipse-gcj: Depend on eclipse. + * debian/rules: Reenable 64bit build patches. + + [ Stephan Michels ] + * debian/patches/eclipse-build.dpatch: Updated patch from FC + * debian/patches/eclipse-disable-motif.dpatch: Converted patch + to Eclipse 3.2. + + -- Matthias Klose Sun, 3 Dec 2006 11:52:53 +0100 + +eclipse (3.2.1-0) experimental; urgency=low + + [ Michael Koch ] + * New upstream version. + - Added debian/patches/eclipse-disable-junit4-apt.dpatch to disable + JUnit4 support. + - Added debian/patches/eclipse-tomcat55.dpatch, + debian/patches/eclipse-tomcat55-build.dpatch, + debian/patches/eclipse-webapp-tomcat55.dpatch and + debian/patches/eclipse-webapp-tomcat55-newarches.dpatch to add support + for tomcat 5.5. + - Added debian/patches/eclipse-jsch.dpatch to use the JSch version + from Debian. + - Removed debian/patches/eclipse-tomcat5.dpatch. Obsoleted by tomcat5.5 + patches. + - Updated debian/patches/eclipse-libswt-xulrunner.dpatch to apply cleanly. + - Removed debian/patches/eclipse-java-model-cache.dpatch. + Implemented upstream. + - Removed debian/patches/eclipse-heapstatus.dpatch. Implemented upstream. + - Updated debian/patches/eclipse-fileinitializer.dpatch, + debian/patches/eclipse-updatehomedir.dpatch, + debian/patches/eclipse-javadoc-bootclasspath.dpatch, + debian/patches/eclipse-gnuformatterjdtui.dpatch, + debian/patches/eclipse-disable-motif.dpatch and + debian/patches/eclipse-libswt-enableall.dpatch to apply to new upstream. + - libswt3.2-gtk-gcj.install, libswt3.2-gtk-gcj.postinst, + libswt3.2-gtk-gcj.postrm, libswt3.2-gtk-java.install, + libswt3.2-gtk-jni.dirs, libswt3.2-gtk-jni.install: + Moved over from the respective files from 3.1.x. + - libswt3.1-gtk-gcj.install, libswt3.1-gtk-gcj.postrm, + libswt3.1-gtk-gcj.postinst, libswt3.1-gtk-java.install, + libswt3.1-gtk-jni.dirs, libswt3.1-gtk-jni.install: Removed. + - debian/rules: Adjusted list of license files to delete. + (Thanks to Vladimir Lapacek for patches for Tomcat 5.5 integration) + * extra/package-links.txt, extra/links.txt: Link tomcat 5.5 jars. + * debian/rules: Changed list of patches to apply. Updated to version numbers. + * debian/extra/ecj-gcj.1, debian/extra/ecj-java.1: Fixed manpage name. + * debian/control.in: Added new meta package eclipse-gcj for native eclipse + users. + * Moved all files to /usr/lib/eclipse to make all plugins work. + * debian/control.in: eclipse-jdt-common, eclipse-pde-common, + eclipse-platform-common, eclipse-rcp-common: Removed. + * Build icu4j as a eclipse plugin. + + [ Matthias Klose ] + * Build-depend on java-gcj-compat-dev (>> 1.0.65-4), remove explicit build + dependency on ecj-bootstrap-gcj. + * Don't build ecj again, just use the system one. + * Don't build the eclipse-ecj and eclipse-ecj-gcj packages anymore. + * Use java-gcj-compat-dev to compile the jar files to native code + and register them. + * debian/patches/eclipse-libswt-mozilla.dpatch: Update. + * debian/rules: Apply eclipse-libswt-mozilla-profiles when building + with mozilla. + * debian/rules: Fix libswt-gtk.jar symlink. + * Build swt bindings with -O2. + * debian/patches/eclipse-libswt-xpcomgcc4.dpatch: New, taken from FC. + * debian/patches/eclipse-libswt-firefox.dpatch: Updated from FC. + * debian/patches/eclipse-libswt-firefox2.dpatch: New, taken from FC. + * debian/rules: Uses bashisms, set SHELL. + * Speed up native build on multiprocessor machines. + * debian/extras/eclipse.sh: Remove mozilla error dialog. + * debian/control.in: Let eclipse recommend eclipse-gcj. + * debian/copyright: Update. + + [ Vladimir Lapacek ] + * Build jsch as a eclipse plugin. + + [ Stephan Michels ] + * Added "lib" prefix to the links of the tomcat plugin in package-links.txt + * Ensured that the directories exist before links were created + * Converted native presentation patch to 3.2 + * Show error dialog only if the mozilla/firefox wasn't found. + * Updated updatehomedir patch from Fedora's repository + + -- Matthias Klose Sun, 22 Oct 2006 04:25:47 +0200 + +eclipse (3.1.2-3) experimental; urgency=low + + [ Michael Koch ] + * debian/rules: Added support to build with xulrunner. Made it the default. + Closes: #352184. + * debian/patches/eclipse-libswt-xulrunner.dpatch: New file. + * debian/control.in: libswt3.1-gtk-java: Make @MOZILLA_DEP@ a Recommends. + libswt3.1-gtk-jni: Make dependencies on GNOME and Mozilla a Recommends. + Closes: #361696, #368705. + * debian/control.in: eclipse-platform-common: Added Depends on + java2-runtime. Closes: #369415, #380170. + * debian/control.in: eclipse-jdt-common: Don't Depends on eclipse-jdt. + Closes: #375908. + * debian/control.in: libswt3.1-gtk-jni: Don't Depends on libswt3.1-gtk-java. + Closes: #375870. + * debian/extra/java_home: Added path for SUN JDK from non-free. Thanks to + Tom Marble. Closes: #368583, #369194, #369950. + * debian/control.in: eclipse-efj: Removed Recommends on java-gcj-compat. It + is listed in Depends too. + + [ Stephan Michels ] + * debian/extra/ecj-gcj.1, debian/extra/ecj-java.1: Revised. + * debian/extra/efj.1, debian/eclipse-efj.manpages: New manpage for efj. + + [ Matthias Klose ] + * Build-depend on java-gcj-compat-dev (>= 1.0.61). + * debian/rules: Do not apply the eclipse-libjawt patch for the experimental + build. + * debian/patches/eclipse-awt-libpath.dpatch: Set AWT_LIB_PATH. + * debian/extra/eclipse.sh: Ignore the fact, that the package doesn't work + with Mozilla; everything but the help should work. + + -- Matthias Klose Sun, 13 Aug 2006 15:22:24 +0200 + +eclipse (3.1.2-2) unstable; urgency=low + + [ Michael Koch ] + * debian/control.in: eclipse: Added Conflicts/Replaces against + eclipse-platform-common. Closes: #352196, #352348, #365477, #359979 + * debian/control.in: Build-Depends on bzip2 instead of unzip. + Closes: #352726, #357087 + * control.in, eclipse-rcp-common.install, eclipse-rcp.install, + extra/arch-files.txt, libswt3.1-gtk-java.install: Moved + org.eclipse.swt plugins to eclipse-rcp package. + * debian/extra/efj.sh: Rewritten to match the code from eclipse.sh + Closes: #353555 + * debian/extra/eclipse.1: Clarified explanation for -vm option. + * debian/control.in: Updated Standards-Version to 3.7.2. + * debian/control.in: eclipse-source: Fixed typo in description. + Closes: #363379 + * debian/rules: Build the newest compiler. Closes: #356028 + * debian/control.in: libswt3.1-gtk-jni: Conflict with + libswt-gnome-gtk-3.1-jni and libswt-mozilla-gtk-3.1-jni Closes: #361692 + * debian/rules: Don't compile catalina.jar to native as this ICEe current + gcj-4.1. + + [ Matthias Klose ] + * debian/control.in: eclipse replaces eclipse-platform (<< 3.1.2-2). + * debian/extra/eclipse.sh: Make sure to use /usr/lib/mozilla as + MOZILLA_HOME in any case. + * debian/rules: Set a default for MOZILLA_HOME. + * Set JAVA_HOME for the build (needed for non-matching gcc/gcj versions). + * debian/eclipse.menu: Set longtitle. Ubuntu #34916. + * Merge from Ubuntu: + - Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991. + - Add a new package libswt3.1-gtk-gcj. + * ecj.sh: Only access /etc/eclipse/java_home, if it exists. Closes: #356027. + * eclipse.sh: s/source/./. Closes: #359945. + * Merge from Ubuntu: + - Build using gij-4.1/gcj-4.1. + + -- Michael Koch Wed, 17 May 2006 12:48:03 +0000 + +eclipse (3.1.2-1) unstable; urgency=low + + [ Stephan Michels ] + * New upstream version. Release notes: + http://www.eclipse.org/eclipse/development/readme_eclipse_3.1.2.html + * debian/extra/eclipse.sh: Make the -vmargs and -install + arguments usable. Closes: #347749 + * debian/rules: Replaced logic to create the symbolic links. + * debian/patches/eclipse-java-model-cache.dpatch: Removed + patch because it is fixed upstream in 3.1.2 + * debian/patches/eclipse-libswt-mozilla.dpatch, + debian/patches/eclipse-libswt-firefox.dpatch: Using pkg-config to get + compiler flags for the compilation of SWT. + * debian/patches/eclipse-updatehomedir.dpatch: Updated patch to + the latest version. + * debian/rules, debian/extra/lib.link: Removed all symbolic links from + /usr/share/eclipse to /usr/lib/eclipse. Used a new install site + instead. + * eclipse.install, eclipse-platform-common.menu, eclipse.menu: Added + eclipse.desktop to eclipse.install and moved + eclipse-platform-common.menu to eclipse.menu. Closes: #350475, #351163 + * eclipse.install, eclipse-platform-common.install: Moved the eclipse + executable to the eclipse package to ensure that you can only start + Eclipse if you have the eclipse package installed. Closes: #348584 + + [ Michael Koch ] + * debian/extra/eclipse.sh: Made the -vm option working. Fixed tests for + xpcom.so. Exec the eclipse binary directly. Check for libgtkembedmoz.so. + * debian/patches/eclipse-libswt-firefox.dpatch, debian/rules, + debian/patches/eclipse-libswt-mozilla.dpatch: Make libswt3.1-gtk-java only + depend on mozilla-browser (Debian) or firefox (Ubuntu). Link against + libgtkembedmoz.so during build. Closes: #343667 + * debian/control.in: eclipse-platform-common: Depends on zenity | + kdebase-bin | xdialog instead of zenity only. + * Added debian/patches/eclipse-heapstatus.dpatch to show the heap status + always. + * debian/extra/links.txt, debian/extra/package-links.txt: Adjust links for + libmx4j-java >= 2.1.1-3. + * debian/control.in: Make eclipse package Architure: any (not all). + * debian/control.in: Remove ${shlibs:Depends} on most *-gcj packages. + * debian/rules: Determine upstream version and use a variable containing it + everywhere. + * debian/eclipse-jdt-gcj.install, debian/eclipse-pde-gcj.install, + debian/eclipse-platform-gcj.install, debian/eclipse-rcp-gcj.install: + Include the native jars in the *-gcj packages. + * Added watch file. + + [ Matthias Klose ] + * Add support to build using firefox-dev (turned off by default). + + -- Michael Koch Thu, 9 Feb 2006 06:23:00 +0000 + +eclipse (3.1.1-8) unstable; urgency=low + + * debian/eclipse-platform.preinst: Make /usr/lib/eclipse/features a real + directory. Closes: #345724, #345749, #346224 + * debian/rules: Don't make /usr/lib/eclipse/features a symlink. + * debian/eclipse-platform.install: Include only the non-source features. + * debian/rules: Handle eclipse architures with the same name as the + according Debian architures correctly. + * debian/rules: Don't re-define CURDIR. It's defined by make. + * debian/rules: Don't overwrite LC_ALL. Not needed. + * debian/extra/eclipse.sh: Fixed handling of /etc/eclipse/java_home. + Closes: #345756, #346110 + + -- Michael Koch Sat, 7 Jan 2006 11:45:19 +0000 + +eclipse (3.1.1-7) unstable; urgency=low + + [ Stephan Michels ] + * debian/copyright: Updated license to EPL 1.0. Closes: #342695 + * debian/eclipse-rcp.prerm: Fix the deletion of the eclipse + directories in /usr/local/lib, so that it doesn't fail if they are not + empty. Closes: #342338, #342305 + * debian/extra/eclipse.1: Updated and added missing commandline + options. Closes: #343315 + * debian/patches/eclipse-public-applypatch.dpatch: Add patch to make some + of the API of the compare plugin public, which is needed for the bugzilla + plugin (https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707) + * debian/rules,debian/eclipse-ecj.manpages,debian/eclipse-ecj-gcj.manpages, + debian/extra/ecj.1,debian/extra/ecj-java.1,debian/extra/ecj-gcj.1: + Make an own copy for ecj-gcj with a special comment about gcj and + use *.manpages instead of a copy within the rules. + * debian/control, debian/rules: Added dependency to classpath-doc and enabled + eclipse-link-classpathdoc.dpatch to prevent that javadoc is fetching + javadoc informations from java.sun.com during the build time. + + [ Michael Koch ] + * debian/extra/eclipse.1: Fixed typo. + * debian/extra/eclipse.sh: Added property for faster startup with GCJ 4.0: + -Dgnu.gcj.runtime.VMClassLoader.library_control=never. + * debian/extra/eclipse.sh: Use /bin/sh to as shell. Fixed to be POSIX- + compliant. Closes: #342255 + * debian/rules: Generalized architecture support where debian arch name + is the same as the eclipse arch name. Closes: #342579 + * debian/control.in: libswt3.1-gtk-java: Alternatively Depends on firefox + (>= 1.4.99). Closes: 342505 + * debian/control.in: eclipse-pde-common: Don't depend on eclipse-pde. + Closes: #341854 + * debian/control.in: eclipse-platform-common: Don't depend on + eclise-platform-common. + * debian/eclipse-platform-common.install, debian/eclipse-platform-common.menu, + debian/rules, debian/extra/eclipse32.xpm: Implemented menu entry for X11 + desktops the Debian way. Closes: #343114 + * debian/extra/eclipse.sh: Implemented setting of MOZILLA_FIVE_HOME for + Firefox 1.5 correctly. + * debian/control.in: Build-Depends on gjdoc (>= 0.7.7). Closes: #343089 + * debian/rules: Moved natively compiled jars to /usr/lib/gcj-4.0 and + reworked it to support updates to newer GCJ versions more easily. + + -- Stephan Michels Fri, 23 Dec 2005 12:24:07 +0100 + +eclipse (3.1.1-6) unstable; urgency=low + + [ Stephan Michels ] + * debian/eclipse-platform.dirs: Removed /usr/local/share/eclipse. + Closes: #336884 + * debian/eclipse-rcp.postinst, debian/eclipse-rcp.prerm: + Create and remove empty directories for /usr/local/lib/eclipse. + Closes: #335242 + * debian/control: eclipse-sdk: Add dependency to eclipse-source, because + the sdk feature explicit depends on the source features. Closes: #338209 + * debian/patches/eclipse-tomcat5.dpatch: Changed version of the tomcat + plugin from 4.1.30.1 to 5.0.30 and all occurrences to fix dependency + problem of the sdk feature. + * debian/patches/eclipse-swttools.dpatch: Rebuild patch to build the swt + tools before org.eclipse.swt.gtk.linux.ia64 + * debian/control,debian/eclipse-sdk.install: Rename the package + eclipse-sdk to eclipse, and create a dummy package + for eclipse-sdk. Closes: #338733 + * debian/control: Remove circular dependency for eclipse-rcp to + eclipse-sdk. Closes: #339830 + * debian/control: Removed obsolete package eclipse-base. + + [ Michael Koch ] + * debian/control.in: Build-Depends on java-gcj-compat-dev (>= 1.0.41-2). + Closes: #336012. + * debian/control.in: libswt3.1-gtk-java: Fixed alternate Depends on + mozilla-firefox. Closes: #336285. + * debian/control.in: Uploaders: Added Stephan Michels. + + -- Stephan Michels Sun, 20 Nov 2005 14:41:10 +0100 + +eclipse (3.1.1-5) unstable; urgency=low + + * Remove gij-4.0 dependency from eclipse-base. + * Build using tomcat5 on Ubuntu as well. + + -- Matthias Klose Thu, 10 Nov 2005 09:00:42 +0200 + +eclipse (3.1.1-4) unstable; urgency=low + + [ Stephan Michels ] + * debian/patches/eclipse-helpindexbuilder.dpatch: + Added patch to fix bug in the HelpIndexBuilder + (https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001). + * debian/patches/eclipse-consoleprogressmonitor.dpatch: + Removed patch because it was never necessary. + * debian/patches/eclipse-ant-manifest.dpatch + Fixed incorrect manifest file, because of the the last tailing comma. + * debian/rules: Enabled eclipse-ant-manifest patch + * debian/extra/config.ini: Removed file to fix the problem + with the missing splash screen. + * debian/control: Add alternative dependency to firefox instead + of mozilla-browser. Closes: #336285 + * debian/extra/eclipse.sh: Use /usr/lib/firefox as alternative for + MOZILLA_FIVE_HOME. + * debian/patches/eclipse-libswt-mozilla-classic.dpatch: Disable + patch if the firefox libraries are used, because the chrome registry + is not available and it is not necessary to set the chrome theme. + * debian/rules, debian/eclipse-platform-common.install: Used the png icons, + which are delivered with Eclipse. + * debian/eclipse-source.install: Added missing features like + org.eclipse.platform.source_3.1.1 to /usr/lib/eclipse. Closes: #336453 + * debian/rules: prepare-stamp: Execute the insertBuildId target + to replace all occurrences of @buildId@ + * eclipse-platform.install: Exclude every file for eclipse/configuration/ + except the necessary file config.ini. + * debian/control: Change architecture for libswt3.1-gtk-java from "all" to + "any". Closes: #336316,#336338,#336389. Ubuntu #17580 + * debian/extra/eclipse.sh: Print help message for -h and --help. + Removed the special handling for the workspace location. Closes: #337564 + * debian/patches/eclipse-javadoc-bootclasspath.dpatch: Add patch to fix + problem with missing bootclasspath property within the eclipse build scripts + https://bugs.eclipse.org/bugs/show_bug.cgi?id=115401 + * debian/patches/eclipse-gjdoc-reflection.dpatch: Add patch to use the + reflection option for gjdoc, to fix problem with the classpath option + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23917 + * debian/control: Add eclipse-source <= 3.1.1-3 to the conflicts/replaces + of eclipse-platform, because of problems with /usr/lib/eclipse/features + + [ Michael Koch ] + * debian/extra/java_home: Removed support for sablevm and fjsdk for now. + Closes: #336470. + * debian/control: eclipse-jdt-common: Conflicts and Replaces + eclipse-jdt << 3.0. Closes: #336273. + * debian/control: eclipse-platform-common: Conflicts and Replaces + eclipse-platform << 3.0. Closes: #336307. + * debian/rules: Added support to build for s390 architecture. + * debian/eclipse-rcp.install, debian/libswt3.1-gtk-java.install, debian/rules: + Reorganized SWT to put its jar into /usr/lib/eclipse/plugins/. + * debian/control.in: libswt3.1-gtk-java: Made it an Architecture: any + package. + + -- Michael Koch Wed, 9 Nov 2005 10:42:57 +0100 + +eclipse (3.1.1-3) unstable; urgency=low + + * Michael Koch : + - Updated debian/patches/eclipse-java-model-cache.dpatch to use the upstream + solution. + - debian/rules: Handle ia64 architecture. + - Worked around bugs in latest lucene package. + - Moved package to main. + + * Stephan Michels : + - Added debian/patches/eclipse-gnuformatterjdtui.dpatch + to make the GNU formation rules available in the preferences + (https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770) + - Added debian/patches/eclipse-updatehomedir.dpatch + to add home directory as installation location + if ECLIPSE_HOME is not writable + (https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630) + - Updated debian/patches/eclipse-disable-filelog.dpatch + so that the patch didn't depend on the tomcat patches anymore + - Updated debian/patches/eclipse-tomcat5.patch + to combine the tomcat5 patches to one patch + - Updated debian/patches/eclipse-disable-tomcat.dpatch + in respect of the eclipse-disable-filelog.dpatch + - Added debian/patches/eclipse-libswt-mozilla-classic.dpatch + to set the classic theme for the browser widget to improve the look + (https://bugs.eclipse.org/bugs/show_bug.cgi?id=108257) + - Added debian/patches/eclipse-navtivepresentation.dpatch + to enable the internal native presentation and add some improvments + (https://bugs.eclipse.org/bugs/show_bug.cgi?id=93806) + + -- Michael Koch Tue, 25 Oct 2005 09:18:18 +0000 + +eclipse (3.1.1-2) unstable; urgency=low + + * eclipse-ecj: Fix dangling symlinks in /usr/share/ant/lib. + * Move the dh_installdirs/dh_install calls from the binary targets + to the install target. Fixes FTBFS when only building the architecture + dependent packages. + + -- Matthias Klose Wed, 12 Oct 2005 14:02:50 +0200 + +eclipse (3.1.1-1) unstable; urgency=low + + * Upload to contrib, the remaining reason is tomcat5 beeing in contrib. + + * New upstream release. Closes: #260510, #293058. + - source code formatter changes. Closes: #212765. + - Fixed broken Filesystem: inputfield on gtk. Closes: #204569. + - Fixed ant integration memory leaks. Closes: #219475. + - Fixed refactoring and quickfix fail when assert is used. Closes: #226160. + - Fixed includes regarding kaffe jni files. Closes: #262760. + - eclipse-platform package description changed. Closes: #271584. + - Dependency on kaffe is unneeded. Closes: #259321. + - start-functions.sh file removed. Closes: #304672. + - libswt2.1-gtk2-java not built anymore. Closes: #207156, #255745, #305990. + - eclipse can be installed. Closes: #247404. + + * Michael Koch : + - Updated debian/patches/eclipse-disable-motif.patch and + debian/patches/eclipse-libswt-cairo1.0.patch. Thanks to Stephan Michels + - Added debian/patches/eclipse-java-cache-model.patch to work around + memory handling stupidity + - debian/rules: Build Eclipse only once. + - debian/rules: Put debian version into about.mappings of org.eclipse.sdk + to show it in Eclipse about dialog. + - debian/rules: Build the native jars conditionally + - Use gcj instead of jikes to build the bootstrap ecj compiler + - Merged the fileInitializer code for debian/rules from Jerry Haltom's + Eclipse version for Ubuntu. + - debian/control: Make sure all *-gcj packages depend directly or + indirectly on gij-4.0 for the gcj-dbtool-4.0. + - debian/control: (Build-)Depends on ant-optional instead of ant for a + fully featured Apache Ant. + - debian/extra/java_home: Added more free and non-free JDKs. + Closes: #281226. + + * Matthias Klose : + - debian/*-gcj.postrm: Copy the update-gcj-classmaps-eclipse.sh script + into the postrm scripts. eclipse-base: Depend on gij-4.0. Ubuntu #16574. + - debian-*-gcj.prerm: Remove the update-gcj-classmaps-eclipse.sh script. + - debian/extra/java_home: Add home for the Blackdown JDK (j2sdk1.4 package). + - debian/control: Recommend eclipse-source, don't depend on it. + Ubuntu #2878. + - Convert the custom patch system to dpatch. + - Add support to build conditionally with tomcat5. + - debian/control: eclipse-base: Depend on gij-4.0. Ubuntu #2850. + - debian/control: eclipse-rcp replaces eclipse-rcp-common (<< 3.1.1). + Ubuntu #2828. + - debian/control: Remove gcc/g++ build dependencies, replace gcj dependency + with dependency on libgcj-dev. + - debian/control: Generated from debian/control.in + - Set the package section to contrib/devel again, tomcat5 is still in + contrib. + - Revert the 3.1-11 SWT package changes. + - Add conflicts to the swt packages, which are currently built from sources + extracted from the eclipse release. + - Honor setting of JAVA_HOME in startup script. Ubuntu #2835. + - Build swt libraries using -O2. + - debian/patches/eclipse-ant-manifest.dpatch: Disable. + - Blackdown crashes cannot be reproduced anymore with current Blackdown + package versions on i386 and amd64. Closes: #221712, #221816. + + * We do build swt-gtk from the eclipse source for various reasons: + - There is no swt-gtk upstream release, upstream does release swt-gtk + as part of an eclipse release. + - The swt-gtk built by separate sources is incompatible with the swt + built by eclipse as it misses some eclipse specific parts. Eclipse + and SWT always have to have the same version to make sure both are + compatible with each other. + As upstream doesn't maintain different releases of both, they don't + maintain compatiblity very well. + + -- Michael Koch Mon, 10 Oct 2005 22:12:43 +0200 + +eclipse (3.1.1-0ubuntu1) breezy; urgency=low + + * New upstream version. + * eclipse-disable-motif.patch, eclipse-libswt-cairo1.0.patch: Update, + thanks to Stephan Michels. + * debian/*-gcj.postrm: Copy the update-gcj-classmaps-eclipse.sh script + into the postrm scripts. Ubuntu #16574. + * debian/extra/java_home: Add home for the Blackdown JDK (j2sdk1.4 package). + + -- Matthias Klose Sat, 8 Oct 2005 17:48:26 +0200 + +eclipse (3.1-11) unstable; urgency=low + + * Fixed SWT. + + -- Michael Koch Thu, 8 Sep 2005 19:16:14 +0000 + +eclipse (3.1-10ubuntu1) breezy; urgency=low + + * Synchronize with unstable. + * Disable building with tomcat5, not yet in universe, remove libtomcat5-java + build dependency. libtomcat5-java dependency from eclipse-platform, + replace it with a suggestion. + * Fix FTBFS on amd64, building without tomcat5. + * Build using ecj-bootstrap instead of jikes. + * libswt3.1-gtk-jni: Remove dependency on mozilla-browser. + + -- Matthias Klose Mon, 26 Sep 2005 15:32:13 +0200 + +eclipse (3.1-10) unstable; urgency=low + + * debian/extra/eclipse.sh: support -vm instead of -java as the manpage says. + * Reworked debian/patches/eclipse-tomcat5.patch to make the help system + actually work. + * Removed debian/patches/eclipse-doc-plugins-disabled.patch. Obsolete now. + * Removed debian/patches/TomcatAppServer.java.diff. Obsolete now. + * Removed debian/patches/eclipse-libswt-cairo0.6.patch and + added debian/patches/eclipse-libswt-cairo1.0.patch to work correctly + with Cairo 1.0 + * Added debian/patches/eclipse-swt-x11.patch for building on 64bit archs. + * Added debian/patches/eclipse-disable-javadoc.patch, + * debian/patches/eclipse-disable-buildHelpIndex.patch, + eclipse-3.1/debian/patches/eclipse-consoleprogressmonitor.patch and + eclipse-3.1/debian/patches/z-eclipse-disable-filelog.patch to cope with + a hanging build system when building help files + + -- Michael Koch Thu, 8 Sep 2005 05:16:07 +0000 + +eclipse (3.1-9) unstable; urgency=low + + * Added patch from Stephan Michels to set MOZILLA_FIVE_HOME during startup + to be able to embedd Mozilla inside Eclipse. + * Added debian/patches/eclipse-swttools.patch. + * Fixed debian/extra/arch-files.txt. + * libswt-gtk-3.1-jni: Added dependency on mozilla-browser. + * Fixed debian/patches/eclipse-tomcat5.patch to add the correct jar names to + the tomcat MANIFEST.MF. + + -- Michael Koch Tue, 30 Aug 2005 20:26:10 +0000 + +eclipse (3.1-8) unstable; urgency=low + + * (Build-)Depend on libtomcat5-java instead of libtomcat4-java. + * debian/rules: Reference tomcat5 instead of tomcat4 and handle tomcat5 + properly. + * Removed debian/patches/eclipse-tomcat4.patch and added + debian/patches/eclipse-tomcat5.patch. + * Make eclipse-rcp depend on libswt3.1-gtk-java. + + -- Michael Koch Sun, 28 Aug 2005 07:45:51 +0000 + +eclipse (3.1-7) unstable; urgency=low + + * Added missing *.jar.so files to the packages. + * Added debian/aot-compile script and use it to compile jars to native. + * Removed debian/eclipse-sdk.postinst and debian/eclipse-sdk.postrm. + * Don't make eclipse-efj Depends on ${shlibs:Depends}. + * Fixed debian/extra/eclipse.sh to give command line arguments to + Eclipse. + + -- Michael Koch Sun, 21 Aug 2005 13:54:16 +0000 + +eclipse (3.1-6) unstable; urgency=low + + * Fixed compilation of jars to native. + * Created classmap files and and merged them after package installation. + * Got rid of update-eclipse script. + * Included update-gcj-classmaps-eclipse script. + * Added patches from Stephan Michels to enable cairo and Mozilla support + and to disable Motif and Win32 compilation. + * Use ant instead of libant1.6-java. + + -- Michael Koch Sun, 14 Aug 2005 20:58:35 +0000 + +eclipse (3.1-5) unstable; urgency=low + + * Cleaned up debian/rules more. + * debian/rules: Use $(ECLIPSE_ARCH) instead of hardcoding x86. + * Renamed debian/eclipse-ecj.postrm to debian/eclipse-ecj.prerm. + * Renamed debian/eclipse-ecj-native.postrm to + debian/eclipse-ecj-native.prerm. + * Added debian/eclipse-rcp.postinst. + * Include efj executable. + * Got rid of libeclipse-jni package. + * Renamed eclipse-ecj-native to eclipse-ecj-gcj and included + ecj-gcj executable. + * Fixed jsch usage. + + -- Michael Koch Mon, 11 Jul 2005 06:16:28 +0000 + +eclipse (3.1-4) unstable; urgency=low + + * Use native ecj to build Eclipse. + * Updated debian/patches/eclipse-cvs-ssh-jsch.patch to update all + occurrences of jsch version number. + + -- Michael Koch Fri, 8 Jul 2005 13:15:29 +0000 + +eclipse (3.1-3) unstable; urgency=low + + * debian/control: Big cleanup. + * Moved debian/addons/ to debian/extra/. + * debian/rules: Got rid of --sourcedir argument to dh_install. + * debian/*.install: Fixed paths. + + -- Michael Koch Fri, 8 Jul 2005 06:56:56 +0000 + +eclipse (3.1-2) unstable; urgency=low + + * Fixed command line arguments for SUN java. + * Include missing files. + * Fixed handling of links for SWT. + * Use standard binaries and remove wrappers in debian/bin. + + -- Michael Koch Wed, 6 Jul 2005 15:18:47 +0000 + +eclipse (3.1-1) unstable; urgency=low + + * New upstream version. + * Updated Standards-Version to 3.6.2. + + -- Michael Koch Tue, 5 Jul 2005 04:27:24 +0000 + +eclipse (3.0.1-1) unstable; urgency=low + + * New upstream release. + * Thanks to Jan Schulz for maintaining the Eclipse 2.1 packages and for his + comments on my Eclipse 3.0 packaging effort. + * Designed to run by default with Kaffe. + + -- Jerry Haltom Sun, 16 Jan 2005 23:19:39 -0600 + +eclipse (2.1.3-4) unstable; urgency=low + + * build by gcc-3.3 instead of 3.4 (closes: #251368). + + -- Takashi Okamoto Fri, 18 Jun 2004 08:26:58 +0900 + +eclipse (2.1.3-3) unstable; urgency=low + + * add information on non free JVM to eclipse-platform package + description (closes: #243904) + * Remove any references to fonts in control + * add x-www-browser as alternative to mozilla-browser + * remove gij from postinst calls. It fails to run the updater. + (closes: #247404, #248587) + * Changed 2>1 typo in the postinst java calls + * recompile on a plain sid without experimental gcc (closes: #251563) + * s/2.1.2/2.1.3/ in libswt*.links (closes: #252026) + Note to self: this needs to be checked be some tests...) + * libeclipse-jni replaces eclipse-platform (<<2.1.3-2) + * recompile with plain sid and not experimental gcc + (closes: #251368, #251563) + * Add a patch to make it compile on latest gtk + * Make the /usr/lib/jni/*so real files, located in the jni packages and + not symlinks in the java ones (makes lin* happy). Tighten the + dependcies between java and jni packages. + + -- Jan Schulz Sun, 6 Jun 2004 11:21:27 +0200 + +eclipse (2.1.3-2) unstable; urgency=low + + * workaround for a FTBFS with ant 1.6 and JDK 1.3: Added the right jars to + the CLASSPATH and build depend on ant 1.6. + * add debugging output to the build-java call: export + DEB_BUILD_OPTIONS=debug before building. + * don't install the old KDE desktop dir. + + -- Jan Schulz Thu, 8 Apr 2004 01:15:12 +0200 + +eclipse (2.1.3-1) unstable; urgency=low + + * New Upstream version: Again, only bugfixes, no new features + * Remove patches integrated upstream. + . new-cvs-response.patch + . org.eclipse.ui.workbench.texteditor.patch + . 00-PDE_build_with_NLS.patch + * Updated eclipse-javac links for ant. + * Removed ant dependencies and include the jars from upstream. This is + due to the problem, that debians ant is now 1.6, but eclipse requires + 1.5 ant. As the 3.0 version changes this anyway, I didn't bother to + patch this: this is too much work and too less result (xerces and tomcat + are also taken from upstream source). + * Introduced 3 new packages: lib*-jni, which includes all native + compiled parts from the corresponding Java packages. (closes: #232882) + . Conflict and replace older versions to force them off the system + . Compile this parts in it's own target, so that arch binary only + releases are a lot faster. (closes: #232852) + * Add some info to the libswt*.README.Debian re compiling the jars + to native libs with gcj. (closes: #232011) + * Removed one desktop file, as this is not anymore needed since kde 3.2 + * Sidenote: kaffe is now able to do rudimentary startup. + + -- Jan Schulz Wed, 24 Mar 2004 17:28:29 +0100 + +eclipse (2.1.2-2) unstable; urgency=low + + * Added a note to NEWS, that the install can fail, if sablevm ends + up being the only JVM for eclipses config app. Also added some note + to the postinst scripts. This is a bug in the java policy, as I cannot + exclude sablevm from the /usr/bin/java alternative, which the postinst + uses as the last option. Workaround is to set JAVA_HOME to a working + JVM before doing the upgrade. + * Tighter dependencies between packages, so that upgrades will work. + (closes: #229587) + * Added patch to work around problems with latest cvs. (closes: #231135) + * Make /usr/bin/eclipse -nl aware and use LANG to determine the to be used + language. To change that independly from your normal settings, add + LANG="..." to your $HOME/.eclipse/eclipserc (closes: #231464) + * Tried to remove as much whitespace changes from the 'addsite' patch as + possible. + * Removed the '#!/bin/bash' from startup function: its not meant to be + executed, only sourced. + * Added my name to the copyright. + * Added debian package version to version string, which is shown in + Help|About + * Readme.Debian: s/artikel/article/g. Thanks to David N. Welton for + spotting it. + + -- Jan Schulz Fri, 6 Feb 2004 21:35:36 +0100 + +eclipse (2.1.2-1) unstable; urgency=low + + * New Upstream release: Only maintainance, no new features. (Closes: #224104) + . New version needs to be intialized after installation. Added a + postinst call in platform and jdt packages. This call is currently not + failsave due to shortcommings in java policy. It should work on a + current unstable system + * Cleaned up the upstream sourceball a bit (aka: it's not perfect yet), + which resulted in one MB less orig.tar.gz. Basicly a + rm *{macosx,photon,win32,...}* and rm *so. The next upstream version + will be done with CVS and a proper script. + * fixed a bug wrt default WS: I forgot to change the path to the new + java-config file. + * Cleaned up initial $HOME/.eclipse creation. (Closes: #218972) + * Changed the regex in the 'does not startup workaround' to be more + specific. Thanks to David Walluck! + * Add lucene parser.jar from lucene-demos package, so that indexer works + again. Thanks to Anthony W. Juckel for the find. (Closes: #220952) + * Removed old GTK Libs from Build-Depends. I don't think that eclipse is + still working with old gtk versions and I have no system to test. + Use a Gnome >2.2 woody backport, if you want eclipse on a woody system. + * added "libgnomevfs2-dev" to Build-Depends:. Thanks to Hiroshi Miura for + the find. (Closes: #222034) + * added "Copyright: 2000, 2003 IBM and other' in debian/copyright. This is + the String, which is in every java file. + * Add workaround for 'first startup'-bug when two WS are istalled. + + -- Jan Schulz Wed, 17 Dec 2003 00:01:13 +0100 + +eclipse (2.1.1-7) unstable; urgency=low + + * updated patch for emacs keybinding and PDE_build_with_NLS.patch fixed. + Thanks to Takashi Okamoto! + + * -> not uploaded eclipse 2.1.1-6 + * Added sensible-browser (as default) and x-www-browser to view the + help pages. (Closes: #217520) + * the -3 prerm scrips had a bug/typo, which would leave the alternative + installed, when the swt package were removed. This would result in + eclipse not starting up, if the 'ws' value wasn't overwritten at runtime. + Added postinst code to fix this. Thanks for Dominique Devriese for + the bugreport. (closes: #216572) + * added some notes about some locales problems, which results in + strange characters being inserted when doing C&P. The real cause is + reported in bug#200933. (closes: #212767) + * Added "patch (>= 2.5.9)" to build depends, which resolves a problem + when build on woody. Thanks to Anselm Kruis! + * Anselm Kruis also sent a patch to make eclipse be buildable on a plain + woody system together with a gnome2.2 mirror (using old qt and so on). + Many thanks for the work! + . redesign the swt makefiles to accept old qt versions + . add Dependencies for that versions + . add small Howto: debian/README.Backport + * Some minor changes in debian/control and some cleanup debian/rules + * change libswt*java to use java-config files. Included versioned + Conflicts: to force older versions off the system. As I haven't seen + any packages other than the eclipse-platform, the packages don't + provide any fallback to the old behaviour. + * separate some parts of eclipse-platforms README.Debian into FAQ.Debian + * disabled the PDE_build_with_NLS.patch, as it failed to work. I have no + idea why, everything seems fine with that patch. + * replaced the lucene jar with the one from the lucene package. + + * -> not uploaded eclipse 2.1.1-5 + * Eclipse prints a better error message, when it failed while using + /usr/bin/java, which could be unfit to run eclipse. Also changed -cp + into -classpath, so that the error isn't that obscure. (closes: #207830) + * added kde and gnome desktop files. Thanks to Matt Pavlovich + (closes: #209041) + * update eclipse manpage (JAVA_HOME, addsite). + * added '-vm' functionality, which was in the manpage, but not in the + starter skript. Ouups... + + * -> not uploaded eclipse 2.1.1-4: + * Seperated Dependencies and Suggestion from the SWT libs: Not all libs + are needed to use SWT. Also changed the eclipse binary starter + requirements to suggests (see next entry). (Closes:#203966) + * Integrated the launcher capabilities into /usr/bin/eclipse. + The binary launcher is only used for splash screen. It will fail + if the libraries used for displaying this aren't present, but + this won't prevent eclipse from starting. + * ant-optional.jar is now correctly linked. (Closes: #205170) + * Removed platform gtk/motif features: updatemanger was confused, + if two window system versions were present. No functionality was + removed. (Closes: #204791) + * Removed unofficial pde-junit package from eclipse-pde suggest. This + plugin is integrated into upstream source in the next major version. + (Closes: #203964) + * fixed a typo in the *gtk.jars file which prevented the pi jar to + be added to the classpath. (Closes: #217309) + * New standard version (no changes needed). + + -- Jan Schulz Sat, 25 Oct 2003 21:45:03 +0200 + +eclipse (2.1.1-3) unstable; urgency=low + + * copyright: libswt2.1-gtk2-java is partly distributed under LGPL. + * fix the Refactor|Rename problem properly. See 00-refactor-rename.patch + * integrated the patches done by Takashi Okamoto (Thanks for the + fast rebuild!) + * make java building fail in case of an error (Closes:201422). + * missed a plugin in dh_install call. Fixed and test for this added. + * changed the buildprocess to use less space. + * upgraded to debian-policy 3.6.0: no changes needed + * Added some workaround for errors at startup: if any plugins are excluded + from loading, the startscript will remove this entries and start with + all plugins. Closes:#192176 + * removed bashism in /usr/bin/eclipse. Closes:#201235 + * initial support for swt-motif. swt-gtk is still the prefered one + if present. Be aware that eclipse-platform still depends on some gtk + related libs. This will change in the next release. + * different swt versions can be installed next to each other. + . versioned package names + . versioned jar files + . libswt-java is renamed to libswt2.1-java and only a virtual package + . libswt2.1-gtk2-java and libswt2.1-motif-java provide this package + . swt is now under update-alternative (See README.Debian about the way + this is done) + . eclipse has a default -ws, based upon this alternative + * removed the (gtk|motif)-features, as they causes trouble with + the updatemanager, if they are present when the 'other ws' is + used. See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=39889 + + -- Jan Schulz Tue, 15 Jul 2003 23:56:00 +0200 + +eclipse (2.1.1-2) unstable; urgency=low + + * fixed bug C-w don't work correctory when use emacs binding. + See 00-org.eclipse.ui.patch. + * fixed bug export plugin doesn't work when use language pack. + See 00-org.eclipse.pde.build.patch file. + * build with jdk1.3.1 to avoid refactor problem. (closes: #197484) + + -- Takashi Okamoto Sat, 12 Jul 2003 22:29:39 +0900 + +eclipse (2.1.1-1) unstable; urgency=low + + * new upstream version. Only bugfixes, no new features. + o Eclipse crashes with certain gtk themes (closes:#198127) + * converted upstream zip to tar.gz: 10MB less *orig.tar.gz + + -- Jan Schulz Sun, 29 Jun 2003 05:01:43 +0200 + +eclipse (2.1-6) unstable; urgency=low + + * some internal improvements to /usr/bin/eclipse + * eclipse-pde Suggest: eclipse-pde-junit + * updated libswt-java README.Debian to include information + about gcj compile to native. (Closes:#193523) + * Added a new option to $HOME/.eclipse/eclipsrc to *not* use + anti aliased Fonts, which speeds up eclipse. + See /usr/share/doc/eclipse-platform/README.Debian for more info. + eclipse-platform: Suggests: ttf-bitstream-vera + * patch for eclipse launcher to show some debian specific + information in case of a crash and to return proper exit codes. + * Patch for 'Refactor|Rename' problem, when compiled with javac 1.4 + (Closes:#197484) + * changed libswt-java to be only available on 32bit arch. + (Closes:#197409) + * Buildnotes converted to plain text + * Added Takashi Okamoto as co-maintainer + * Conflict with a earlier version of eclipse-nls-sdk, which broke due + to the /usr/lib -> /usr/share change. + * addsite patch cleanups. + + -- Jan Schulz Mon, 23 Jun 2003 23:58:07 +0200 + +eclipse (2.1-5) unstable; urgency=low + + * Changed /usr/local included site from /usr/local/lib/eclipse to + /usr/local/share/eclipse. You need to copy the plugins/features + by hand to make them work again! + + Unofficial version 4.3: + * More fixes for the OutOfMemoryException problem. + Max Memory for ant is now set to 256M, but will + be overwritten(!) in $HOME/.antrc or with an exported + ANT_OPTS variable. Made the errorreport more verbose. + * Fixed a bug in the bugfix *sight*. + * Some smaller cleanups in debian/* + * eclipserc and debug_options are now linked to + /usr/share/doc/eclipse-platform/examples + * added c-shell to Build-Depends and removed kdelibs*-dev + * updated policy version. + * replaced menu-icon with a smaller version. + + Unofficial version 4.2 + * Using JAVA_HOME during buildprozess, if set + * Try to prevent OutOfMemeoryException in ant during java + compilation on 1.3 JDKs. Also make the java building more + failsave. + * eclipse-sdk and eclipse-webdav-ftp are now + "Architecture: all" + + Unofficial version 4.1 + * Changed eclipse home from /usr/lib/eclipse to + /usr/share/eclipse. Native libs and the eclipse launcher + are in /usr/lib/eclipse and have symlinks to the right places. + * Using gtk launcher instead of motif one (Closes: #191873) + * Additonal sites (places to install plugins) can be specified + via -addsite commandline parameter. See + /usr/share/doc/eclipse-platform/README.Debian for more info. + * Using internal precompiled xerces for now until XML4J is + packaged + * Cleanup debian/* files and build-*.sh. Also included is a new + makefile for swt. It now builds on PPC (Closes:#187542) + * Fixed first batch of lintian and linda warnings. Not yet + ready *sight* + * Adding README.Debian to libswt-java + * Included upstream buildlogs + + * New maintainer + + -- Jan Schulz Thu, 22 May 2003 17:51:23 +0200 + +eclipse (2.1-4) unstable; urgency=low + + * Fixed typos and other things in debian/control. (Closes: #190541, #188252) + + -- Takashi Okamoto Sun, 4 May 2003 10:31:03 +0900 + +eclipse (2.1-3) unstable; urgency=low + + * New mechanism to install plugins (using the feature zips). + This finally gives working source plug-ins and right named + features. + * Changed name of eclipse package to eclipse-sdk. + * WebDAV and FTP support package included now. + * Fixed typos and updated README.Debian. + * eclipse startscript can now configured with some default + values. See README.Debian + * Fixed broken links in to the swt*.so files + * Most of above improvements are provided by Jan Schulz. + + -- Takashi Okamoto Thu, 24 Apr 2003 02:59:40 +0200 + +eclipse (2.1-2) unstable; urgency=low + + * fixed broken version. + + -- Takashi Okamoto Wed, 23 Apr 2003 23:10:54 +0900 + +eclipse (2.1-1) unstable; urgency=low + + unofficial 2.1-1: + * New upstream release + * include source plugins to develop plugins. (closes: #186287) + + unofficial 2.1-2: + * fixed following bugs reported by Jan Schulz: + - ant-optional is linked two times (at least two times the same + entry in eclipse-platform.links) + - org.eclipse.jdt-feature is in platform and jdt included. + - error in eclipse.jdt.links: the second link must probably be to + apache and not apahce. + * add debug function for script. (thanks Jan Schulz) + * eclipse args is enable. See eclipse man page. + * create separated packages eclispe-pde and eclipse-source. + * enable emacs key binding for code assist. + + unofficial 2.1-3: + * fixed typo. + * add menu file(/usr/lib/menu/eclipse-platform). + * change local plug-ins install directory. Now it's + /usr/local/lib/eclipse/plugins. + * use included xerces's jars instead of eclipse-xerces packages. + * remove obsolete patch for WorkspaceModelManager.java. + * fixed -vmargs options doesn't work correctly. + + -- Takashi Okamoto Sun, 13 Apr 2003 11:33:31 +0900 + +eclipse (2.0.99-2.1-RC2-1) unstable; urgency=low + + * New upstream release + * add plugins path for /usr/local/eclipse/plugins. + + -- Takashi Okamoto Sat, 8 Mar 2003 23:32:01 +0900 + +eclipse (2.0.99-2.1-RC1-2) unstable; urgency=low + + * use eclipse specific xerces instead of libxerces2-java. + + -- Takashi Okamoto Sun, 2 Mar 2003 18:04:13 +0900 + +eclipse (2.0.99-2.1-RC1-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto Sun, 23 Feb 2003 17:58:10 +0900 + +eclipse (2.0.99-2.1-M5-0.5) unstable; urgency=low + + * fixed dependency at eclipse-platform. + + -- Takashi Okamoto Wed, 19 Feb 2003 22:23:11 +0900 + +eclipse (2.0.99-2.1-M5-0.4) unstable; urgency=low + + * fixed update manager didn't work. + * remove motif binding from SWT. + + -- Takashi Okamoto Sat, 15 Feb 2003 10:05:01 +0900 + +eclipse (2.0.99-2.1-M5-0.3) unstable; urgency=low + + * add debian's description to build id. + * add version dependency. + * rename libeclipse-swt-java to libswt-java. + * use gtk for default SWT binding instead of motif. + + -- Takashi Okamoto Tue, 11 Feb 2003 15:01:50 +0900 + +eclipse (2.0.99-2.1-M5-0.2) unstable; urgency=low + + * Rename package version. + + -- Takashi Okamoto Sun, 9 Feb 2003 15:49:26 +0900 + +eclipse (2.0.99_2.1M5-0.1) unstable; urgency=low + + * New updtream. + + -- Takashi Okamoto Sat, 8 Feb 2003 23:48:22 +0900 + +eclipse (2.0.2-0.4) stable; urgency=low + + * add j2sdk1.3 and j2sdk1.4 dependency to convinience install. + + -- Takashi Okamoto Sun, 15 Dec 2002 13:32:21 +0900 + +eclipse (2.0.2-0.3) unstable; urgency=low + + * add lacked build-depends. + + -- Takashi Okamoto Thu, 5 Dec 2002 11:09:34 +0900 + +eclipse (2.0.2-0.2) unstable; urgency=low + + * fixed lintian error. + * add dependency for xerces2, junit and ant. + * add manual page. + * fixed -data option doesn't work. + + -- Takashi Okamoto Thu, 21 Nov 2002 11:09:34 +0900 + +eclipse (2.0.2-0.1) unstable; urgency=low + + * New upstream. + + -- Takashi Okamoto Sat, 16 Nov 2002 11:07:09 +0900 + +eclipse (2.0.1-0.2) unstable; urgency=low + + * add some dependency. + * clean up build script build.sh. + * clean up bootstrap script /usr/bin/eclipse + + -- Takashi Okamoto Fri, 1 Nov 2002 19:18:51 +0900 + +eclipse (2.0.1-0.1) unstable; urgency=low + + * Initial Exprerimental Release. + + -- Takashi Okamoto Sun, 27 Oct 2002 16:27:07 +0900 + +Local variables: +mode: debian-changelog +End: --- eclipse-3.4.1.orig/debian/eclipse-source.install +++ eclipse-3.4.1/debian/eclipse-source.install @@ -0,0 +1,147 @@ +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*_* +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_* + +debian/linda/eclipse-source /usr/share/linda/overrides +debian/lintian/eclipse-source /usr/share/lintian/overrides --- eclipse-3.4.1.orig/debian/eclipse-rcp.prerm +++ eclipse-3.4.1/debian/eclipse-rcp.prerm @@ -0,0 +1,17 @@ +#! /bin/sh -e + +# Remove empty directories in /usr/local + +rmdir /usr/local/lib/eclipse/features 2>/dev/null && \ + rmdir /usr/local/lib/eclipse/plugins 2>/dev/null && \ + rm /usr/local/lib/eclipse/.eclipseextension 2>/dev/null && \ + rmdir /usr/local/lib/eclipse 2>/dev/null || \ + true + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- eclipse-3.4.1.orig/debian/control.in +++ eclipse-3.4.1/debian/control.in @@ -0,0 +1,162 @@ +Source: eclipse +Section: devel +Priority: optional +Maintainer: Debian Java Maintainers +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@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 +Homepage: http://www.eclipse.org/ + +Package: eclipse-rcp +Architecture: any +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 +Description: Eclipse rich client platform + 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. + +Package: eclipse-platform +Architecture: any +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 +Suggests: eclipse-jdt, eclipse-pde +Description: Eclipse platform without plug-ins to develop any language + 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. + +Package: eclipse-cvs +Architecture: any +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 +Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), junit4, @ANT_DEP@ +Recommends: eclipse-jdt-gcj, eclipse +Replaces: eclipse-jdt-common +Conflicts: eclipse-jdt-common +Description: Java Development Tools plug-ins for Eclipse + 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. + +Package: eclipse-pde +Architecture: any +Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version}) +Recommends: eclipse-pde-gcj, eclipse-source (>= ${binary:Version}), eclipse +Replaces: eclipse-pde-common +Conflicts: eclipse-pde-common +Description: Plug-in Development Environment to develop Eclipse plug-ins + Plug-in development environment provides tools to easily develop your own + Eclipse plug-ins. + +Package: eclipse-source +Architecture: any +Depends: eclipse-platform (= ${binary:Version}) +Description: Eclipse source code plug-ins + This package provides the additional source code plug-ins used for code lookup + (debugger, code completion) and plug-in development. + +Package: eclipse-sdk +Architecture: all +Depends: eclipse (>= ${binary:Version}) +Description: Extensible Tool Platform and Java IDE + 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. + . + Dummy package for the transition to eclipse package + +Package: eclipse +Architecture: any +Depends: eclipse-jdt (= ${binary:Version}), eclipse-pde (= ${binary:Version}), eclipse-source (= ${binary:Version}), zenity, ${shlibs:Depends} +Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1) +Recommends: eclipse-gcj +Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2) +Description: Extensible Tool Platform and Java IDE + 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 Eclipse SDK, which includes the Java Development + Tools and Plug-in Development Tools. + +Package: libswt3.4-gtk-java +Architecture: any +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 + for the Eclipse platform. + . + This version of SWT is implemented using gtk2 libraries. + +Package: libswt3.4-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, 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: 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 + from outside of Eclipse. Use this utility to format your code from a shell. --- eclipse-3.4.1.orig/debian/eclipse-platform-gcj.install +++ eclipse-3.4.1/debian/eclipse-platform-gcj.install @@ -0,0 +1,69 @@ +/usr/lib/gcj/eclipse/org.apache.lucene_*.jar.?? + +/usr/lib/gcj/eclipse/com.ibm.icu_*.?? +/usr/lib/gcj/eclipse/com.ibm.icu.base_*.?? +/usr/lib/gcj/eclipse/com.jcraft.jsch_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.platform_*/platform.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.platform_*/startup.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ant.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.compare_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.boot_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.contenttype_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.filebuffers_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.filesystem*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.jobs_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.resources_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.resources.compatibility_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.runtime.compatibility_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.runtime.compatibility.auth_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.runtime.compatibility.registry_*/runtime_registry_compatibility.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.variables_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.debug.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.debug.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.equinox.common_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.equinox.preferences_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.equinox.registry_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.help.appserver_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.help.base_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.help.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.help.webapp_* +/usr/lib/gcj/eclipse/org.eclipse.jface_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jface.databinding_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jface.text_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ltk.core.refactoring_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ltk.ui.refactoring_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.osgi.services_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.platform.doc.isv_*.?? +/usr/lib/gcj/eclipse/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.osgi.util_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.search_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.cvs.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.text_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.tomcat_*/*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.browser_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.cheatsheets_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.console_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.editors_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.externaltools_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.forms_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.ide_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.intro_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.intro.universal_*/universal.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.intro.navigator_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.intro.navigator.resources_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.presentations.r21_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.views_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.views.properties.tabbed_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.workbench.texteditor_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.update.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.update.scheduler_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.update.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.resources.linux_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.update.core.linux_*.jar.?? --- eclipse-3.4.1.orig/debian/eclipse.manpages +++ eclipse-3.4.1/debian/eclipse.manpages @@ -0,0 +1 @@ +debian/extra/eclipse.1 --- eclipse-3.4.1.orig/debian/libswt3.4-gtk-jni.install +++ eclipse-3.4.1/debian/libswt3.4-gtk-jni.install @@ -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 --- eclipse-3.4.1.orig/debian/eclipse-rcp.postinst +++ eclipse-3.4.1/debian/eclipse-rcp.postinst @@ -0,0 +1,31 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + DIRS="/usr/local/lib/eclipse \ + /usr/local/lib/eclipse/features \ + /usr/local/lib/eclipse/plugins" + + # Create empty directories in /usr/local + for DIR in $DIRS; do + if [ ! -e $DIR ]; then + mkdir -p $DIR 2> /dev/null || true + chmod 2775 $DIR 2> /dev/null || true + chown root:staff $DIR 2> /dev/null || true + fi + done + + EXT=/usr/local/lib/eclipse/.eclipseextension + + #touch $EXT 2>/dev/null + #chmod 2775 $EXT 2> /dev/null || true + #chown root:staff $EXT 2> /dev/null || true + +fi + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- eclipse-3.4.1.orig/debian/rules +++ eclipse-3.4.1/debian/rules @@ -0,0 +1,661 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DISTRIBUTION := $(shell lsb_release -is) + +BUILD_DEPS := + +export DH_OPTIONS = +export SHELL = /bin/bash + +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. +ECLIPSE_UNOFFICIAL_PLATFORMS := _ppc64_ _sparc_ _sparc64_ _s390_ _hppa_ + +enable_native := no + +ifeq ($(DEB_HOST_ARCH),i386) + enable_native=yes + ECLIPSE_PLATFORM=x86 +endif +ifeq ($(DEB_HOST_ARCH),lpia) + enable_native=yes + ECLIPSE_PLATFORM=x86 +endif +ifeq ($(DEB_HOST_ARCH),ia64) + enable_native=yes + ECLIPSE_PLATFORM=ia64 +endif +ifeq ($(DEB_HOST_ARCH),amd64) + enable_native=yes + ECLIPSE_PLATFORM=x86_64 +endif +ifeq ($(DEB_HOST_ARCH),powerpc) + enable_native=yes + ECLIPSE_PLATFORM=ppc +endif +ifeq ($(ECLIPSE_PLATFORM),) + enable_native=yes + 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/' ) + else + AVAIL_CPUS := $(shell n=$$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1); awk -v n=$$n '/^MemTotal:/ { n2=int($$2/196608); if (n2= 1.6.5-3) +BUILD_DEPS += , ant-optional (>= 1.6.5-3) + +# Eclipse Compiler for Java configuration. +# ECJ_COMPILER Ant compilation adapter class +# ECJ_ANT_RUN command line for invoking Ant with ecj +ECJ_COMPILER=org.eclipse.jdt.core.JDTCompilerAdapter +ECJ_ANT_RUN=$(JAVA_RUN) -cp $(ANT_CLASSPATH) $(ANT_OPTS) -Dbuild.compiler=$(ECJ_COMPILER) $(ANT_CLASS) + +# Variables for package creation. +ECLIPSE_HOME=usr/lib/eclipse +DEBIAN_TMP=$(CURDIR)/debian/tmp +EXTRA=$(CURDIR)/debian/extra + +with_browser := xulrunner +#with_browser := mozilla +#with_browser := firefox +ifeq ($(DISTRIBUTION),Ubuntu) + with_browser := firefox +endif + +with_dpatch = yes +#with_dpatch = no + + +eclipse_patches = \ + eclipse-ant-manifest \ + eclipse-gnuformatterjdt \ + eclipse-gnuformatterjdtui \ + eclipse-libswt-enableall \ + eclipse-awt-libpath \ + eclipse-nativepresentation \ + eclipse-swttools \ + 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 \ +# eclipse-libswt-mozilla-classic \ +# eclipse-javadoc-bootclasspath \ +# eclipse-link-classpathdoc \ +# eclipse-gjdoc-reflection \ +# eclipse-public-applypatch \ +# eclipse-helpindexbuilder \ + +#ifeq ($(with_tomcat),yes) +# eclipse_patches += \ +# eclipse-webapp-tomcat55.dpatch +# eclipse-tomcat55-build.dpatch \ +# eclipse-webapp-tomcat55-newarches.dpatch +# eclipse-tomcat55.dpatch \ +#else +# eclipse_patches += \ +# eclipse-disable-tomcat +#endif + +ifeq ($(with_browser),xulrunner) +# eclipse_patches += \ +# eclipse-libswt-xulrunner \ +# eclipse-libswt-firefox2 \ + +# eclipse-libswt-mozilla-profiles + + ifeq ($(DISTRIBUTION),Ubuntu) + BUILD_DEPS += , libxul-dev + else + BUILD_DEPS += , xulrunner-dev + endif + MOZILLA_DEP = $${shlibs:Depends} + MOZILLA_HOME = /usr/lib/mozilla +endif + +ifeq ($(with_browser),mozilla) + eclipse_patches += \ + eclipse-libswt-mozilla \ + eclipse-libswt-mozilla-profiles + + BUILD_DEPS += , mozilla-dev +# MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) | mozilla-firefox (>= 1.0.7) + MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) + MOZILLA_HOME = /usr/lib/mozilla +endif + +ifeq ($(with_browser),firefox) +# 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) + MOZILLA_DEP = firefox (>= 1.4.99) + MOZILLA_HOME = /usr/lib/firefox +endif + +export PATCHLIST = $(eclipse_patches) + +debian/control: debian/control.in debian/rules + sed -e 's/@ANT_DEP@/$(ANT_DEP)/g' \ + -e 's/@MOZILLA_DEP@/$(MOZILLA_DEP)/g' \ + -e 's/@BUILD_DEPS@/$(BUILD_DEPS)/g' \ + -e 's,@SECTION_PREFIX@,$(SECTION_PREFIX),g' \ + -e 's/ ,/,/g' \ + 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 \ + mv debian/control.tmp debian/control; \ + echo "debian/control did change, please restart the build"; \ + exit 1; \ + fi + + +uncompress: uncompress-stamp +uncompress-stamp: debian/control + dh_testdir + + # The building happens inside the source-tree directory. This makes + # 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. +include /usr/share/dpatch/dpatch.make + +else +patch_ext = dpatch + +patch: patch-stamp +patch-stamp: uncompress-stamp + dh_testdir + + # This patch system was orginally copied off of the one found in cdbs. + + @cd $(SOURCE_TREE); \ + test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name '*.$(patch_ext)' | wc -l) -eq 0 && exit 0; \ + for patch in $(CURDIR)/debian/patches/*.$(patch_ext); do \ + success=""; \ + echo -n "trying patch $$(basename $$patch) at level "; \ + for level in 0 1 2 3; do \ + if test -z "$$success"; then \ + echo -n "$$level..."; \ + if patch -f -p$$level -E --dry-run < $$patch > /dev/null 2>&1; then \ + if patch -f -p$$level -E -V never < $$patch > /dev/null 2>&1; then \ + success=yes; \ + echo "success."; \ + fi; \ + fi; \ + fi; \ + done; \ + if test -z "$$success"; then \ + echo "failure."; \ + exit 1; \ + fi; \ + done + + # This has been modified to work "per-plug-in". Patches are put in the + # debian/patches/plugin directory. They are named with a common pattern + # "_.patch". They are applied automatically, in + # the specified plug-in's directory with an increasing -p argument. + # + # Note: If you are making a patch that only adds files, include a no-op + # modification so the patch only applies at the correct -p level. + + @cd $(SOURCE_TREE); \ + test $$(find $(CURDIR)/debian/patches/plugins/ -maxdepth 1 -name '*.$(patch_ext)' | wc -l) -eq 0 && exit 0; \ + for patch in $(CURDIR)/debian/patches/plugins/*.$(patch_ext); do \ + plugin=$$(basename $$patch | cut -d_ -f1); \ + if test ! -d $(SOURCE_TREE)/plugins/$$plugin/; then \ + echo "invalid plugin $$plugin."; \ + exit 1; \ + fi; \ + cd $(SOURCE_TREE)/plugins/$$plugin/; \ + success=""; \ + echo -n "trying patch $$(basename $$patch) at level "; \ + for level in 0 1 2 3; do \ + if test -z "$$success"; then \ + echo -n "$$level..."; \ + if patch -f -p$$level -E --dry-run < $$patch > /dev/null 2>&1; then \ + if patch -f -p$$level -E -V never < $$patch > /dev/null 2>&1; then \ + success=yes; \ + echo "success."; \ + fi; \ + fi; \ + fi; \ + done; \ + if test -z "$$success"; then \ + echo "failure."; \ + exit 1; \ + fi; \ + done + + touch patch-stamp +endif + +prepare: prepare-stamp +prepare-stamp: patch-stamp + dh_testdir + +ifneq (,$(findstring _$(ECLIPSE_PLATFORM)_,$(ECLIPSE_UNOFFICIAL_PLATFORMS))) + ## Nasty hack to get support for ppc64, s390{,x}, sparc{,64} and hppa + # there is only partial support for ppc64 in 3.3 so we have to remove this + # partial support to get the replacemnt hack to work + find source-tree -name \*ppc64\* | xargs rm -r + # remove ppc64 support from features/org.eclipse.platform.source/feature.xml + # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets + find source-tree -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; + # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq + sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" source-tree/features/org.eclipse.platform.source/build.xml + # replace final occurances with an existing arch + sed --in-place "s/ppc64/x86_64/g" source-tree/features/org.eclipse.platform.source/build.xml + # Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace + # the ia64 strings with ppc64 or s390(x) + for f in $$(find source-tree -name \*ia64\* | grep -v motif | grep -v ia64_32); do \ + mv $$f $$(echo $$f | sed "s/ia64/$(ECLIPSE_PLATFORM)/") ; \ + find $$(echo $$f | sed "s/ia64/$(ECLIPSE_PLATFORM)/") -name eclipse -type f -print | xargs rm -f ; \ + done + find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \; + find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/$(ECLIPSE_PLATFORM)/g" "{}" \; + find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \; +endif + + # A number of the Ant build files have the verbosity increased. This + # simply makes a lot of text. We set it back down here. + find . -type f -name "build.xml" -exec \ + perl -pi -e 's| verbose="true"| verbose="false"|g' \ + {} ';' + + # Disable compiler warnings. + find . -type f -name "build.xml" -exec \ + perl -pi -e 's| $(DEBIAN_TMP)/usr/bin/eclipse + chmod 755 $(DEBIAN_TMP)/usr/bin/eclipse + cp $(EXTRA)/efj.sh $(DEBIAN_TMP)/usr/bin/efj + mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps/ + cp $(EXTRA)/eclipse32.xpm $(DEBIAN_TMP)/usr/share/pixmaps/eclipse32.xpm + mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_HOME)/links/ + cp $(EXTRA)/*.link $(DEBIAN_TMP)/$(ECLIPSE_HOME)/links/ + + touch post-install-stamp + +gcj-install: gcj-install-stamp +gcj-install-stamp: post-install-stamp +ifeq ($(enable_native),yes) + mkdir -p debian/tmp-native + for jar in $$(find $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins ! -type l -name '*.jar'); do \ + case "$$jar" in \ + *ant*.jar|*catalina.jar) continue;; \ + *org.eclipse.jface.text) continue;; \ + *org.eclipse.ui.workbench) continue;; \ + *org.eclipse.ui.forms) continue;; \ + *lucene*) continue;; \ + *junit-4*) continue;; \ + esac; \ + if [ $(DEB_HOST_ARCH) = ia64 ]; then \ + case "$$jar" in \ + *jsch*) continue;; \ + *org.eclipse.osgi*) continue;; \ + esac; \ + fi; \ + djar=$$(echo $$jar | sed 's,$(DEBIAN_TMP),debian/tmp-native,'); \ + ddir=$$(dirname $$djar); \ + if ! cmp --quiet $$jar $$djar; then \ + mkdir -p $$ddir; \ + cp -p $$jar $$djar; \ + fi; \ + done + + $(AOT_COMPILE) -L /usr/lib/gcj/eclipse \ + debian/tmp-native debian/tmp-native/usr/lib/gcj/eclipse +endif + touch gcj-install-stamp + +binary-indep: DH_OPTIONS=-i +binary-indep: install-stamp + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_fixperms + + dh_makeshlibs + dh_shlibdeps + dh_compress + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + + +ifeq ($(enable_native),yes) +binary-arch: DH_OPTIONS=-s +else +binary-arch: DH_OPTIONS=-s $(foreach p,$(DEB_GCJ_PACKAGES),-N$(p)-gcj) +endif +binary-arch: install-stamp + dh_testdir + dh_testroot + dh_listpackages +ifeq ($(enable_native),yes) + 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/ || true; \ + done +# don't merge classmaps yet. makes debugging easier +# $(MAKE) -f debian/rules generate-classmaps + dh_nativejava --onlyscripts $(foreach p,$(DEB_GCJ_PACKAGES),-p$(p)-gcj) +endif + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_fixperms + + dh_strip + dh_compress + dh_makeshlibs + dpkg-shlibdeps \ + -dDepends \ + 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.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 + dh_builddeb + + +binary: binary-indep binary-arch + +generate-classmaps: + + # After all packages have been installed, generate the GCJ native + # mapping database for each package. +ifeq ($(enable_native),yes) + @for package in $(DEB_GCJ_PACKAGES); do \ + echo "generating classmaps for $${package} ... "; \ + mkdir -p debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d; \ + if test -d debian/$${package}/$(ECLIPSE_HOME)/plugins; then \ + ( cd debian/$${package}/$(ECLIPSE_HOME)/plugins && \ + for jar in $$(find . -name '*.jar' -type f); do \ + echo ' ' $${package}/$(ECLIPSE_HOME)/plugins/$${jar} '->' $(GCJ_JARDIR)/$${jar}.so; \ + $(GCJ_DBTOOL) \ + -f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d/$${package}.db \ + $${jar} $(GCJ_JARDIR)/$${jar}.so || exit 1; \ + done ); \ + fi; \ + done + + # TODO: Is this the second time to do this? + @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 \ + ( cd debian/$${package}-java/$(ECLIPSE_HOME)/plugins && \ + for jar in $$(find . -name '*.jar' -type f); do \ + echo ' ' $${package}-java/$(ECLIPSE_HOME)/plugins/$${jar} '->' $(GCJ_JARDIR)/$${jar}.so; \ + $(GCJ_DBTOOL) \ + -f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d/$${package}.db \ + $${jar} $(GCJ_JARDIR)/$${jar}.so || exit 1; \ + done ); \ + fi; \ + done +endif + + +clean: + dh_testdir + + 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 + dh_clean --- eclipse-3.4.1.orig/debian/eclipse-efj.install +++ eclipse-3.4.1/debian/eclipse-efj.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/efj --- eclipse-3.4.1.orig/debian/libswt3.4-gtk-jni.dirs +++ eclipse-3.4.1/debian/libswt3.4-gtk-jni.dirs @@ -0,0 +1 @@ +usr/lib/jni --- eclipse-3.4.1.orig/debian/eclipse-platform.preinst +++ eclipse-3.4.1/debian/eclipse-platform.preinst @@ -0,0 +1,19 @@ +#!/bin/sh + +# Fix for #345724, #345749 and #346224. +case "$1" in + upgrade) + featuredir=/usr/lib/eclipse/features + if [ -h $featuredir ]; then + rm -f $featuredir + mkdir $featuredir + for i in `ls /usr/share/eclipse/features`; do + ( cd $featuredir ; ln -s /usr/share/eclipse/features/$i . ) + done + fi +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- eclipse-3.4.1.orig/debian/eclipse-pde.install +++ eclipse-3.4.1/debian/eclipse-pde.install @@ -0,0 +1,22 @@ +debian/tmp/usr/lib/eclipse/features/org.eclipse.pde_* + +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.build_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.core_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.doc.user_* +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 --- eclipse-3.4.1.orig/debian/eclipse-cvs.install +++ eclipse-3.4.1/debian/eclipse-cvs.install @@ -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 --- eclipse-3.4.1.orig/debian/NEWS.Debian +++ eclipse-3.4.1/debian/NEWS.Debian @@ -0,0 +1,10 @@ +eclipse (3.1.0-1) unstable; urgency=low + + This is the first release of the Eclipse 3.1 packages for Debian. If you + have any third party plugins for Eclipse 2.1 they will most likely not + function on Eclipse 3.1. This release has should be able to run properly on + an open source Java Virtual Machine such as GCJ. To alter the virtual + machine list, edit /etc/eclipse/java_home. You may also override this per + user by setting JAVA_HOME in ~/.eclipse/eclipserc. + + -- Jerry Haltom Sun, 16 Jan 2005 23:19:12 -0600 --- eclipse-3.4.1.orig/debian/eclipse-jdt-gcj.install +++ eclipse-3.4.1/debian/eclipse-jdt-gcj.install @@ -0,0 +1,16 @@ +/usr/lib/gcj/eclipse/org.eclipse.ant.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.core.manipulation_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.debug.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.launching_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.debug_*/jdi.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.debug_*/jdimodel.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.doc.isv_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.doc.user_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.junit4.runtime_*/junitruntime.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.jdt.junit_*/junitsupport.jar.?? +/usr/lib/gcj/eclipse/org.junit_* +/usr/lib/gcj/eclipse/org.junit4_* --- eclipse-3.4.1.orig/debian/copyright +++ eclipse-3.4.1/debian/copyright @@ -0,0 +1,306 @@ +This package was debianized by Michael Koch on +Wed, 07 Jul 2005 06:05:12 +0100. + +It was downloaded from: +http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/download.php?dropFile=eclipse-sourceBuild-srcIncluded-3.1.1.zip + +This software is copyright (c) 2000, 2005 IBM Corporation and others. + +Copyright: + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE +PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' +from a Contributor if it was added to the Program by such Contributor itself +or anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license +agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, +and such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of +the Contribution and the Program if, at the time the Contribution is added +by the Contributor, such addition of the Contribution causes such +combination to be covered by the Licensed Patents. The patent license shall +not apply to any other combinations which include the Contribution. No +hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within +the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim +at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON +AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER +EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR +CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement , +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs or +equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by +the parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and +does not cure such failure in a reasonable period of time after becoming +aware of such noncompliance. If all Recipient's rights under this Agreement +terminate, Recipient agrees to cease use and distribution of the Program as +soon as reasonably practicable. However, Recipient's obligations under this +Agreement and any licenses granted by Recipient relating to the Program +shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but +in order to avoid inconsistency the Agreement is copyrighted and may only +be modified in the following manner. The Agreement Steward reserves the +right to publish new versions (including revisions) of this Agreement from +time to time. No one other than the Agreement Steward has the right to +modify this Agreement. The Eclipse Foundation is the initial Agreement +Steward. The Eclipse Foundation may assign the responsibility to serve as +the Agreement Steward to a suitable separate entity. Each new version of +the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version +of the Agreement under which it was received. In addition, after a new +version of the Agreement is published, Contributor may elect to distribute +the Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or otherwise. +All rights in the Program not expressly granted under this Agreement are +reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to +this Agreement will bring a legal action under this Agreement more than +one year after the cause of action arose. Each party waives its rights to +a jury trial in any resulting litigation. + +------------------------------------------------------------------------------ + +icu4j was downloaded from +ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar + +Copyright Holder: IBM and contributors + +License: + +ICU4J license - ICU4J 1.3.1 and later + + COPYRIGHT AND PERMISSION NOTICE + + Copyright (c) 1995-2006 International Business Machines Corporation + and others + + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, and/or sell copies of the Software, and to permit persons + to whom the Software is furnished to do so, provided that the above + copyright notice(s) and this permission notice appear in all copies of + the Software and that both the above copyright notice(s) and this + permission notice appear in supporting documentation. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + Except as contained in this notice, the name of a copyright holder + shall not be used in advertising or otherwise to promote the sale, use + or other dealings in this Software without prior written authorization + of the copyright holder. + _________________________________________________________________ + + All trademarks and registered trademarks mentioned herein are the + property of their respective owners. + +------------------------------------------------------------------------------ + +jsch was downloaded from http://www.sourceforget.net/jsch + +License: + +------------------------------------------------------------------------------ +Copyright (c) 2002,2003,2004 Atsuhiko Yamanaka, JCraft,Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- eclipse-3.4.1.orig/debian/eclipse-rcp-gcj.install +++ eclipse-3.4.1/debian/eclipse-rcp-gcj.install @@ -0,0 +1,10 @@ +/usr/lib/gcj/eclipse/org.eclipse.rcp_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.commands_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.expressions_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.core.runtime_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.help_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.osgi_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.swt_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.ui.workbench_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.update.configurator_*.jar.?? --- eclipse-3.4.1.orig/debian/libswt3.4-gtk-java.install +++ eclipse-3.4.1/debian/libswt3.4-gtk-java.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/java/*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt.gtk* --- eclipse-3.4.1.orig/debian/compat +++ eclipse-3.4.1/debian/compat @@ -0,0 +1 @@ +4 --- eclipse-3.4.1.orig/debian/eclipse.install +++ eclipse-3.4.1/debian/eclipse.install @@ -0,0 +1,15 @@ +debian/extra/java_home etc/eclipse + +debian/tmp/usr/share/pixmaps/eclipse*.png +debian/tmp/usr/share/pixmaps/eclipse32.xpm +debian/tmp/usr/lib/eclipse/eclipse +debian/tmp/usr/bin/eclipse usr/bin + +debian/tmp/usr/share/applications/eclipse.desktop + +debian/tmp/usr/lib/eclipse/features/org.eclipse.sdk_* + +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.sdk_* + +debian/linda/eclipse usr/share/linda/overrides +debian/lintian/eclipse usr/share/lintian/overrides --- eclipse-3.4.1.orig/debian/eclipse-platform.dirs +++ eclipse-3.4.1/debian/eclipse-platform.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides --- eclipse-3.4.1.orig/debian/eclipse-rcp.install +++ eclipse-3.4.1/debian/eclipse-rcp.install @@ -0,0 +1,37 @@ +debian/tmp/usr/lib/eclipse/features/org.eclipse.rcp_* + +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.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 --- eclipse-3.4.1.orig/debian/watch +++ eclipse-3.4.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/R-([\d\.-]*)/eclipse-sourceBuild-srcIncluded-(.*)\.zip --- eclipse-3.4.1.orig/debian/eclipse.dirs +++ eclipse-3.4.1/debian/eclipse.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/share/applications +usr/share/man/man1 +usr/share/pixmaps +etc/eclipse --- eclipse-3.4.1.orig/debian/source.lintian-overrides +++ eclipse-3.4.1/debian/source.lintian-overrides @@ -0,0 +1 @@ +eclipse source: dpatch-build-dep-but-no-patch-list eclipse --- eclipse-3.4.1.orig/debian/control.in.gcj +++ eclipse-3.4.1/debian/control.in.gcj @@ -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. --- eclipse-3.4.1.orig/debian/eclipse-pde-gcj.install +++ eclipse-3.4.1/debian/eclipse-pde-gcj.install @@ -0,0 +1,8 @@ +/usr/lib/gcj/eclipse/org.eclipse.pde_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.core_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.doc.user_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.runtime_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.ui_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.build_*/pdebuild.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.junit.runtime_*.jar.?? +/usr/lib/gcj/eclipse/org.eclipse.pde.junit.runtime_*/pdejunit.jar.?? --- eclipse-3.4.1.orig/debian/eclipse-platform.install +++ eclipse-3.4.1/debian/eclipse-platform.install @@ -0,0 +1,135 @@ +debian/tmp/usr/lib/eclipse/.eclipseproduct +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.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.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/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.user_* +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.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.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 --- eclipse-3.4.1.orig/debian/eclipse-platform.postrm +++ eclipse-3.4.1/debian/eclipse-platform.postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf /usr/share/eclipse +fi + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- eclipse-3.4.1.orig/debian/eclipse-jdt.install +++ eclipse-3.4.1/debian/eclipse-jdt.install @@ -0,0 +1,20 @@ +debian/tmp/usr/lib/eclipse/features/org.eclipse.jdt_* + +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ant.ui_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.core.manipulation_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.debug_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.debug.ui_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.doc.isv_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.doc.user_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit.runtime_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit4.runtime_* +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.launching_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.ui_*.jar +debian/tmp/usr/lib/eclipse/plugins/org.junit_* +debian/tmp/usr/lib/eclipse/plugins/org.junit4_* + +debian/linda/eclipse-jdt /usr/share/linda/overrides +debian/lintian/eclipse-jdt /usr/share/lintian/overrides --- eclipse-3.4.1.orig/debian/control +++ eclipse-3.4.1/debian/control @@ -0,0 +1,162 @@ +Source: eclipse +Section: devel +Priority: optional +Maintainer: Debian Java Maintainers +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), firefox-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 +Homepage: http://www.eclipse.org/ + +Package: eclipse-rcp +Architecture: any +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 +Description: Eclipse rich client platform + 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. + +Package: eclipse-platform +Architecture: any +Depends: openjdk-6-jre, default-jre | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), firefox (>= 1.4.99) +# 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 +Suggests: eclipse-jdt, eclipse-pde +Description: Eclipse platform without plug-ins to develop any language + 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. + +Package: eclipse-cvs +Architecture: any +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 +Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), junit4, ant-optional (>= 1.6.5-3) +Recommends: eclipse-jdt-gcj, eclipse +Replaces: eclipse-jdt-common +Conflicts: eclipse-jdt-common +Description: Java Development Tools plug-ins for Eclipse + 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. + +Package: eclipse-pde +Architecture: any +Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version}) +Recommends: eclipse-pde-gcj, eclipse-source (>= ${binary:Version}), eclipse +Replaces: eclipse-pde-common +Conflicts: eclipse-pde-common +Description: Plug-in Development Environment to develop Eclipse plug-ins + Plug-in development environment provides tools to easily develop your own + Eclipse plug-ins. + +Package: eclipse-source +Architecture: any +Depends: eclipse-platform (= ${binary:Version}) +Description: Eclipse source code plug-ins + This package provides the additional source code plug-ins used for code lookup + (debugger, code completion) and plug-in development. + +Package: eclipse-sdk +Architecture: all +Depends: eclipse (>= ${binary:Version}) +Description: Extensible Tool Platform and Java IDE + 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. + . + Dummy package for the transition to eclipse package + +Package: eclipse +Architecture: any +Depends: eclipse-jdt (= ${binary:Version}), eclipse-pde (= ${binary:Version}), eclipse-source (= ${binary:Version}), zenity, ${shlibs:Depends} +Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1) +Recommends: eclipse-gcj +Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2) +Description: Extensible Tool Platform and Java IDE + 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 Eclipse SDK, which includes the Java Development + Tools and Plug-in Development Tools. + +Package: libswt3.4-gtk-java +Architecture: any +Depends: libswt3.4-gtk-jni (= ${binary:Version}), java-common +Recommends: libswt3.4-gtk-gcj, firefox (>= 1.4.99) +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 + for the Eclipse platform. + . + This version of SWT is implemented using gtk2 libraries. + +Package: libswt3.4-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, 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: 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 + from outside of Eclipse. Use this utility to format your code from a shell. --- eclipse-3.4.1.orig/debian/eclipse.menu +++ eclipse-3.4.1/debian/eclipse.menu @@ -0,0 +1,8 @@ +?package(eclipse):\ + needs="X11"\ + section="Applications/Programming"\ + title="Eclipse"\ + longtitle="Integrated Development Environment"\ + command="/usr/bin/eclipse"\ + icon="/usr/share/pixmaps/eclipse32.xpm" + --- eclipse-3.4.1.orig/debian/lintian/eclipse-platform +++ eclipse-3.4.1/debian/lintian/eclipse-platform @@ -0,0 +1,282 @@ +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/eclipse_update_120.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/maximize.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_search_results_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/container_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/topic.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/print_edit.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/minus.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_maximize.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/restore.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_back.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_bookmarks_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_home.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_print_edit.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/toc_closed.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/bookmark_remall.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_forward.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/d_topic.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_index_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_contents_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/plus.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/add_bkmrk.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_add_bkmrk.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_bookmark_remall.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_synch_toc_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/home.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_restore.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/back.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/bookmark_rem.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_show_all.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_bookmark_rem.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/show_all.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_synch_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/synch_toc_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/synch_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/forward.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/e_links_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/help_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/toc_open.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/advanced/images/index_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/e_links_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/bookmark_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/container_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/e_contents_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/synch_toc_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/topic.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/toc_open.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/e_index_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/toc_closed.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/e_search_results_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/bookmarks_view.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.help.webapp_3.2.2.R322_v20061114/basic/images/e_synch_toc_nav.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/wbbasics_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/updates_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/migratehov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/migrate_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/wbbasicshov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/communityhov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/teamsuphov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/teamsup_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/community_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/obj48/updateshov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro/css/graphics/arrow.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse32.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/intro-eclipse.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse_lg.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform_3.2.2.r322_v20070117b/eclipse48.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/ilow_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/ihigh_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/image_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/icallout_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/extension_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/obj16/inew_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/full/elcl16/configure.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/icons/welcome16.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/webrsrc72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/samples48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/whatsnew48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/webrsrc48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/firsteps72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/overview48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/migrate48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/whatsnew48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/tutorials72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/back.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/wb48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/webrsrc48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/home.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/forward.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/migrate48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/firsteps48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/firsteps48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/overview72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/migrate72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/overview48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/whatsnew72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/samples72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/tutorials48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/tutorials48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/etool/samples48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/samples48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/forward.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/overview48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/firsteps16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/webrsrc72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/whatsnew48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/samples16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/migrate72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/samples48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/overview72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/wb16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/migrate48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/tutorials72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/whatsnew16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/firsteps72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/tutorials48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/wb48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/webrsrc16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/samples72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/overview16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/webrsrc48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/home.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/webrsrc48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/tutorials16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/migrate48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/whatsnew48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/whatsnew72.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/firsteps48sel.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/overview48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/back.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/tutorials48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/migrate16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/ctool/firsteps48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/dtool/forward.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/dtool/back.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/obj48/newhov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/icons/obj48/new_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/firststeps16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/tutorials.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/webresources16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/whatsnew.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/migrate16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/samples.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/launchbar/overview.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/migrate_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/backgroundcurve.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/overview_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/section3.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/firsteps_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/section4.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/webrsrc_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/tutorials_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/section1.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/samples_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/whatsnew_wtr.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/background.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/contentpage/section2.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/swt/form_banner.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/root/dots.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/root/background.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/graphics/root/brandmark.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/purpleMesh/preview.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/tutorials16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/firststeps16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/webresources16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/migrate16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/samples16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/whatsnew16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/launchbar/overview16.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/cpt_bottomhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/root_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wr_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/nav_rightedgehov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/cpt_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/fs_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tutorials_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/sa_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/sa_onesample48.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/nav_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wr_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tu_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/firststeps.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wn_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/firststeps.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tutorials.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tutorials.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wn_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/root_bottomhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/migrate_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/fs_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/fs_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/sa_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/fs_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/whatsnew.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/whatsnew.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/whatsnew_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/overview_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wn_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tu_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wr_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/root_midhov2.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/samples.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav_rightedgehov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/samples.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/samples_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wn_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/content_nav_bar.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wb_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/migrate.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/migrate.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wb_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/webresources.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/webresources.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/overview_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/mi_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/mi_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/sa_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/workbench_midhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/overview.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/overview.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/workbench_bottomhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tu_nav.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/ov_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/mi_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wr_nav_32.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/wb_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/workbench.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/mi_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/workbench.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/firststeps_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/sa_nav_64.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/overview_bottomhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/workbench_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/tu_nav_hover.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/ctool/webresources_tophov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/obj48/newhov_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/icons/obj48/new_obj.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/sa_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/ov_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wn_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/mi_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/ov_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/fs_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wr_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/mi_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/fs_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wb_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wn_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wb_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/sa_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/wr_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/tu_standbyhov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/standby/tu_standby.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/rootpage/welcomebckgrd.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/mi_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/tu_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/fs_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/sa_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/wr_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/ov_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/graphics/contentpage/wn_banner.jpg +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/circles/preview.png +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/icons/ctool/widget_closed.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/icons/ctool/widget_closed_hov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/icons/ctool/widget_open.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/icons/ctool/widget_open_hov.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/wn-fs_high.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/tu-sa_high.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/grey_callout.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/tu-sa_med.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/ov_med.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/ov_high.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/wr-mi_med.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/wn-fs_med.gif +eclipse-platform: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.ui.intro.universal_3.2.1.R321_v20060905/themes/shared/graphics/contentpage/wr-mi_high.gif --- eclipse-3.4.1.orig/debian/lintian/eclipse-jdt +++ eclipse-3.4.1/debian/lintian/eclipse-jdt @@ -0,0 +1,81 @@ +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.jdt_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-/eclipse_update_120.jpg +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss8.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss3.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff4.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff9.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss9.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss4.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff3.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff8.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss5.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff2.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff7.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss6.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff1.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss1.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff6.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss7.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ss2.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/prgss/ff5.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/relaunch.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/select_prev.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/lock.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/th_horizontal.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/compare.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/th_automatic.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/hierarchicalLayout.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/stop.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/cfilter.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/history_list.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/flatLayout.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/select_next.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/th_vertical.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/elcl16/relaunchf.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testhier.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/exc_catch.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/julaunch.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/failures.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testfail.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/test.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/tsuiterun.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testok.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/faillist.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/tsuiteok.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/tsuiteerror.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/tsuitefail.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testrun.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testignored.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/tsuite.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/stkfrm_obj.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/obj16/testerr.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/th_vertical.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/history_list.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/stop.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/compare.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/select_next.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/cfilter.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/lock.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/relaunch.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/th_automatic.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/th_horizontal.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/relaunchf.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dlcl16/select_prev.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/juniterrq.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/junitsucc.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/junit.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/junitsuccq.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/stackframe.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/eview16/juniterr.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/ovr16/error_ovr.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/ovr16/failed_ovr.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/ovr16/success_ovr.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/etool16/runjunit.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/etool16/new_testsuite.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/etool16/debugjunit.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/etool16/new_testcase.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/wizban/newsuite_wiz.png +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/wizban/newtest_wiz.png +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dtool16/runjunit.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dtool16/debugjunit.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dtool16/new_testsuite.gif +eclipse-jdt: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.junit_3.2.1.r321_v20060810/icons/full/dtool16/new_testcase.gif --- eclipse-3.4.1.orig/debian/lintian/eclipse +++ eclipse-3.4.1/debian/lintian/eclipse @@ -0,0 +1,9 @@ +eclipse: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.sdk_3.2.2.r322_v20070104-OIsEN15kfLend_i/eclipse_update_120.jpg +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse48.png +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse.gif +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/intro-eclipse.png +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse32.gif +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse_lg.gif +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse48.gif +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse.png +eclipse: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.sdk_3.2.2.r322_v20070212/eclipse32.png --- eclipse-3.4.1.orig/debian/lintian/eclipse-pde +++ eclipse-3.4.1/debian/lintian/eclipse-pde @@ -0,0 +1 @@ +eclipse-pde: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.pde_3.2.1.r321_v20060823-6vYLLdQ3Nk8DrFG/eclipse_update_120.jpg --- eclipse-3.4.1.orig/debian/lintian/eclipse-source +++ eclipse-3.4.1/debian/lintian/eclipse-source @@ -0,0 +1,8 @@ +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/eclipse_update_120.jpg +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/eclipse_update_120.jpg +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.jdt.source_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-/eclipse_update_120.jpg +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.pde.source_3.2.1.r321_v20060823-6vYLLdQ3Nk8DrFG/eclipse_update_120.jpg +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.pde.source_3.2.1.r321_v20060823-6vYLLdQ3Nk8DrFG/eclipse32.png +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/eclipse32.png +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/eclipse32.png +eclipse-source: image-file-in-usr-lib usr/lib/eclipse/plugins/org.eclipse.jdt.source_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-/eclipse32.png --- eclipse-3.4.1.orig/debian/lintian/eclipse-rcp +++ eclipse-3.4.1/debian/lintian/eclipse-rcp @@ -0,0 +1 @@ +eclipse-rcp: image-file-in-usr-lib usr/lib/eclipse/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/eclipse_update_120.jpg --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-mozilla-classic.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-mozilla-classic.dpatch @@ -0,0 +1,188 @@ +#! /bin/sh -e +## +## DP: Patch to set the classic theme for the browser widget to improve the +## DP: L&F of the widget(https://bugs.eclipse.org/bugs/show_bug.cgi?id=108257) + +[ -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 + +@DPATCH@ +diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java +--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java 2005-10-29 22:31:31.000000000 +0200 +@@ -0,0 +1,44 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is Mozilla Communicator client code, released March 31, 1998. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by Netscape are Copyright (C) 1998-1999 ++ * Netscape Communications Corporation. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * IBM ++ * - Binding to permit interfacing between Mozilla and SWT ++ * - Copyright (C) 2003 IBM Corp. All Rights Reserved. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++package org.eclipse.swt.internal.mozilla; ++ ++ ++public class nsIChromeRegistry extends nsISupports { ++ ++ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3; ++ ++ public static final String NS_ICHROMEREGISTRY_IID_STR = ++ "68389281-f6d0-4533-841d-344a2018140c"; ++ ++ public static final nsID NS_ICHROMEREGISTRY_IID = ++ new nsID(NS_ICHROMEREGISTRY_IID_STR); ++ ++ public nsIChromeRegistry(int /*long*/ address) { ++ super(address); ++ } ++} +diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java +--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java 2005-10-29 22:31:31.000000000 +0200 +@@ -0,0 +1,56 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is Mozilla Communicator client code, released March 31, 1998. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by Netscape are Copyright (C) 1998-1999 ++ * Netscape Communications Corporation. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * IBM ++ * - Binding to permit interfacing between Mozilla and SWT ++ * - Copyright (C) 2003 IBM Corp. All Rights Reserved. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++package org.eclipse.swt.internal.mozilla; ++ ++ ++public class nsIXULChromeRegistry extends nsIChromeRegistry { ++ ++ static final int LAST_METHOD_ID = nsIChromeRegistry.LAST_METHOD_ID + 29; ++ ++ public static final String NS_IXULCHROMEREGISTRY_IID_STR = ++ "fd1ee2f8-0238-40b0-9b54-27cf810d9c86"; ++ ++ public static final nsID NS_XULCHROMEREGISTRY_IID = ++ new nsID(NS_IXULCHROMEREGISTRY_IID_STR); ++ ++ public nsIXULChromeRegistry(int /*long*/ address) { ++ super(address); ++ } ++ ++ public int SelectSkin(int /*long*/ skinName, boolean useProfile) { ++ return XPCOM.VtblCall(nsIChromeRegistry.LAST_METHOD_ID + 1, getAddress(), skinName, useProfile); ++ } ++ ++ public int SelectLocale(int /*long*/ localeName, boolean useProfile) { ++ return XPCOM.VtblCall(nsIChromeRegistry.LAST_METHOD_ID + 2, getAddress(), localeName, useProfile); ++ } ++ ++ public int SetRuntimeProvider(boolean runtimeProvider) { ++ return XPCOM.VtblCall(nsIChromeRegistry.LAST_METHOD_ID + 10, getAddress(), runtimeProvider); ++ } ++} +diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-10-29 22:19:31.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-10-29 22:31:31.000000000 +0200 +@@ -54,6 +54,7 @@ + public static final String NS_MEMORY_CONTRACTID = "@mozilla.org/xpcom/memory-service;1"; //$NON-NLS-1$ + public static final String NS_PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; //$NON-NLS-1$ + public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$ ++ public static final String NS_CHROMEREGISTRY_CONTRACTID = "@mozilla.org/chrome/chrome-registry;1"; //$NON-NLS-1$ + + /* XPCOM constants */ + public static final int NS_OK = 0; +diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java +--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-10-29 22:19:31.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-10-29 22:38:18.000000000 +0200 +@@ -201,6 +201,41 @@ + rc = windowWatcher.SetWindowCreator(WindowCreator.getAddress()); + if (rc != XPCOM.NS_OK) error(rc); + windowWatcher.Release(); ++ ++ // Get service manager ++ rc = XPCOM.NS_GetServiceManager(result); ++ if (rc != XPCOM.NS_OK) error(rc); ++ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); ++ ++ // Get chrome registry ++ serviceManager = new nsIServiceManager(result[0]); ++ result[0] = 0; ++ buffer = XPCOM.NS_CHROMEREGISTRY_CONTRACTID.getBytes(); ++ aContractID = new byte[buffer.length + 1]; ++ System.arraycopy(buffer, 0, aContractID, 0, buffer.length); ++ rc = serviceManager.GetServiceByContractID(aContractID, nsIXULChromeRegistry.NS_XULCHROMEREGISTRY_IID, result); ++ serviceManager.Release(); ++ ++ if (rc == XPCOM.NS_OK) { ++ // if chrome registry is available ++ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); ++ ++ // Set classic theme ++ nsIXULChromeRegistry chromRegistry = new nsIXULChromeRegistry(result[0]); ++ result[0] = 0; ++ // Set runtime provider ++ rc = chromRegistry.SetRuntimeProvider(true); ++ if (rc != XPCOM.NS_OK) error(rc); ++ // Set theme ++ buffer = "classic/1.0".getBytes(); //$NON-NLS-1$ ++ byte[] aThemeBuffer = new byte[buffer.length + 1]; ++ System.arraycopy(buffer, 0, aThemeBuffer, 0, buffer.length); ++ int /*long*/ aTheme = XPCOM.nsEmbedCString_new(aThemeBuffer, aThemeBuffer.length); ++ rc = chromRegistry.SelectSkin(aTheme, false); ++ XPCOM.nsEmbedCString_delete(aTheme); ++ if (rc != XPCOM.NS_OK) error(rc); ++ chromRegistry.Release(); ++ } + + PromptServiceFactory factory = new PromptServiceFactory(); + factory.AddRef(); --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-mozilla.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-mozilla.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-mozilla.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~ 2006-10-04 13:11:51.242766750 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-10-04 13:20:38.643727250 +0200 +@@ -60,6 +60,17 @@ + ;; + esac + ++case $OS in ++ "Linux") ++ GECKO_INCLUDES="`pkg-config --cflags mozilla-gtkmozembed`" ++ GECKO_LIBS="`pkg-config --libs mozilla-gtkmozembed`" ++ # Set this to something to override the presets ++ GECKO_SDK="_" ++ export GECKO_INCLUDES ++ export GECKO_LIBS ++ MAKE_MOZILLA=make_mozilla ++esac ++ + # For 64-bit CPUs, we have a switch + if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then + SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 --- eclipse-3.4.1.orig/debian/patches/eclipse-jsch.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-jsch.dpatch @@ -0,0 +1,67 @@ +#! /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 + +@DPATCH@ +--- 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 @@ + + + +- ++ + + + +--- 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 @@ + + + +- ++ + + + \ No newline at end of file --- eclipse-3.4.1.orig/debian/patches/eclipse-nativepresentation.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-nativepresentation.dpatch @@ -0,0 +1,493 @@ +#! /bin/sh -e +## +## DP: Enable the internal native presentation and add some +## DP: improvments(https://bugs.eclipse.org/bugs/show_bug.cgi?id=93806) + +[ -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 + +@DPATCH@ +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 +@@ -1221,6 +1221,10 @@ + class="org.eclipse.ui.presentations.WorkbenchPresentationFactory" + id="org.eclipse.ui.presentations.default"> + ++ + + +diff -r -u source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativePresentationFactory.java source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativePresentationFactory.java +--- source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativePresentationFactory.java 2006-10-22 10:33:59.000000000 +0200 ++++ source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativePresentationFactory.java 2006-10-22 10:41:23.000000000 +0200 +@@ -30,7 +30,7 @@ + */ + public StackPresentation createEditorPresentation(Composite parent, + IStackPresentationSite site) { +- return new TabbedStackPresentation(site, new NativeTabFolder(parent), new StandardEditorSystemMenu(site)); ++ return new TabbedStackPresentation(site, new NativeTabFolder(parent, site), new StandardEditorSystemMenu(site)); + } + + /* +@@ -40,7 +40,7 @@ + */ + public StackPresentation createViewPresentation(Composite parent, + IStackPresentationSite site) { +- return new TabbedStackPresentation(site, new NativeTabFolder(parent), new StandardViewSystemMenu(site)); ++ return new TabbedStackPresentation(site, new NativeTabFolder(parent, site), new StandardViewSystemMenu(site)); + } + + /* +@@ -51,8 +51,7 @@ + public StackPresentation createStandaloneViewPresentation(Composite parent, + IStackPresentationSite site, boolean showTitle) { + // TODO honour showTitle +- return new TabbedStackPresentation(site, new NativeTabFolder(parent), +- new StandardViewSystemMenu(site)); ++ return new TabbedStackPresentation(site, new NativeTabFolder(parent, site), new StandardViewSystemMenu(site)); + } + + } +diff -r -u source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabFolder.java source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabFolder.java +--- source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabFolder.java 2006-10-22 10:33:59.000000000 +0200 ++++ source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabFolder.java 2006-10-22 10:41:40.000000000 +0200 +@@ -1,4 +1,4 @@ +-/******************************************************************************* ++ /******************************************************************************* + * Copyright (c) 2004, 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 +@@ -10,75 +10,113 @@ + *******************************************************************************/ + package org.eclipse.ui.internal.presentations.defaultpresentation; + ++import org.eclipse.jface.preference.IPreferenceStore; + import org.eclipse.jface.util.Geometry; + import org.eclipse.swt.SWT; + import org.eclipse.swt.custom.CLabel; + import org.eclipse.swt.custom.ViewForm; ++import org.eclipse.swt.events.*; + import org.eclipse.swt.graphics.Image; + import org.eclipse.swt.graphics.Point; + import org.eclipse.swt.graphics.Rectangle; +-import org.eclipse.swt.widgets.Composite; +-import org.eclipse.swt.widgets.Control; +-import org.eclipse.swt.widgets.Event; +-import org.eclipse.swt.widgets.Listener; +-import org.eclipse.swt.widgets.TabFolder; +-import org.eclipse.swt.widgets.TabItem; +-import org.eclipse.swt.widgets.Widget; ++import org.eclipse.swt.widgets.*; + import org.eclipse.ui.IPropertyListener; ++import org.eclipse.ui.internal.*; + import org.eclipse.ui.internal.dnd.DragUtil; + import org.eclipse.ui.internal.layout.SizeCache; +-import org.eclipse.ui.internal.presentations.util.AbstractTabFolder; +-import org.eclipse.ui.internal.presentations.util.AbstractTabItem; +-import org.eclipse.ui.internal.presentations.util.PartInfo; +-import org.eclipse.ui.internal.presentations.util.ProxyControl; +-import org.eclipse.ui.internal.presentations.util.StandardSystemToolbar; +-import org.eclipse.ui.internal.presentations.util.TabFolderEvent; ++import org.eclipse.ui.internal.presentations.util.*; + import org.eclipse.ui.internal.util.Util; ++import org.eclipse.ui.presentations.*; + + /** + * @since 3.1 + */ + public class NativeTabFolder extends AbstractTabFolder { + +- private TabFolder control; ++ private IStackPresentationSite site; ++ private TabFolder tabFolder; + private ViewForm viewForm; +- private StandardSystemToolbar systemToolbar; + private CLabel title; ++ ++ private ToolBar viewToolBar; ++ private ToolItem menuButton; ++ private ToolItem closeButton; ++ + private ProxyControl topCenter; + private SizeCache topCenterCache; + ++ private IPreferenceStore preferenceStore = WorkbenchPlugin.getDefault().getPreferenceStore(); ++ + private Listener selectionListener = new Listener() { + public void handleEvent(Event e) { + fireEvent(TabFolderEvent.EVENT_TAB_SELECTED, getTab(e.item)); + } + }; + +- private IPropertyListener systemToolbarListener = new IPropertyListener() { +- +- public void propertyChanged(Object source, int propId) { +- Point location; ++ /** ++ * @param parent ++ * @param site ++ */ ++ public NativeTabFolder(Composite parent, final IStackPresentationSite site) { ++ ++ this.site = site; ++ ++ int tabPos = preferenceStore.getInt(IPreferenceConstants.VIEW_TAB_POSITION); ++ ++ tabFolder = new TabFolder(parent, tabPos); ++ tabFolder.addListener(SWT.Selection, selectionListener); ++ attachListeners(tabFolder, false); ++ ++ viewForm = new ViewForm(tabFolder, SWT.FLAT); ++ viewForm.setVisible(false); ++ attachListeners(viewForm, false); ++ ++ addListener(new TabFolderListener() { ++ public void handleEvent(TabFolderEvent e) { + +- if (propId == TabFolderEvent.EVENT_PANE_MENU) { +- location = getPaneMenuLocation(); +- } else { +- location = new Point(0,0); ++ viewForm.setVisible(site.getPartList().length>0); + } +- +- fireEvent(propId, getSelection(), location); +- } ++ }); + +- }; +- +- public NativeTabFolder(Composite parent) { +- control = new TabFolder(parent, SWT.BOTTOM); +- control.addListener(SWT.Selection, selectionListener); +- attachListeners(control, false); ++ viewToolBar = new ToolBar(viewForm, SWT.HORIZONTAL|SWT.FLAT); ++ viewForm.setTopRight(viewToolBar); + +- viewForm = new ViewForm(control, SWT.FLAT); +- attachListeners(viewForm, false); +- systemToolbar = new StandardSystemToolbar(viewForm, true, false, true, true, true); +- systemToolbar.addListener(systemToolbarListener); +- viewForm.setTopRight(systemToolbar.getControl()); ++ menuButton = new ToolItem(viewToolBar, SWT.PUSH); ++ menuButton.setDisabledImage(null); // TODO: comment this out? ++ // PR#1GE56QT - Avoid creation of unnecessary image. ++ menuButton.setImage(WorkbenchImages.getImage(IWorkbenchGraphicConstants.IMG_LCL_VIEW_MENU)); ++ menuButton.setToolTipText("Menu"); //$NON-NLS-1$ ++ menuButton.addSelectionListener(new SelectionAdapter() { ++ public void widgetSelected(SelectionEvent e) { ++ IPresentablePart part = site.getSelectedPart(); ++ if (part == null) ++ return; ++ ++ IPartMenu menu = part.getMenu(); ++ ++ if (menu != null) { ++ menu.showMenu(getPaneMenuLocation()); ++ } ++ } ++ }); ++ ++ closeButton = new ToolItem(viewToolBar, SWT.PUSH); ++ closeButton.setDisabledImage(null); // TODO: comment this out? ++ // PR#1GE56QT - Avoid creation of unnecessary image. ++ closeButton.setImage(WorkbenchImages.getImage(IWorkbenchGraphicConstants.IMG_LCL_CLOSE_VIEW)); ++ closeButton.setToolTipText("Close"); //$NON-NLS-1$ ++ closeButton.addSelectionListener(new SelectionAdapter() { ++ public void widgetSelected(SelectionEvent e) { ++ IPresentablePart part = site.getSelectedPart(); ++ if (part == null) ++ return; ++ ++ fireEvent(TabFolderEvent.EVENT_CLOSE); ++ if (part != null) { ++ site.close(new IPresentablePart[] { part }); ++ } ++ } ++ }); + + topCenter = new ProxyControl(viewForm); + topCenterCache = new SizeCache(); +@@ -112,7 +150,7 @@ + super.layout(flushCache); + + Rectangle oldBounds = viewForm.getBounds(); +- Rectangle newBounds = control.getClientArea(); ++ Rectangle newBounds = tabFolder.getClientArea(); + + viewForm.setBounds(newBounds); + +@@ -125,16 +163,8 @@ + * @see org.eclipse.ui.internal.presentations.util.AbstractTabFolder#getPaneMenuLocation() + */ + public Point getPaneMenuLocation() { +- return systemToolbar.getPaneMenuLocation(); +- } +- +- /* (non-Javadoc) +- * @see org.eclipse.ui.internal.presentations.util.AbstractTabFolder#setState(int) +- */ +- public void setState(int state) { +- super.setState(state); +- +- systemToolbar.setState(state); ++ Rectangle bounds = DragUtil.getDisplayBounds(viewToolBar); ++ return new Point(bounds.x, bounds.y + bounds.height); + } + + /* (non-Javadoc) +@@ -147,14 +177,14 @@ + return new Rectangle(0,0,0,0); + } + +- return Geometry.toControl(control, DragUtil.getDisplayBounds(content)); ++ return Geometry.toControl(tabFolder, DragUtil.getDisplayBounds(content)); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.internal.presentations.util.AbstractTabFolder#getItems() + */ + public AbstractTabItem[] getItems() { +- TabItem[] items = control.getItems(); ++ TabItem[] items = tabFolder.getItems(); + + AbstractTabItem[] result = new AbstractTabItem[items.length]; + +@@ -183,18 +213,15 @@ + } + + NativeTabItem tab = (NativeTabItem) toSelect; +- control.setSelection(new TabItem[] {(TabItem)tab.getWidget()}); ++ tabFolder.setSelection(new TabItem[] {(TabItem)tab.getWidget()}); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.internal.presentations.util.AbstractTabFolder#setSelectedInfo(org.eclipse.ui.internal.presentations.util.PartInfo) + */ + public void setSelectedInfo(PartInfo info) { +- if (!Util.equals(title.getText(), info.title)) { +- title.setText(info.title); +- } +- if (title.getImage() != info.image) { +- title.setImage(info.image); ++ if (!Util.equals(title.getText(), info.contentDescription)) { ++ title.setText(info.contentDescription); + } + } + /* (non-Javadoc) +@@ -209,15 +236,15 @@ + */ + public Rectangle getTabArea() { + +- Rectangle bounds = control.getBounds(); ++ Rectangle bounds = tabFolder.getBounds(); + +- Rectangle clientArea = control.getClientArea(); ++ Rectangle clientArea = tabFolder.getClientArea(); + + bounds.x = 0; + bounds.y = 0; + Geometry.expand(bounds, 0, 0, - (clientArea.height + clientArea.y), 0); + +- return Geometry.toDisplay(control.getParent(), bounds); ++ return Geometry.toDisplay(tabFolder.getParent(), bounds); + } + + /* (non-Javadoc) +@@ -239,7 +266,7 @@ + } + + public Control getControl() { +- return control; ++ return tabFolder; + } + + /* (non-Javadoc) +@@ -253,7 +280,7 @@ + } + + public AbstractTabItem getSelection() { +- TabItem[] sel = control.getSelection(); ++ TabItem[] sel = tabFolder.getSelection(); + + if (sel.length == 0) { + return null; +@@ -262,6 +289,15 @@ + return getTab(sel[0]); + } + ++ private TabItem getSelectedTabItem() { ++ WidgetTabItem selection = (WidgetTabItem)getSelection(); ++ ++ if (selection==null) ++ return null; ++ ++ return (TabItem)selection.getWidget(); ++ } ++ + /* (non-Javadoc) + * @see org.eclipse.ui.internal.presentations.util.AbstractTabFolder#getContentParent() + */ +@@ -281,16 +317,15 @@ + * @since 3.1 + */ + public TabFolder getTabFolder() { +- return control; ++ return tabFolder; + } + + /** +- * @param item + * @param newTitle + * @since 3.1 + */ + /* protected */ void setSelectedTitle(String newTitle) { +- title.setText(newTitle); ++ getSelectedTabItem().setText(newTitle); + } + + /** +@@ -298,7 +333,7 @@ + * @since 3.1 + */ + /* protected */ void setSelectedImage(Image image) { +- title.setImage(image); ++ getSelectedTabItem().setImage(image); + } + + /* (non-Javadoc) +@@ -313,6 +348,6 @@ + * @since 3.1 + */ + public void enablePaneMenu(boolean enabled) { +- systemToolbar.enablePaneMenu(enabled); ++ menuButton.setEnabled(enabled); + } + } +Nur in source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation: NativeTabFolder.java.rej. +diff -r -u source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabItem.java source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabItem.java +--- source-tree/plugins.orig/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabItem.java 2006-10-22 10:33:59.000000000 +0200 ++++ source-tree/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/NativeTabItem.java 2006-10-22 10:41:40.000000000 +0200 +@@ -22,6 +22,10 @@ + */ + public class NativeTabItem extends WidgetTabItem { + ++ /** ++ * @param parent ++ * @param index ++ */ + public NativeTabItem(NativeTabFolder parent, int index) { + super(new TabItem(parent.getTabFolder(), SWT.NONE, index)); + } +@@ -32,13 +36,19 @@ + public Rectangle getBounds() { + return new Rectangle(0,0,0,0); + } +- ++ + public void setInfo(PartInfo info) { + TabItem widget = (TabItem) getWidget(); + +- if (!Util.equals(widget.getText(), info.name)) { +- widget.setText(info.name); ++ String name = getLabelText(info, false, false); ++ if (!Util.equals(widget.getText(), name)) { ++ widget.setText(name); ++ } ++ ++ if (!Util.equals(widget.getImage(), info.image)) { ++ widget.setImage(info.image); + } ++ + String oldToolTip = Util.safeString(widget.getToolTipText()); + + if (!Util.equals(info.toolTip, oldToolTip)) { +@@ -48,5 +58,47 @@ + } + widget.setToolTipText(toolTip); + } ++ } ++ ++ /** ++ * Returns the label text that should be used for the tab item for the ++ * specified part ++ * ++ * @param info ++ * @param dirtyLeft ++ * @param includePath ++ * @return a formated label text ++ */ ++ private static String getLabelText(PartInfo info, boolean dirtyLeft, boolean includePath) { ++ String title = info.name.trim(); ++ String text = title; ++ ++ if (includePath) { ++ String titleTooltip = info.toolTip.trim(); ++ ++ if (titleTooltip.endsWith(title)) ++ titleTooltip = titleTooltip.substring(0, ++ titleTooltip.lastIndexOf(title)).trim(); ++ ++ if (titleTooltip.endsWith("\\")) //$NON-NLS-1$ ++ titleTooltip = titleTooltip.substring(0, ++ titleTooltip.lastIndexOf("\\")).trim(); //$NON-NLS-1$ ++ ++ if (titleTooltip.endsWith("/")) //$NON-NLS-1$ ++ titleTooltip = titleTooltip.substring(0, ++ titleTooltip.lastIndexOf("/")).trim(); //$NON-NLS-1$ ++ ++ if (titleTooltip.length() >= 1) ++ text += " - " + titleTooltip; //$NON-NLS-1$ ++ } ++ ++ if (info.dirty) { ++ if (dirtyLeft) ++ text = "* " + text; //$NON-NLS-1$ ++ else ++ text = text + " *"; //$NON-NLS-1$ ++ } ++ ++ 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. --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-firefox.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-firefox.dpatch @@ -0,0 +1,464 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-mozilla.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 + +@DPATCH@ +diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +--- source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:46:37.000000000 +0100 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-01-28 18:54:42.000000000 +0100 +@@ -45,6 +45,9 @@ + MODEL=`uname -m` + fi + fi ++if [ ${MODEL} = 'unknown' ]; then ++ MODEL=`uname -m` ++fi + case $MODEL in + "x86_64") + SWT_ARCH=x86_64 +@@ -87,9 +87,9 @@ + fi + + if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- GECKO_LIBS=`pkg-config --libs mozilla-xpcom` ++ if [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then ++ GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom` ++ GECKO_LIBS=`pkg-config --libs firefox-xpcom` + export GECKO_INCLUDES + export GECKO_LIBS + MAKE_MOZILLA=make_mozilla +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2006-10-09 18:57:26.776969250 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2006-10-09 18:57:38.953730250 +0200 +@@ -199,7 +199,7 @@ + # + # Mozilla lib + # +-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB) ++make_mozilla:$(MOZILLA_LIB) + + $(MOZILLA_LIB): $(MOZILLA_OBJECTS) + $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} +@@ -217,22 +217,22 @@ + $(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp + + $(PROFILE14_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE17_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE18_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE14_LIB): $(PROFILE14_OBJECTS) +- $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ++ $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS} + + $(PROFILE17_LIB): $(PROFILE17_OBJECTS) +- $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ++ $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS} + + $(PROFILE18_LIB): $(PROFILE18_OBJECTS) +- $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ++ $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS} + + # + # GLX lib +@@ -261,4 +261,4 @@ + # Clean + # + clean: +- rm -f *.o *.so ++ rm -f *.o *.so +\ No newline at end of file +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java.orig 2006-09-21 16:57:23.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2006-10-09 18:39:38.154184500 +0200 +@@ -89,6 +89,7 @@ + public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3; + public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012; + public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$ ++ public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$ + + public static final native void memmove(nsID dest, int /*long*/ src, int nbytes); + public static final native void memmove(int /*long*/ dest, nsID src, int nbytes); +@@ -103,9 +104,8 @@ + public static final native void memmove(byte[] dest, char[] src, int nbytes); + public static final native int NS_GetComponentManager(int /*long*/[] result); + public static final native int NS_GetServiceManager(int /*long*/[] result); +-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider); ++public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount); + public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result); +-public static final native int NS_TermEmbedding(); + public static final native int strlen_PRUnichar(int /*long*/ s); + public static final native int /*long*/ nsEmbedCString_new(); + public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length); +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig 2006-10-09 18:15:24.031307500 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2006-10-09 18:39:38.154184500 +0200 +@@ -85,14 +85,16 @@ + } + #endif + +-#ifndef NO_NS_1InitEmbedding +-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding) +- (JNIEnv *env, jclass that, jint arg0, jint arg1) ++#ifndef NO_NS_1InitXPCOM3 ++JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3) ++ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) + { + jint rc = 0; +- XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC); +- rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1); +- XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC); ++ XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC); ++ rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1, ++ (nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3, ++ (PRUint32) arg4); ++ XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC); + return rc; + } + #endif +@@ -113,18 +115,6 @@ + } + #endif + +-#ifndef NO_NS_1TermEmbedding +-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding) +- (JNIEnv *env, jclass that) +-{ +- jint rc = 0; +- XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC); +- rc = (jint)NS_TermEmbedding(); +- XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC); +- return rc; +-} +-#endif +- + #ifndef NO_PR_1Free + JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free) + (JNIEnv *env, jclass that, jint arg0) +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp.orig 2006-09-21 16:57:23.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp 2006-10-09 18:39:38.150184250 +0200 +@@ -31,15 +31,14 @@ + + #ifdef NATIVE_STATS + +-int XPCOM_nativeFunctionCount = 132; +-int XPCOM_nativeFunctionCallCount[132]; ++int XPCOM_nativeFunctionCount = 131; ++int XPCOM_nativeFunctionCallCount[131]; + char * XPCOM_nativeFunctionNames[] = { + "Call", + "NS_1GetComponentManager", + "NS_1GetServiceManager", +- "NS_1InitEmbedding", ++ "NS_1InitXPCOM3_FUNC", + "NS_1NewLocalFile", +- "NS_1TermEmbedding", + "PR_1Free", + "PR_1Malloc", + "VtblCall__II", +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h.orig 2006-09-21 16:57:32.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h 2006-10-09 18:39:38.150184250 +0200 +@@ -32,7 +32,7 @@ + #define NDEBUG + + #include "nsCOMPtr.h" +-#include "nsProfileDirServiceProvider.h" ++#include "profdirserviceprovider/nsProfileDirServiceProvider.h" + #include "xpcom_stats.h" + + #endif /* INC_xpcom_profile_H */ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h.orig 2006-09-21 16:57:20.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h 2006-10-09 18:39:38.150184250 +0200 +@@ -32,7 +32,6 @@ + #define NDEBUG + + #include "nsXPCOM.h" +-#include "nsEmbedAPI.h" + #include "nsEmbedString.h" + #include "nsIInputStream.h" + #include "nsISupportsUtils.h" +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h.orig 2006-09-21 16:57:34.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h 2006-10-09 18:39:38.154184500 +0200 +@@ -41,9 +41,8 @@ + Call_FUNC, + NS_1GetComponentManager_FUNC, + NS_1GetServiceManager_FUNC, +- NS_1InitEmbedding_FUNC, ++ NS_1InitXPCOM3_FUNC, + NS_1NewLocalFile_FUNC, +- NS_1TermEmbedding_FUNC, + PR_1Free_FUNC, + PR_1Malloc_FUNC, + VtblCall__II_FUNC, +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java.orig 2006-09-21 16:57:19.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2006-10-09 18:39:38.154184500 +0200 +@@ -10,15 +10,75 @@ + *******************************************************************************/ + package org.eclipse.swt.browser; + +-import java.io.*; +-import java.util.*; +-import org.eclipse.swt.*; +-import org.eclipse.swt.widgets.*; +-import org.eclipse.swt.graphics.*; +-import org.eclipse.swt.internal.*; +-import org.eclipse.swt.internal.gtk.*; +-import org.eclipse.swt.internal.mozilla.*; +-import org.eclipse.swt.layout.*; ++import java.io.File; ++import java.io.UnsupportedEncodingException; ++import java.util.Locale; ++import java.util.StringTokenizer; ++ ++import org.eclipse.swt.SWT; ++import org.eclipse.swt.SWTError; ++import org.eclipse.swt.SWTException; ++import org.eclipse.swt.graphics.Point; ++import org.eclipse.swt.graphics.Rectangle; ++import org.eclipse.swt.internal.Callback; ++import org.eclipse.swt.internal.Converter; ++import org.eclipse.swt.internal.Library; ++import org.eclipse.swt.internal.gtk.GdkEvent; ++import org.eclipse.swt.internal.gtk.LONG; ++import org.eclipse.swt.internal.gtk.OS; ++import org.eclipse.swt.internal.mozilla.XPCOM; ++import org.eclipse.swt.internal.mozilla.XPCOMObject; ++import org.eclipse.swt.internal.mozilla.nsEmbedString; ++import org.eclipse.swt.internal.mozilla.nsIAppShell; ++import org.eclipse.swt.internal.mozilla.nsIBaseWindow; ++import org.eclipse.swt.internal.mozilla.nsICategoryManager; ++import org.eclipse.swt.internal.mozilla.nsIComponentManager; ++import org.eclipse.swt.internal.mozilla.nsIComponentRegistrar; ++import org.eclipse.swt.internal.mozilla.nsIContextMenuListener; ++import org.eclipse.swt.internal.mozilla.nsICookie; ++import org.eclipse.swt.internal.mozilla.nsICookieManager; ++import org.eclipse.swt.internal.mozilla.nsID; ++import org.eclipse.swt.internal.mozilla.nsIDOMEvent; ++import org.eclipse.swt.internal.mozilla.nsIDOMMouseEvent; ++import org.eclipse.swt.internal.mozilla.nsIDOMWindow; ++import org.eclipse.swt.internal.mozilla.nsIDirectoryService; ++import org.eclipse.swt.internal.mozilla.nsIDocShell; ++import org.eclipse.swt.internal.mozilla.nsIEmbeddingSiteWindow; ++import org.eclipse.swt.internal.mozilla.nsIFile; ++import org.eclipse.swt.internal.mozilla.nsIIOService; ++import org.eclipse.swt.internal.mozilla.nsIInterfaceRequestor; ++import org.eclipse.swt.internal.mozilla.nsILocalFile; ++import org.eclipse.swt.internal.mozilla.nsIPrefBranch; ++import org.eclipse.swt.internal.mozilla.nsIPrefLocalizedString; ++import org.eclipse.swt.internal.mozilla.nsIPrefService; ++import org.eclipse.swt.internal.mozilla.nsIProperties; ++import org.eclipse.swt.internal.mozilla.nsIRequest; ++import org.eclipse.swt.internal.mozilla.nsIServiceManager; ++import org.eclipse.swt.internal.mozilla.nsISimpleEnumerator; ++import org.eclipse.swt.internal.mozilla.nsISupports; ++import org.eclipse.swt.internal.mozilla.nsISupportsWeakReference; ++import org.eclipse.swt.internal.mozilla.nsITooltipListener; ++import org.eclipse.swt.internal.mozilla.nsIURI; ++import org.eclipse.swt.internal.mozilla.nsIURIContentListener; ++import org.eclipse.swt.internal.mozilla.nsIWeakReference; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowser; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserChrome; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserChromeFocus; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserFocus; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserStream; ++import org.eclipse.swt.internal.mozilla.nsIWebNavigation; ++import org.eclipse.swt.internal.mozilla.nsIWebProgress; ++import org.eclipse.swt.internal.mozilla.nsIWebProgressListener; ++import org.eclipse.swt.internal.mozilla.nsIWindowWatcher; ++import org.eclipse.swt.layout.FillLayout; ++import org.eclipse.swt.widgets.Composite; ++import org.eclipse.swt.widgets.Display; ++import org.eclipse.swt.widgets.Event; ++import org.eclipse.swt.widgets.Label; ++import org.eclipse.swt.widgets.Listener; ++import org.eclipse.swt.widgets.Menu; ++import org.eclipse.swt.widgets.Shell; ++import org.eclipse.swt.widgets.Widget; + + /** + * Instances of this class implement the browser user interface +@@ -175,40 +235,43 @@ + * - mozilla17profile/mozilla17profile-gcc should succeed for mozilla 1.7.x and firefox + * - mozilla18profile/mozilla18profile-gcc should succeed for mozilla 1.8.x (seamonkey) + */ +- try { +- Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e1) { +- try { +- Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e2) { +- try { +- Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e3) { +- try { +- Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e4) { +- try { +- Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e5) { +- try { +- Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e6) { +- /* +- * fail silently, the Browser will still work without profile support +- * but will abort any attempts to navigate to HTTPS pages +- */ +- } +- } +- } +- } +- } +- } ++// Library.loadLibrary("swt-mozilla17-profile"); ++ // We build the profile stuff without the need for a separate DSO ++ usingProfile = true; ++// try { ++// Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e1) { ++// try { ++// Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e2) { ++// try { ++// Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e3) { ++// try { ++// Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e4) { ++// try { ++// Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e5) { ++// try { ++// Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e6) { ++// /* ++// * fail silently, the Browser will still work without profile support ++// * but will abort any attempts to navigate to HTTPS pages ++// */ ++// } ++// } ++// } ++// } ++// } ++// } + + int /*long*/[] retVal = new int /*long*/[1]; + nsEmbedString pathString = new nsEmbedString(mozillaPath); +@@ -218,11 +281,11 @@ + if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER); + + nsILocalFile localFile = new nsILocalFile(retVal[0]); +- rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0); ++ rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0); + localFile.Release(); + if (rc != XPCOM.NS_OK) { + dispose(); +- SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + rc = XPCOM.NS_GetComponentManager(result); +@@ -283,7 +346,7 @@ + rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result); + if (rc != XPCOM.NS_OK) error(rc); + if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); +- properties.Release(); ++ // properties.Release() is now after the Set below + + nsIFile profileDir = new nsIFile(result[0]); + result[0] = 0; +@@ -305,24 +368,15 @@ + pathString.dispose(); // + + profileDir = new nsIFile(result[0]); +- result[0] = 0; +- +- rc = XPCOM_PROFILE.NS_NewProfileDirServiceProvider(true, result); ++ ++ // Set the profile dir property so that it's initialized for ++ // things like password manager and https ++ buffer = Converter.wcsToMbcs(null, XPCOM.NS_APP_USER_PROFILE_50_DIR, true); ++ rc = properties.Set(buffer, profileDir.getAddress()); + if (rc != XPCOM.NS_OK) error(rc); +- if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); +- +- final int /*long*/ dirServiceProvider = result[0]; ++ properties.Release(); ++ + result[0] = 0; +- rc = XPCOM_PROFILE.ProfileDirServiceProvider_Register(dirServiceProvider); +- if (rc != XPCOM.NS_OK) error(rc); +- rc = XPCOM_PROFILE.ProfileDirServiceProvider_SetProfileDir(dirServiceProvider, profileDir.getAddress()); +- if (rc != XPCOM.NS_OK) error(rc); +- +- getDisplay().addListener(SWT.Dispose, new Listener() { +- public void handleEvent(Event e) { +- XPCOM_PROFILE.ProfileDirServiceProvider_Shutdown(dirServiceProvider); +- } +- }); + } + + /* +@@ -1354,27 +1408,6 @@ + tip = null; + + BrowserCount--; +- /* +- * This code is intentionally commented. It is not possible to reinitialize +- * Mozilla once it has been terminated. NS_InitEmbedding always fails after +- * NS_TermEmbedding has been called. The workaround is to call NS_InitEmbedding +- * once and never call NS_TermEmbedding. +- */ +-// if (BrowserCount == 0) { +-// if (AppShell != null) { +-// // Shutdown the appshell service. +-// rc = AppShell.Spindown(); +-// if (rc != XPCOM.NS_OK) error(rc); +-// AppShell.Release(); +-// AppShell = null; +-// } +-// WindowCreator.Release(); +-// WindowCreator = null; +-// PromptService.Release(); +-// PromptService = null; +-// XPCOM.NS_TermEmbedding(); +-// mozilla = false; +-// } + } + + void Activate() { --- eclipse-3.4.1.orig/debian/patches/eclipse-icon.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-icon.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-icon.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 + +@DPATCH@ +--- source-tree/build.xml.orig 2005-06-08 06:55:01.000000000 +0000 ++++ source-tree/build.xml 2005-06-08 06:55:42.000000000 +0000 +@@ -72,6 +72,10 @@ + + + ++ ++ ++ ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-helpindexbuilder.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-helpindexbuilder.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh -e +## +## DP: Fixing bug in HelpIndexBuilder, which cause an OutOfMemoryException +## DP: (https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001) + +[ -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 + +@DPATCH@ +diff -r -u ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java +--- ../source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java 2005-10-27 15:18:45.000000000 +0200 ++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java 2005-10-27 15:30:57.000000000 +0200 +@@ -555,8 +555,15 @@ + hrefs.add(href); + } + NodeList subtopics = topic.getElementsByTagName("topic"); //$NON-NLS-1$ +- for (int i = 0; i < subtopics.getLength(); i++) +- add((Element) subtopics.item(i), hrefs); ++ for (int i = 0; i < subtopics.getLength(); i++) { ++ Element subtopic = (Element) subtopics.item(i); ++ href = getAttribute(subtopic, "href"); ++ if (href != null && !href.equals("") && !href.startsWith("http://") && !href.startsWith("https://")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ href = SearchIndex.getIndexableHref(href); ++ if (href != null) ++ hrefs.add(href); ++ } ++ } + } + + /* +@@ -774,4 +781,5 @@ + IStatus.OK, message, t); + throw new CoreException(status); + } +-} +\ Kein Zeilenumbruch am Dateiende. ++} ++ --- eclipse-3.4.1.orig/debian/patches/eclipse-disabledocindexes.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disabledocindexes.dpatch @@ -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.--> + + +- ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-webapp-tomcat55.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-webapp-tomcat55.dpatch @@ -0,0 +1,113 @@ +#! /bin/sh -e +## + +[ -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 + +@DPATCH@ + +Index: build.xml +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v +retrieving revision 1.71 +diff -u -r1.71 build.xml +--- source-tree/plugins/org.eclipse.help.webapp/build.xml 16 Mar 2006 21:57:15 -0000 1.71 ++++ source-tree/plugins/org.eclipse.help.webapp/build.xml 5 Jul 2006 15:48:12 -0000 +@@ -84,8 +84,8 @@ + + + +- +- ++ ++ + + + +@@ -141,8 +141,12 @@ + + + +- +- ++ ++ ++ ++ ++ ++ + + + +@@ -170,21 +174,22 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ + + + + +- + + + +@@ -222,8 +227,9 @@ + + + +- +- ++ ++ ++ + + + +Index: build.properties +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v +retrieving revision 1.32 +diff -u -r1.32 build.properties +--- source-tree/plugins/org.eclipse.help.webapp/build.properties 18 Mar 2005 08:00:28 -0000 1.32 ++++ source-tree/plugins/org.eclipse.help.webapp/build.properties 5 Jul 2006 15:48:11 -0000 +@@ -33,5 +33,5 @@ + ../org.eclipse.help.appserver/bin,\ + ../org.eclipse.help.appserver,\ + ../org.eclipse.help.appserver/@dot,\ +- ../org.eclipse.tomcat/servlet.jar,\ +- ../org.eclipse.tomcat/jasper-runtime.jar ++ ../org.eclipse.tomcat/lib/servletapi5.jar,\ ++ ../org.eclipse.tomcat/lib/jasper-runtime.jar --- eclipse-3.4.1.orig/debian/patches/eclipse-swt-build.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-swt-build.dpatch @@ -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 + +@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 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ + + + +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 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -293,6 +298,7 @@ + + + ++ + + + +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 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -346,4 +368,4 @@ + + + +- +\ No newline at end of file ++ +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 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -294,6 +299,7 @@ + + + ++ + + + +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 @@ + + + ++ ++ ++ ++ ++ + + + +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 @@ + + + ++ + + + + + + +- ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-osgi-bootclasspath.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-osgi-bootclasspath.dpatch @@ -0,0 +1,94 @@ +#! /bin/sh -e +## eclipse-osgi-bootclasspath.dpatch by Mikhail Zabaluev +## +## 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 + +@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 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + +@@ -37,6 +54,7 @@ + + + ++ + + + +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 @@ + + +- +- + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-cvs-ssh-jsch.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-cvs-ssh-jsch.dpatch @@ -0,0 +1,87 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-cvs-ssh-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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.team.cvs.ssh2/build.xml.orig 2005-06-08 06:51:37.000000000 +0000 ++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/build.xml 2005-06-08 06:52:01.000000000 +0000 +@@ -177,8 +177,8 @@ + + + +- +- ++ ++ + + + +diff -Naur source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/about.html source-tree/plugins/org.eclipse.team.cvs.ssh2/about.html +--- source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/about.html 2005-06-27 18:55:12.000000000 +0000 ++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/about.html 2005-07-08 13:12:31.000000000 +0000 +@@ -22,12 +22,12 @@ + +

The Content includes items that have been sourced from third parties as follows:

+ +-

JSch 0.1.18

++

JSch 0.1.28

+ +

The plug-in is based on software developed by Atsuhiko Yamanaka, JCraft, Inc., and others and + made available at http://www.jcraft.com/. + +-

The file jsch-0.1.18.jar and all its contents shall be defined as the "JSch".

++

The file jsch-0.1.28.jar and all its contents shall be defined as the "JSch".

+ +

Use of JSch is governed by the terms and conditions of the following license:

+ +diff -Naur source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/build.properties source-tree/plugins/org.eclipse.team.cvs.ssh2/build.properties +--- source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/build.properties 2005-06-27 18:54:11.000000000 +0000 ++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/build.properties 2005-07-08 13:12:26.000000000 +0000 +@@ -16,4 +16,4 @@ + META-INF/ + src.includes = about.html + source.cvsssh2.jar = src/ +-extra.cvsssh2.jar=jsch-0.1.18.jar ++extra.cvsssh2.jar=jsch-0.1.28.jar +diff -Naur source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/.classpath source-tree/plugins/org.eclipse.team.cvs.ssh2/.classpath +--- source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/.classpath 2005-06-27 18:54:10.000000000 +0000 ++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/.classpath 2005-07-08 13:12:12.000000000 +0000 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff -Naur source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF +--- source-tree/plugins/org.eclipse.team.cvs.ssh2.orig/META-INF/MANIFEST.MF 2005-06-27 18:54:10.000000000 +0000 ++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF 2005-07-08 13:12:23.000000000 +0000 +@@ -4,7 +4,7 @@ + Bundle-SymbolicName: org.eclipse.team.cvs.ssh2; singleton:=true + Bundle-Version: 3.1.0 + Bundle-ClassPath: cvsssh2.jar, +- jsch-0.1.18.jar ++ jsch-0.1.28.jar + Bundle-Activator: org.eclipse.team.internal.ccvs.ssh2.CVSSSH2Plugin + Bundle-Vendor: %providerName + Bundle-Localization: plugin --- eclipse-3.4.1.orig/debian/patches/eclipse-s390ands390x2.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-s390ands390x2.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-s390ands390x2.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 + +@DPATCH@ +diff -uNr build.sh.orig build.sh +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2005-03-07 15:02:47.149750792 -0500 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-03-07 13:41:17.000000000 -0500 +@@ -119,6 +119,33 @@ + OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/ia64 + makefile="make_linux.mak" + ;; ++ "s390") ++ CC=gcc ++ LD=gcc ++ if [ "${JAVA_HOME}" = "" ]; then ++ echo "JAVA_HOME is missing. Build will probably fail." ++ fi ++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/s390 ++ XTEST_LIB_PATH=/usr/X11R6/lib ++ KDE_LIB_PATH=/opt/kde3/lib ++ KDE_INCLUDE_PATH=/opt/kde3/include ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk/os/linux/s390 ++ makefile="make_linux.mak" ++ ;; ++ "s390x") ++ CC=gcc ++ LD=gcc ++ if [ "${JAVA_HOME}" = "" ]; then ++ echo "JAVA_HOME is missing. Build will probably fail." ++ fi ++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/s390x ++ XTEST_LIB_PATH=/usr/X11R6/lib64 ++ KDE_LIB_PATH="/usr/lib/kde -L/usr/lib/qt-3.1/lib" ++ KDE_INCLUDE_PATH="/usr/include/kde -I/usr/lib/qt-3.1/include" ++ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/s390 ++ makefile="make_linux.mak" ++ ;; + *) + echo "*** Unknown MODEL <${MODEL}>" + ;; + --- eclipse-3.4.1.orig/debian/patches/eclipse-ant-manifest.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-ant-manifest.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh -e +## +## DP: Change manifest of the Ant plugin to adapt the available Ant libs + +[ -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 + +@DPATCH@ +--- source-tree/plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF~ 2009-06-28 14:31:35.000000000 +0200 ++++ source-tree/plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF 2009-06-28 14:32:58.000000000 +0200 +@@ -5,14 +5,25 @@ + Bundle-Name: %pluginName + Bundle-Localization: plugin + Bundle-Version: 1.7.0.v200803061910 +-Bundle-ClassPath: lib/ant.jar,lib/ant-antlr.jar,lib/ant-apache-bcel.ja +- r,lib/ant-apache-bsf.jar,lib/ant-apache-log4j.jar,lib/ant-apache-oro. +- jar,lib/ant-apache-regexp.jar,lib/ant-apache-resolver.jar,lib/ant-com +- mons-logging.jar,lib/ant-commons-net.jar,lib/ant-jai.jar,lib/ant-java +- mail.jar,lib/ant-jdepend.jar,lib/ant-jmf.jar,lib/ant-jsch.jar,lib/ant +- -junit.jar,lib/ant-launcher.jar,lib/ant-netrexx.jar,lib/ant-nodeps.ja +- r,lib/ant-starteam.jar,lib/ant-stylebook.jar,lib/ant-swing.jar,lib/an +- t-trax.jar,lib/ant-weblogic.jar ++Bundle-ClassPath: lib/ant.jar, ++ lib/ant-antlr.jar, ++ lib/ant-apache-bcel.jar, ++ lib/ant-apache-bsf.jar, ++ lib/ant-apache-log4j.jar, ++ lib/ant-apache-oro.jar, ++ lib/ant-apache-regexp.jar, ++ lib/ant-apache-resolver.jar, ++ lib/ant-commons-logging.jar, ++ lib/ant-commons-net.jar, ++ lib/ant-javamail.jar, ++ lib/ant-jdepend.jar, ++ lib/ant-jmf.jar, ++ lib/ant-jsch.jar, ++ lib/ant-junit.jar, ++ lib/ant-launcher.jar, ++ lib/ant-nodeps.jar, ++ lib/ant-swing.jar, ++ lib/ant-trax.jar + Bundle-Vendor: %providerName + Export-Package: images,org.apache.tools.ant,org.apache.tools.ant.dispa + tch,org.apache.tools.ant.filters,org.apache.tools.ant.filters.util,or --- eclipse-3.4.1.orig/debian/patches/eclipse-disable-javadoc.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disable-javadoc.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-disable-javadoc.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 + +@DPATCH@ +diff -P -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-01 22:31:14.000000000 +0200 ++++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-09-01 22:33:32.000000000 +0200 +@@ -42,8 +42,10 @@ + + + ++ + + + +diff -P -r -u source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml +--- source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-09-01 22:31:13.000000000 +0200 ++++ source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-09-01 22:33:13.000000000 +0200 +@@ -26,8 +26,10 @@ + + + ++ + + + +diff -P -r -u source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml +--- source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-09-01 22:31:15.000000000 +0200 ++++ source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-09-01 22:33:55.000000000 +0200 +@@ -79,8 +79,10 @@ + + + ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-disable-buildHelpIndex.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disable-buildHelpIndex.dpatch @@ -0,0 +1,93 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-disable-buildHelpIndex.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 + +@DPATCH@ +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 +@@ -54,7 +54,9 @@ + + + ++ + + + +diff -r -u source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml +--- source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-09-02 12:29:42.000000000 +0200 ++++ source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-09-02 12:35:18.000000000 +0200 +@@ -12,7 +12,9 @@ + + + ++ + + + +diff -r -u source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml +--- source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-09-02 12:29:52.000000000 +0200 ++++ source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-09-02 12:36:48.000000000 +0200 +@@ -14,7 +14,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 @@ + + + ++ + + + +--- ../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 @@ + + + ++ + + + +@@ -116,4 +118,4 @@ + /> + + +- +\ No newline at end of file ++ --- eclipse-3.4.1.orig/debian/patches/eclipse-public-applypatch.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-public-applypatch.dpatch @@ -0,0 +1,541 @@ +#! /bin/sh -e +## +## DP: Make parts of the API of the compare plugins public, +## DP: which is needed for the bugzilla plugin. +## DP: https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 + +[ -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 + +@DPATCH@ +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java +--- source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java 2005-12-23 02:17:48.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java 1970-01-01 01:00:00.000000000 +0100 +@@ -1,154 +0,0 @@ +-/******************************************************************************* +- * Copyright (c) 2000, 2004 IBM Corporation and others. +- * All rights reserved. This program and the accompanying materials +- * are made available under the terms of the Eclipse Public License v1.0 +- * which accompanies this distribution, and is available at +- * http://www.eclipse.org/legal/epl-v10.html +- * +- * Contributors: +- * IBM Corporation - initial API and implementation +- *******************************************************************************/ +-package org.eclipse.compare.internal.patch; +- +-import java.lang.reflect.InvocationTargetException; +-import java.util.Arrays; +- +-import org.eclipse.swt.SWT; +-import org.eclipse.swt.events.SelectionAdapter; +-import org.eclipse.swt.events.SelectionEvent; +-import org.eclipse.swt.graphics.Image; +-import org.eclipse.swt.widgets.Button; +-import org.eclipse.swt.widgets.Composite; +-import org.eclipse.swt.widgets.Control; +-import org.eclipse.swt.widgets.Shell; +- +-import org.eclipse.jface.dialogs.ProgressMonitorDialog; +-import org.eclipse.jface.operation.IRunnableWithProgress; +-import org.eclipse.jface.util.Assert; +-import org.eclipse.jface.viewers.*; +-import org.eclipse.jface.window.Window; +-import org.eclipse.jface.wizard.IWizard; +-import org.eclipse.jface.wizard.WizardDialog; +- +-import org.eclipse.core.resources.*; +-import org.eclipse.core.runtime.*; +- +-import org.eclipse.ui.IEditorPart; +- +-import org.eclipse.compare.internal.*; +- +- +-public class CompareWithPatchAction extends BaseCompareAction { +- +- static class PatchWizardDialog extends WizardDialog { +- +- PatchWizardDialog(Shell parent, IWizard wizard) { +- super(parent, wizard); +- +- setShellStyle(getShellStyle() | SWT.RESIZE); +- setMinimumPageSize(700, 500); +- } +- } +- +- protected boolean isEnabled(ISelection selection) { +- return Utilities.getResources(selection).length == 1; +- } +- +- /* (non-Javadoc) +- * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection) +- */ +- protected void run(ISelection selection) { +- PatchWizard wizard= new PatchWizard(selection); +- +- if (areAllEditorsSaved()) { +- PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard); +- dialog.open(); +- } +- } +- +- private boolean areAllEditorsSaved(){ +- if (CompareUIPlugin.getDirtyEditors().length == 0) +- return true; +- if (! saveAllDirtyEditors()) +- return false; +- Shell shell= CompareUIPlugin.getShell(); +- try { +- // Save isn't cancelable. +- IWorkspace workspace= ResourcesPlugin.getWorkspace(); +- IWorkspaceDescription description= workspace.getDescription(); +- boolean autoBuild= description.isAutoBuilding(); +- description.setAutoBuilding(false); +- workspace.setDescription(description); +- try { +- new ProgressMonitorDialog(shell).run(false, false, createRunnable()); +- } finally { +- description.setAutoBuilding(autoBuild); +- workspace.setDescription(description); +- } +- return true; +- } catch (InvocationTargetException e) { +- ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception); +- return false; +- } catch (CoreException e) { +- ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception); +- return false; +- } catch (InterruptedException e) { +- Assert.isTrue(false); // Can't happen. Operation isn't cancelable. +- return false; +- } +- } +- +- private IRunnableWithProgress createRunnable() { +- return new IRunnableWithProgress() { +- public void run(IProgressMonitor pm) { +- IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors(); +- pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length); +- for (int i= 0; i < editorsToSave.length; i++) { +- editorsToSave[i].doSave(new SubProgressMonitor(pm, 1)); +- pm.worked(1); +- } +- pm.done(); +- } +- }; +- } +- +- private boolean saveAllDirtyEditors() { +- if (ComparePreferencePage.getSaveAllEditors()) //must save everything +- return true; +- ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) { +- protected Control createDialogArea(Composite parent) { +- Composite result= (Composite) super.createDialogArea(parent); +- final Button check= new Button(result, SWT.CHECK); +- check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion); +- check.setSelection(ComparePreferencePage.getSaveAllEditors()); +- check.addSelectionListener( +- new SelectionAdapter() { +- public void widgetSelected(SelectionEvent e) { +- ComparePreferencePage.setSaveAllEditors(check.getSelection()); +- } +- } +- ); +- applyDialogFont(result); +- return result; +- } +- }; +- dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion); +- dialog.setAddCancelButton(true); +- dialog.setLabelProvider(createDialogLabelProvider()); +- dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription); +- dialog.setContentProvider(new ListContentProvider()); +- dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors())); +- return dialog.open() == Window.OK; +- } +- +- private ILabelProvider createDialogLabelProvider() { +- return new LabelProvider() { +- public Image getImage(Object element) { +- return ((IEditorPart) element).getTitleImage(); +- } +- public String getText(Object element) { +- return ((IEditorPart) element).getTitle(); +- } +- }; +- } +-} +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java +--- source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java 2005-12-23 02:17:48.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java 2005-12-23 02:24:52.000000000 +0100 +@@ -10,30 +10,58 @@ + *******************************************************************************/ + package org.eclipse.compare.internal.patch; + +-import java.io.*; ++import java.io.BufferedReader; ++import java.io.File; ++import java.io.FileNotFoundException; ++import java.io.FileReader; ++import java.io.IOException; ++import java.io.Reader; ++import java.io.StringReader; + import java.text.MessageFormat; + +-import org.eclipse.swt.SWT; +-import org.eclipse.swt.dnd.*; +-import org.eclipse.swt.events.*; +-import org.eclipse.swt.layout.*; +-import org.eclipse.swt.widgets.*; +- +-import org.eclipse.jface.dialogs.*; +-import org.eclipse.jface.dialogs.Dialog; +-import org.eclipse.jface.viewers.*; +-import org.eclipse.jface.wizard.*; +- +-import org.eclipse.ui.PlatformUI; +-import org.eclipse.ui.model.*; +- + import org.eclipse.compare.internal.ICompareContextIds; + import org.eclipse.compare.internal.Utilities; +-import org.eclipse.core.resources.*; +-import org.eclipse.core.runtime.*; ++import org.eclipse.core.resources.IFile; ++import org.eclipse.core.resources.IResource; ++import org.eclipse.core.resources.IWorkspace; ++import org.eclipse.core.resources.IWorkspaceRoot; ++import org.eclipse.core.runtime.IPath; ++import org.eclipse.core.runtime.Path; ++import org.eclipse.jface.dialogs.Dialog; ++import org.eclipse.jface.dialogs.IDialogSettings; ++import org.eclipse.jface.dialogs.MessageDialog; ++import org.eclipse.jface.viewers.CheckboxTreeViewer; ++import org.eclipse.jface.viewers.ISelection; ++import org.eclipse.jface.viewers.ISelectionChangedListener; ++import org.eclipse.jface.viewers.SelectionChangedEvent; ++import org.eclipse.jface.viewers.StructuredSelection; ++import org.eclipse.jface.wizard.IWizardPage; ++import org.eclipse.jface.wizard.WizardPage; ++import org.eclipse.swt.SWT; ++import org.eclipse.swt.dnd.Clipboard; ++import org.eclipse.swt.dnd.TextTransfer; ++import org.eclipse.swt.events.ModifyEvent; ++import org.eclipse.swt.events.ModifyListener; ++import org.eclipse.swt.events.SelectionAdapter; ++import org.eclipse.swt.events.SelectionEvent; ++import org.eclipse.swt.layout.GridData; ++import org.eclipse.swt.layout.GridLayout; ++import org.eclipse.swt.widgets.Button; ++import org.eclipse.swt.widgets.Combo; ++import org.eclipse.swt.widgets.Composite; ++import org.eclipse.swt.widgets.Control; ++import org.eclipse.swt.widgets.FileDialog; ++import org.eclipse.swt.widgets.Group; ++import org.eclipse.swt.widgets.Label; ++import org.eclipse.swt.widgets.Text; ++import org.eclipse.swt.widgets.Tree; ++import org.eclipse.ui.PlatformUI; ++import org.eclipse.ui.model.WorkbenchContentProvider; ++import org.eclipse.ui.model.WorkbenchLabelProvider; ++import org.eclipse.ui.model.WorkbenchViewerSorter; + + +-/* package */ class InputPatchPage extends WizardPage { ++/* package */public class InputPatchPage extends WizardPage { + + // constants + protected static final int SIZING_TEXT_FIELD_WIDTH= 250; +@@ -41,8 +69,8 @@ + + // dialog store id constants + private final static String PAGE_NAME= "PatchWizardPage1"; //$NON-NLS-1$ +- private final static String STORE_PATCH_FILES_ID= PAGE_NAME + ".PATCH_FILES"; //$NON-NLS-1$ +- private final static String STORE_USE_CLIPBOARD_ID= PAGE_NAME + ".USE_CLIPBOARD"; //$NON-NLS-1$ ++ public final static String STORE_PATCH_FILES_ID= PAGE_NAME + ".PATCH_FILES"; //$NON-NLS-1$ ++ public final static String STORE_USE_CLIPBOARD_ID= PAGE_NAME + ".USE_CLIPBOARD"; //$NON-NLS-1$ + + static final char SEPARATOR = System.getProperty ("file.separator").charAt (0); //$NON-NLS-1$ + +@@ -269,8 +297,11 @@ + + PatchWizard pw= (PatchWizard) getWizard(); + IResource target= pw.getTarget(); +- IWorkspace workspace= target.getWorkspace(); +- IWorkspaceRoot root= workspace.getRoot(); ++ IWorkspaceRoot root = null; ++ if (target != null) { ++ IWorkspace workspace= target.getWorkspace(); ++ root= workspace.getRoot(); ++ } + + Tree tree= new Tree(parent, SWT.BORDER); + GridData gd= new GridData(GridData.FILL_BOTH); +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java +--- source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java 2005-12-23 02:17:48.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java 2005-12-23 02:24:56.000000000 +0100 +@@ -25,10 +25,10 @@ + import org.eclipse.compare.internal.*; + + +-/* package */ class PatchWizard extends Wizard { ++/* package */ public class PatchWizard extends Wizard { + + // dialog store id constants +- private final static String DIALOG_SETTINGS_KEY= "PatchWizard"; //$NON-NLS-1$ ++ public final static String DIALOG_SETTINGS_KEY= "PatchWizard"; //$NON-NLS-1$ + + private boolean fHasNewDialogSettings; + +@@ -41,7 +41,7 @@ + /* + * Creates a wizard for applying a patch file to the workspace. + */ +- /* package */ PatchWizard(ISelection selection) { ++ /* package */ public PatchWizard(ISelection selection) { + + setDefaultPageImageDescriptor(CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.gif")); //$NON-NLS-1$ + setWindowTitle(PatchMessages.PatchWizard_title); +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/org/eclipse/compare/CompareWithPatchAction.java source-tree/plugins/org.eclipse.compare/org/eclipse/compare/CompareWithPatchAction.java +--- source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareWithPatchAction.java 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareWithPatchAction.java 2005-12-23 02:24:56.000000000 +0100 +@@ -0,0 +1,162 @@ ++/******************************************************************************* ++ * Copyright (c) 2000, 2004 IBM Corporation and others. ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Eclipse Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/epl-v10.html ++ * ++ * Contributors: ++ * IBM Corporation - initial API and implementation ++ *******************************************************************************/ ++package org.eclipse.compare; ++ ++import java.lang.reflect.InvocationTargetException; ++import java.util.Arrays; ++ ++import org.eclipse.swt.SWT; ++import org.eclipse.swt.events.SelectionAdapter; ++import org.eclipse.swt.events.SelectionEvent; ++import org.eclipse.swt.graphics.Image; ++import org.eclipse.swt.widgets.Button; ++import org.eclipse.swt.widgets.Composite; ++import org.eclipse.swt.widgets.Control; ++import org.eclipse.swt.widgets.Shell; ++ ++import org.eclipse.jface.dialogs.ProgressMonitorDialog; ++import org.eclipse.jface.operation.IRunnableWithProgress; ++import org.eclipse.jface.util.Assert; ++import org.eclipse.jface.viewers.*; ++import org.eclipse.jface.window.Window; ++import org.eclipse.jface.wizard.IWizard; ++import org.eclipse.jface.wizard.WizardDialog; ++ ++import org.eclipse.core.resources.*; ++import org.eclipse.core.runtime.*; ++ ++import org.eclipse.ui.IEditorPart; ++ ++import org.eclipse.compare.internal.*; ++import org.eclipse.compare.internal.patch.PatchMessages; ++import org.eclipse.compare.internal.patch.PatchWizard; ++ ++ ++public class CompareWithPatchAction extends BaseCompareAction { ++ ++ private PatchDialogSettings dialogSettings; //$NON-NLS-1$ ++ ++ static class PatchWizardDialog extends WizardDialog { ++ ++ PatchWizardDialog(Shell parent, IWizard wizard) { ++ super(parent, wizard); ++ ++ setShellStyle(getShellStyle() | SWT.RESIZE); ++ setMinimumPageSize(700, 500); ++ } ++ } ++ ++ protected boolean isEnabled(ISelection selection) { ++ return Utilities.getResources(selection).length == 1; ++ } ++ ++ /* (non-Javadoc) ++ * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection) ++ */ ++ protected void run(ISelection selection) { ++ PatchWizard wizard= new PatchWizard(selection); ++ wizard.setDialogSettings(dialogSettings); ++ if (areAllEditorsSaved()) { ++ PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard); ++ dialog.open(); ++ } ++ } ++ ++ private boolean areAllEditorsSaved(){ ++ if (CompareUIPlugin.getDirtyEditors().length == 0) ++ return true; ++ if (! saveAllDirtyEditors()) ++ return false; ++ Shell shell= CompareUIPlugin.getShell(); ++ try { ++ // Save isn't cancelable. ++ IWorkspace workspace= ResourcesPlugin.getWorkspace(); ++ IWorkspaceDescription description= workspace.getDescription(); ++ boolean autoBuild= description.isAutoBuilding(); ++ description.setAutoBuilding(false); ++ workspace.setDescription(description); ++ try { ++ new ProgressMonitorDialog(shell).run(false, false, createRunnable()); ++ } finally { ++ description.setAutoBuilding(autoBuild); ++ workspace.setDescription(description); ++ } ++ return true; ++ } catch (InvocationTargetException e) { ++ ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception); ++ return false; ++ } catch (CoreException e) { ++ ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception); ++ return false; ++ } catch (InterruptedException e) { ++ Assert.isTrue(false); // Can't happen. Operation isn't cancelable. ++ return false; ++ } ++ } ++ ++ private IRunnableWithProgress createRunnable() { ++ return new IRunnableWithProgress() { ++ public void run(IProgressMonitor pm) { ++ IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors(); ++ pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length); ++ for (int i= 0; i < editorsToSave.length; i++) { ++ editorsToSave[i].doSave(new SubProgressMonitor(pm, 1)); ++ pm.worked(1); ++ } ++ pm.done(); ++ } ++ }; ++ } ++ ++ private boolean saveAllDirtyEditors() { ++ if (ComparePreferencePage.getSaveAllEditors()) //must save everything ++ return true; ++ ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) { ++ protected Control createDialogArea(Composite parent) { ++ Composite result= (Composite) super.createDialogArea(parent); ++ final Button check= new Button(result, SWT.CHECK); ++ check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion); ++ check.setSelection(ComparePreferencePage.getSaveAllEditors()); ++ check.addSelectionListener( ++ new SelectionAdapter() { ++ public void widgetSelected(SelectionEvent e) { ++ ComparePreferencePage.setSaveAllEditors(check.getSelection()); ++ } ++ } ++ ); ++ applyDialogFont(result); ++ return result; ++ } ++ }; ++ dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion); ++ dialog.setAddCancelButton(true); ++ dialog.setLabelProvider(createDialogLabelProvider()); ++ dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription); ++ dialog.setContentProvider(new ListContentProvider()); ++ dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors())); ++ return dialog.open() == Window.OK; ++ } ++ ++ private ILabelProvider createDialogLabelProvider() { ++ return new LabelProvider() { ++ public Image getImage(Object element) { ++ return ((IEditorPart) element).getTitleImage(); ++ } ++ public String getText(Object element) { ++ return ((IEditorPart) element).getTitle(); ++ } ++ }; ++ } ++ ++ public void setDialogSettings(PatchDialogSettings config) { ++ this.dialogSettings = config; ++ } ++} +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/org/eclipse/compare/PatchDialogSettings.java source-tree/plugins/org.eclipse.compare/org/eclipse/compare/PatchDialogSettings.java +--- source-tree.orig/plugins/org.eclipse.compare/compare/org/eclipse/compare/PatchDialogSettings.java 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/compare/org/eclipse/compare/PatchDialogSettings.java 2005-12-23 02:24:56.000000000 +0100 +@@ -0,0 +1,46 @@ ++/******************************************************************************* ++ * Copyright (c) 2000, 2004 IBM Corporation and others. ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Eclipse Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/epl-v10.html ++ * ++ * Contributors: ++ * IBM Corporation - initial API and implementation ++ *******************************************************************************/ ++package org.eclipse.compare; ++ ++import org.eclipse.compare.internal.patch.InputPatchPage; ++import org.eclipse.compare.internal.patch.PatchWizard; ++import org.eclipse.jface.dialogs.DialogSettings; ++ ++/** ++ * CompareWithPatchConfiguration represents a UI configuration ++ * for the CompareWithPatchAction wizard. ++ * ++ * ++ */ ++public class PatchDialogSettings extends DialogSettings { ++ ++ public PatchDialogSettings(String sectionName) { ++ super(sectionName); ++ } ++ ++ public PatchDialogSettings() { ++ super(PatchWizard.DIALOG_SETTINGS_KEY); ++ } ++ ++ public String getPatchPath() { ++ return this.get(InputPatchPage.STORE_PATCH_FILES_ID); ++ } ++ public void setPatchPath(String patchPath) { ++ this.put(InputPatchPage.STORE_PATCH_FILES_ID, patchPath); ++ } ++ ++ public boolean isUseClipboard() { ++ return this.getBoolean(InputPatchPage.STORE_USE_CLIPBOARD_ID); ++ } ++ public void setUseClipboard(boolean useClipboard) { ++ this.put(InputPatchPage.STORE_USE_CLIPBOARD_ID, useClipboard); ++ } ++} +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.compare/plugin.xml source-tree/plugins/org.eclipse.compare/plugin.xml +--- source-tree.orig/plugins/org.eclipse.compare/plugin.xml 2005-12-23 02:17:49.000000000 +0100 ++++ source-tree/plugins/org.eclipse.compare/plugin.xml 2005-12-23 02:24:15.000000000 +0100 +@@ -195,7 +195,7 @@ + --- eclipse-3.4.1.orig/debian/patches/eclipse-build.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-build.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-build.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 + +@DPATCH@ +diff -r -u source-tree.orig/build.xml source-tree/build.xml +--- source-tree.orig/build.xml 2006-10-28 11:34:45.000000000 +0200 ++++ source-tree/build.xml 2006-10-28 12:11:13.000000000 +0200 +@@ -95,6 +95,21 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -265,8 +280,8 @@ + + + +- +- ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-swt-location.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-swt-location.dpatch @@ -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 + +@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 @@ + + + +- ++ + + + + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-webapp-tomcat55-newarches.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-webapp-tomcat55-newarches.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh -e +## + +[ -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 + +@DPATCH@ + +--- source-tree/plugins/org.eclipse.tomcat/build.xml.orig 2006-07-06 08:52:15.000000000 -0400 ++++ source-tree/plugins/org.eclipse.tomcat/build.xml 2006-07-06 08:52:37.000000000 -0400 +@@ -170,6 +170,7 @@ + + + ++ + + + +@@ -181,10 +182,9 @@ + +- + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-mozilla-profiles.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-mozilla-profiles.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-mozilla-profiles.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 + +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2006-10-03 18:45:36.000000000 +0000 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2006-10-03 18:45:57.000000000 +0000 +@@ -38,9 +38,6 @@ + ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +-PROFILE14_LIB = lib$(PROFILE14_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +-PROFILE17_LIB = lib$(PROFILE17_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +-PROFILE18_LIB = lib$(PROFILE18_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + + CAIROCFLAGS = `pkg-config --cflags cairo` --- eclipse-3.4.1.orig/debian/patches/eclipse-gnuformatterjdtui.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-gnuformatterjdtui.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh -e +## +## DP: Make the GNU formation rules available in the +## DP: preferences(https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770) + +[ -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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java.orig 2006-01-12 05:34:37.000000000 +0000 ++++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java 2006-01-12 05:35:30.000000000 +0000 +@@ -439,6 +439,7 @@ + public static String NewLinesTabPage_annotations_group_option_after_annotation; + public static String ProfileManager_default_profile_name; + public static String ProfileManager_eclipse_profile_name; ++ public static String ProfileManager_gnu_profile_name; + public static String ProfileManager_java_conventions_profile_name; + public static String ProfileManager_unmanaged_profile; + public static String ProfileManager_unmanaged_profile_with_name; +--- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties.orig 2006-01-12 05:36:33.000000000 +0000 ++++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties 2006-01-12 05:37:20.000000000 +0000 +@@ -519,6 +519,7 @@ + + ProfileManager_default_profile_name=Eclipse 2.1 [built-in] + ProfileManager_eclipse_profile_name=Eclipse [built-in] ++ProfileManager_gnu_profile_name=GNU [built-in] + ProfileManager_java_conventions_profile_name=Java Conventions [built-in] + + ProfileManager_unmanaged_profile=Unmanaged profile --- eclipse-3.4.1.orig/debian/patches/eclipse-disable-motif.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disable-motif.dpatch @@ -0,0 +1,172 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-disable-motif.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 + +@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 @@ + + + +- +- +- +- +- + + + +@@ -251,12 +246,7 @@ + + + +- +- +- +- +- +- ++ + + + +--- 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 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -157,11 +132,6 @@ + + + +- +- +- +- +- + + + +--- 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 @@ + + + +- +- +- +- +- +- +- +- +- +- + + + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -117,26 +82,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-firefox2.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-firefox2.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-mozilla.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 + +@DPATCH@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.swt.tools +Index: source-tree/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v +retrieving revision 1.11.2.1 +diff -u -r1.11.2.1 org.eclipse.swt.internal.mozilla.XPCOM.properties +--- source-tree/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 26 Jul 2006 16:33:11 -0000 1.11.2.1 ++++ source-tree/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 29 Sep 2006 04:51:03 -0000 +@@ -24,17 +24,18 @@ + XPCOM_NS_GetServiceManager= + XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**) + +-XPCOM_NS_InitEmbedding= +-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *) +-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *) ++XPCOM_NS_InitXPCOM3= ++XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**) ++XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *) ++XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *) ++XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *) ++XPCOM_NS_InitXPCOM3_4=cast=(PRUint32) + + XPCOM_NS_NewLocalFile= + XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct + XPCOM_NS_NewLocalFile_1= + XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**) + +-XPCOM_NS_TermEmbedding= +- + XPCOM_PR_Free= + XPCOM_PR_Free_0=cast=(void *) + --- eclipse-3.4.1.orig/debian/patches/eclipse-disable-filelog.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disable-filelog.dpatch @@ -0,0 +1,100 @@ +#! /bin/sh -e +## +## DP: Prevents that output went in hidden log files. + +[ -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 + +@DPATCH@ +diff -r -u ../source-tree.orig/build.xml source-tree/build.xml +--- ../source-tree.orig/build.xml 2005-10-20 10:46:42.000000000 +0200 ++++ source-tree/build.xml 2005-10-20 10:48:50.000000000 +0200 +@@ -129,19 +129,19 @@ + pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.--> + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +diff -r -u ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml +--- ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml 2005-10-20 10:46:53.000000000 +0200 ++++ source-tree/plugins/org.eclipse.help.webapp/build.xml 2005-10-20 10:50:02.000000000 +0200 +@@ -167,7 +167,7 @@ + fork="true" + failonerror="false" + classpathref="jasper.classpath" +- output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log"> ++ > + + + +Nur in source-tree/plugins/org.eclipse.help.webapp: build.xml.orig. +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-10-20 10:46:45.000000000 +0200 ++++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-10-20 10:52:31.000000000 +0200 +@@ -67,7 +67,7 @@ + + + +- ++ + + + +diff -r -u ../source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml +--- ../source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-10-20 10:46:45.000000000 +0200 ++++ source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-10-20 10:52:53.000000000 +0200 +@@ -51,7 +51,7 @@ + + + +- ++ + + + +diff -r -u ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml +--- ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-10-20 10:46:45.000000000 +0200 ++++ source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-10-20 10:51:53.000000000 +0200 +@@ -100,7 +100,7 @@ + + + +- ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-swt-cflags.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-swt-cflags.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-swt-cflags.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.old 2005-10-11 13:12:05.267743000 +0000 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2005-10-11 13:22:09.269920816 +0000 +@@ -50,7 +50,7 @@ + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS + +-MOZILLACFLAGS = -O \ ++MOZILLACFLAGS = -O2 \ + -DXPCOM_GLUE=1 \ + -DMOZILLA_STRICT_API=1 \ + -fno-rtti \ +@@ -75,7 +75,7 @@ + GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o + MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o + +-CFLAGS = -O -Wall \ ++CFLAGS = -O2 -Wall \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ --- eclipse-3.4.1.orig/debian/patches/eclipse-libjawt.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libjawt.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libjawt.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.mk 2005-07-04 14:12:17.000000000 +0000 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2005-07-04 14:12:36.000000000 +0000 +@@ -39,7 +39,7 @@ + GTKCFLAGS = `pkg-config --cflags gtk+-2.0` + GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(XTEST_LIB_PATH) -lXtst + +-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared -s ++AWT_LIBS = -L$(AWT_LIB_PATH) -lgcjawt -shared -s + + ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` + ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0`-latk-1.0 -lgtk-x11-2.0 --- eclipse-3.4.1.orig/debian/patches/eclipse-disable-tomcat.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-disable-tomcat.dpatch @@ -0,0 +1,652 @@ +#! /bin/sh -e +## +## DP: Disabled the tomcat plugin, because tomcat is not available + +[ -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 + +@DPATCH@ +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml +--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-01-28 14:20:11.000000000 +0100 ++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-01-28 14:38:51.000000000 +0100 +@@ -67,9 +67,11 @@ + + + ++ + + + +@@ -100,9 +102,11 @@ + + + ++ + + + +@@ -238,9 +242,11 @@ + + + ++ + + + +@@ -526,10 +532,12 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml +--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-01-28 14:20:11.000000000 +0100 ++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-01-28 14:40:47.000000000 +0100 +@@ -67,9 +67,11 @@ + + + ++ + + + +@@ -97,9 +99,11 @@ + + + ++ + + + +@@ -232,9 +236,11 @@ + + + ++ + + + +@@ -513,10 +519,12 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml +--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-01-28 14:20:11.000000000 +0100 ++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-01-28 14:41:49.000000000 +0100 +@@ -67,9 +67,11 @@ + + + ++ + + + +@@ -100,9 +102,11 @@ + + + ++ + + + +@@ -241,9 +245,11 @@ + + + ++ + + + +@@ -526,10 +532,12 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml +--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-01-28 14:20:11.000000000 +0100 ++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-01-28 14:42:42.000000000 +0100 +@@ -67,9 +67,11 @@ + + + ++ + + + +@@ -103,9 +105,11 @@ + + + ++ + + + +@@ -241,9 +245,11 @@ + + + ++ + + + +@@ -526,10 +532,12 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml +--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-01-28 14:20:11.000000000 +0100 ++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-01-28 14:43:32.000000000 +0100 +@@ -67,9 +67,11 @@ + + + ++ + + + +@@ -97,9 +99,11 @@ + + + ++ + + + +@@ -238,9 +242,11 @@ + + + ++ + + + +@@ -522,10 +528,12 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml +--- source-tree.orig/features/org.eclipse.platform/build.xml 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/features/org.eclipse.platform/build.xml 2006-01-28 14:45:23.000000000 +0100 +@@ -42,11 +42,13 @@ + + + ++ + + + +@@ -62,11 +64,13 @@ + + + ++ + + + +@@ -92,11 +96,13 @@ + + + ++ + + + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/feature.xml source-tree/features/org.eclipse.platform/feature.xml +--- source-tree.orig/features/org.eclipse.platform/feature.xml 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/features/org.eclipse.platform/feature.xml 2006-01-28 14:35:05.000000000 +0100 +@@ -120,11 +120,11 @@ + unpack="false"/> + + +- ++ version="0.0.0"/> --> + + + +- ++ unpack="false"/> --> + + + + +- ++ version="0.0.0"/> --> + + +\ No newline at end of file ++ +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF +--- source-tree.orig/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2006-01-28 14:35:05.000000000 +0100 +@@ -19,7 +19,6 @@ + org.eclipse.help.standalone + Require-Bundle: org.apache.lucene, + org.eclipse.help;visibility:=reexport, +- org.eclipse.help.appserver, + org.eclipse.core.runtime, + org.eclipse.ant.core;resolution:=optional + Eclipse-AutoStart: true +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java +--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java 2006-01-28 14:35:05.000000000 +0100 +@@ -17,7 +17,6 @@ + import org.eclipse.core.runtime.*; + import org.eclipse.help.ILiveHelpAction; + import org.eclipse.help.browser.*; +-import org.eclipse.help.internal.appserver.*; + import org.eclipse.help.internal.base.util.*; + import org.eclipse.help.internal.browser.*; + import org.eclipse.help.internal.search.*; +@@ -184,9 +183,6 @@ + } + if (getInstance().webappStarted) { + // stop the web apps +- WebappManager.stop("help"); //$NON-NLS-1$ +- if (getMode() != MODE_WORKBENCH) +- WebappManager.stop("helpControl"); //$NON-NLS-1$ + } + + if (HelpBasePlugin.DEBUG) { +@@ -222,38 +218,8 @@ + } + + public static boolean ensureWebappRunning() { +- if (!getInstance().webappStarted) { +- getInstance().webappStarted = true; +- +- String webappPlugin = getWebappPlugin(); +- +- if (getMode() != MODE_WORKBENCH) { +- // start the help control web app +- try { +- WebappManager.start("helpControl", //$NON-NLS-1$ +- webappPlugin, Path.EMPTY); +- } catch (CoreException e) { +- HelpBasePlugin +- .logError( +- "Stand-alone help control web application failed to run.", //$NON-NLS-1$ +- e); +- return false; +- } +- } +- // start the help web app +- try { +- WebappManager.start("help", webappPlugin, Path.EMPTY); //$NON-NLS-1$ +- } catch (CoreException e) { +- HelpBasePlugin +- .logError( +- "The embedded application server could not run help web application.", e); //$NON-NLS-1$ +- BaseHelpSystem.getDefaultErrorUtil().displayError( +- HelpBaseResources.HelpWebappNotStarted); +- return false; +- } +- getInstance().webappRunning = true; +- +- } ++ getInstance().webappStarted = true; ++ getInstance().webappRunning = true; + return getInstance().webappRunning; + } + +@@ -316,9 +282,7 @@ + } + + private static String getBase(String servlet) { +- return "http://" //$NON-NLS-1$ +- + WebappManager.getHost() + ":" //$NON-NLS-1$ +- + WebappManager.getPort() + servlet; ++ return "file:///usr/share/eclipse/debian/help" + servlet; //$NON-NLS-1$ + } + + /** +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java +--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java 2006-01-28 14:35:05.000000000 +0100 +@@ -14,7 +14,6 @@ + import java.util.*; + + import org.eclipse.core.runtime.*; +-import org.eclipse.help.internal.appserver.*; + import org.eclipse.osgi.util.NLS; + + /** +@@ -102,24 +101,7 @@ + } + } + private void writeHostAndPort() throws IOException { +- Properties p = new Properties(); +- p.put("host", WebappManager.getHost()); //$NON-NLS-1$ +- p.put("port", "" + WebappManager.getPort()); //$NON-NLS-1$ //$NON-NLS-2$ +- +- File hostPortFile = new File(metadata, ".connection"); //$NON-NLS-1$ +- hostPortFile.deleteOnExit(); +- FileOutputStream out = null; +- try { +- out = new FileOutputStream(hostPortFile); +- p.store(out, null); +- } finally { +- if (out != null) { +- try { +- out.close(); +- } catch (IOException ioe2) { +- } +- } +- } ++ return; + + } + private void obtainLock() { +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java +--- source-tree.orig/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java 2006-01-28 14:35:05.000000000 +0100 +@@ -16,7 +16,6 @@ + import org.eclipse.core.runtime.*; + import org.eclipse.help.*; + import org.eclipse.help.internal.*; +-import org.eclipse.help.internal.appserver.*; + import org.eclipse.help.internal.context.*; + import org.eclipse.osgi.util.NLS; + +@@ -161,14 +160,16 @@ + * identify how help displays the document + */ + private void displayHelpURL(String helpURL, boolean forceExternal) { +- if (!BaseHelpSystem.ensureWebappRunning()) { ++ /*if (!BaseHelpSystem.ensureWebappRunning()) { + return; +- } ++ }*/ + if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_STANDALONE) { + // wait for Display to be created + DisplayUtils.waitForDisplay(); + } + ++ helpURL = "file:///usr/share/eclipse/debian/help.htm"; ++ + try { + /* + if (helpURL == null || helpURL.length() == 0) { +@@ -212,9 +213,7 @@ + } + + private String getBaseURL() { +- return "http://" //$NON-NLS-1$ +- + WebappManager.getHost() + ":" //$NON-NLS-1$ +- + WebappManager.getPort() + "/help/"; //$NON-NLS-1$ ++ return "file:///usr/share/eclipse/debian/help/"; //$NON_NLS1-$ + } + + private String getFramesetURL() { +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF +--- source-tree.orig/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF 2006-01-28 14:35:05.000000000 +0100 +@@ -15,7 +15,6 @@ + org.eclipse.help.ui.internal.util;x-internal:=true, + org.eclipse.help.ui.internal.views;x-internal:=true + Require-Bundle: org.eclipse.help.base, +- org.eclipse.help.appserver, + org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.ui.forms +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java +--- source-tree.orig/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/AppserverPreferencePage.java 2006-01-28 14:35:05.000000000 +0100 +@@ -10,7 +10,6 @@ + *******************************************************************************/ + package org.eclipse.help.ui.internal; + import org.eclipse.core.runtime.Preferences; +-import org.eclipse.help.internal.appserver.AppserverPlugin; + import org.eclipse.jface.preference.*; + import org.eclipse.swt.SWT; + import org.eclipse.swt.events.*; +@@ -141,9 +140,13 @@ + } + }); + +- Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); +- textServerAddr.setText(pref.getString(AppserverPlugin.HOST_KEY)); +- textServerPort.setText(pref.getString(AppserverPlugin.PORT_KEY)); ++ //Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); ++ //textServerAddr.setText(pref.getString(AppserverPlugin.HOST_KEY)); ++ //textServerPort.setText(pref.getString(AppserverPlugin.PORT_KEY)); ++ textServerAddr.setText(""); ++ textServerPort.setText(""); ++ textServerAddr.setEnabled(false); ++ textServerPort.setEnabled(false); + + return mainComposite; + } +@@ -162,19 +165,23 @@ + *

+ */ + protected void performDefaults() { +- Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); +- textServerAddr.setText(pref.getDefaultString(AppserverPlugin.HOST_KEY)); +- textServerPort.setText(pref.getDefaultString(AppserverPlugin.PORT_KEY)); ++ //Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); ++ //textServerAddr.setText(pref.getDefaultString(AppserverPlugin.HOST_KEY)); ++ //textServerPort.setText(pref.getDefaultString(AppserverPlugin.PORT_KEY)); ++ textServerAddr.setText(""); ++ textServerPort.setText(""); ++ textServerAddr.setEnabled(false); ++ textServerPort.setEnabled(false); + super.performDefaults(); + } + /** + * @see IPreferencePage + */ + public boolean performOk() { +- Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); +- pref.setValue(AppserverPlugin.HOST_KEY, textServerAddr.getText()); +- pref.setValue(AppserverPlugin.PORT_KEY, textServerPort.getText()); +- AppserverPlugin.getDefault().savePluginPreferences(); ++ //Preferences pref = AppserverPlugin.getDefault().getPluginPreferences(); ++ //pref.setValue(AppserverPlugin.HOST_KEY, textServerAddr.getText()); ++ //pref.setValue(AppserverPlugin.PORT_KEY, textServerPort.getText()); ++ //AppserverPlugin.getDefault().savePluginPreferences(); + return true; + } + +diff -N -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.platform.source/build.xml source-tree/plugins/org.eclipse.platform.source/build.xml +--- source-tree.orig/plugins/org.eclipse.platform.source/build.xml 2006-01-28 14:20:12.000000000 +0100 ++++ source-tree/plugins/org.eclipse.platform.source/build.xml 2006-01-28 14:46:35.000000000 +0100 +@@ -81,10 +81,12 @@ + + + ++ + + + +@@ -137,18 +139,22 @@ + + + ++ + + + + ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-link-classpathdoc.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-link-classpathdoc.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh -e +## +## DP: Use the classpath.org javadoc as reference to improve the build time + +[ -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 + +@DPATCH@ +diff -u -r ../source-tree.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions +--- ../source-tree.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions 2005-10-21 17:15:47.000000000 +0200 ++++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions 2005-10-21 17:24:53.000000000 +0200 +@@ -11,7 +11,7 @@ + -bottom "Copyright (c) IBM Corp. and others 2000, 2005. All Rights Reserved." + -group "Java Development Tools Core Plug-in Packages" "org.eclipse.jdt.core:org.eclipse.jdt.core.*" + -group "Java Development Tools UI Plug-in Packages" "org.eclipse.jdt.ui:org.eclipse.jdt.ui.*" +--link http://java.sun.com/j2se/1.4/docs/api ++-linkoffline /usr/share/doc/classpath-doc/api /usr/share/doc/classpath-doc/api + -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api + -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi + +diff -u -r ../source-tree.orig/plugins/org.eclipse.pde.doc.user/pdeOptions source-tree/plugins/org.eclipse.pde.doc.user/pdeOptions +--- ../source-tree.orig/plugins/org.eclipse.pde.doc.user/pdeOptions 2005-10-21 17:15:47.000000000 +0200 ++++ source-tree/plugins/org.eclipse.pde.doc.user/pdeOptions 2005-10-21 17:25:57.000000000 +0200 +@@ -9,7 +9,7 @@ + -doctitle "Eclipse PDE API Specification" + -header "Eclipse PDE
Release 3.1" + -bottom "Copyright (c) IBM Corp. and others 2000, 2005. All Rights Reserved." +--link http://java.sun.com/j2se/1.4/docs/api ++-linkoffline /usr/share/doc/classpath-doc/api /usr/share/doc/classpath-doc/api + -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api + -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi + -linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ../org.eclipse.jdt.doc.isv/reference/api +diff -u -r ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/platformOptions source-tree/plugins/org.eclipse.platform.doc.isv/platformOptions +--- ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/platformOptions 2005-10-21 17:15:46.000000000 +0200 ++++ source-tree/plugins/org.eclipse.platform.doc.isv/platformOptions 2005-10-21 17:23:19.000000000 +0200 +@@ -10,7 +10,7 @@ + -doctitle "Eclipse Platform API Specification" + -header "Eclipse Platform
Release 3.1" + -bottom '

Guidelines for using Eclipse APIs.

Copyright (c) IBM Corp. and others 2000, 2005. All rights reserved.

' +--link http://java.sun.com/j2se/1.4.2/docs/api ++-linkoffline /usr/share/doc/classpath-doc/api /usr/share/doc/classpath-doc/api + -link ../osgi + + org.eclipse.ant.core --- eclipse-3.4.1.orig/debian/patches/eclipse-icu4j.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-icu4j.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh -e +## +## DP: Debian specific 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 + +@DPATCH@ +--- /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.core.databinding/build.xml.orig 2008-02-28 22:48:51.000000000 +0100 ++++ /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.core.databinding/build.xml 2008-02-28 22:50:03.000000000 +0100 +@@ -81,7 +81,7 @@ + + + +- ++ + + + +--- /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.ui.workbench/build.xml.orig 2008-02-28 23:09:27.000000000 +0100 ++++ /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.ui.workbench/build.xml 2008-02-28 23:09:59.000000000 +0100 +@@ -90,7 +90,7 @@ + + + +- ++ + + + +--- /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.text/build.xml.orig 2008-02-28 23:15:16.000000000 +0100 ++++ /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.text/build.xml 2008-02-28 23:15:48.000000000 +0100 +@@ -72,7 +72,7 @@ + + + +- ++ + + + +--- /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.debug.core/build.xml.orig 2008-02-29 07:46:59.000000000 +0100 ++++ /home/mkoch/Debian/packages/java/eclipse-3.3/test/eclipse-3.3.1.1/source-tree/plugins/org.eclipse.debug.core/build.xml 2008-02-29 07:47:19.000000000 +0100 +@@ -72,7 +72,7 @@ + + + +- ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch @@ -0,0 +1,152 @@ +#! /bin/sh -e +## +## DP: Change manifest of the Ant plugin to adapt the available Ant libs + +[ -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 + +@DPATCH@ +--- 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 @@ + install-size="0" + version="0.0.0" + unpack="false"/> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.old 2007-03-29 14:08:50.000000000 +0200 ++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2007-03-29 14:09:50.000000000 +0200 +@@ -348,6 +348,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 +--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.old 2007-02-12 19:46:40.000000000 +0100 ++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2007-03-29 14:09:50.000000000 +0200 +@@ -52,6 +52,11 @@ + Platform.ARCH_X86, // + Platform.ARCH_AMD64, // + Platform.ARCH_IA64, // ++ Platform.ARCH_PPC64, // ++ Platform.ARCH_SPARC64, // ++ Platform.ARCH_S390, // ++ Platform.ARCH_S390X, // ++ Platform.ARCH_HPPA, // + Platform.ARCH_IA64_32}; + private static final String BOOT = "-boot"; //$NON-NLS-1$ + private static final String CLASSLOADER_PROPERTIES = "-classloaderProperties"; //$NON-NLS-1$ +--- source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.old 2007-02-12 19:46:42.000000000 +0100 ++++ source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 2007-03-29 14:09:50.000000000 +0200 +@@ -64,7 +64,7 @@ + private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$ + private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$ + private static PluginConverterImpl instance; +- private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64}; ++ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X, org.eclipse.osgi.service.environment.Constants.ARCH_HPPA}; + 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/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 --- eclipse-3.4.1.orig/debian/patches/eclipse-tomcat55.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-tomcat55.dpatch @@ -0,0 +1,772 @@ +#! /bin/sh -e +## + +[ -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 + +@DPATCH@ +diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/.classpath source-tree/plugins/org.eclipse.tomcat/.classpath +--- source-tree.orig/plugins/org.eclipse.tomcat/.classpath 9 May 2006 18:51:41 -0000 1.21 ++++ source-tree/plugins/org.eclipse.tomcat/.classpath 16 Nov 2007 16:03:10 -0000 +@@ -1,28 +1,35 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF +--- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 31 May 2007 18:15:24 -0000 1.25 ++++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 16 Nov 2007 16:03:10 -0000 +@@ -1,7 +1,7 @@ + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName +-Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true ++Bundle-SymbolicName: org.eclipse.tomcat;singleton:=true + Bundle-Version: 4.1.230.qualifier + Bundle-ClassPath: tomcatwrapper.jar, + catalina.jar, +@@ -11,21 +11,28 @@ + commons-digester.jar, + commons-logging-api.jar, + commons-modeler.jar, +- jakarta-regexp-1.3.jar, +- jasper-compiler.jar, +- jasper-runtime.jar, + mx4j-jmx.jar, +- naming-common.jar, + naming-factory.jar, + naming-resources.jar, +- servlet.jar, +- servlets-common.jar, + servlets-default.jar, + servlets-invoker.jar, +- servlets-manager.jar, + tomcat-coyote.jar, +- tomcat-http11.jar, +- tomcat-util.jar ++ tomcat-util.jar, ++ catalina-optional.jar, ++ commons-dbcp.jar, ++ commons-digester-rss.jar, ++ commons-el.jar, ++ commons-fileupload.jar, ++ commons-launcher.jar, ++ commons-pool.jar, ++ jasper5-compiler.jar, ++ jasper5-runtime.jar, ++ jspapi.jar, ++ mx4j.jar, ++ mx4j-impl.jar, ++ regexp.jar, ++ servletapi5.jar, ++ tomcat-http.jar + Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin + Bundle-Vendor: %providerName + Bundle-Localization: plugin +diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java +--- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 Feb 2006 22:51:14 -0000 1.9 ++++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 16 Nov 2007 16:03:10 -0000 +@@ -68,16 +68,27 @@ + + package org.eclipse.tomcat.internal; + +- +-import java.io.*; +-import java.util.*; +- +-import javax.servlet.*; +-import javax.servlet.http.*; +- +-import org.apache.catalina.*; +-import org.apache.catalina.util.*; +-import org.apache.catalina.valves.*; ++import java.io.IOException; ++import java.io.PrintWriter; ++import java.io.StringWriter; ++import java.io.Writer; ++import java.util.Locale; ++ ++import javax.servlet.ServletException; ++import javax.servlet.ServletResponse; ++import javax.servlet.ServletRequest; ++import javax.servlet.http.HttpServletResponse; ++ ++import mx4j.log.Logger; ++ ++import org.apache.catalina.Globals; ++import org.apache.catalina.Valve; ++import org.apache.catalina.connector.Request; ++import org.apache.catalina.connector.Response; ++import org.apache.catalina.util.RequestUtil; ++import org.apache.catalina.util.StringManager; ++import org.apache.catalina.valves.Constants; ++import org.apache.catalina.valves.ValveBase; + import org.eclipse.core.runtime.Platform; + + +@@ -145,12 +156,12 @@ + * @exception IOException if an input/output error occurs + * @exception ServletException if a servlet error occurs + */ +- public void invoke(Request request, Response response, +- ValveContext context) ++ public void invoke(Request request, Response response) + throws IOException, ServletException { + + // Perform the request +- context.invokeNext(request, response); ++ Valve nextValve = getNext(); ++ nextValve.invoke(request, response); + + ServletRequest sreq = (ServletRequest) request; + Throwable throwable = +@@ -220,14 +231,11 @@ + throws IOException { + + // Do nothing on non-HTTP responses +- if (!(response instanceof HttpResponse)) +- return; +- HttpResponse hresponse = (HttpResponse) response; + if (!(response instanceof HttpServletResponse)) + return; + HttpServletResponse hres = (HttpServletResponse) response; +- int statusCode = hresponse.getStatus(); +- String message = RequestUtil.filter(hresponse.getMessage()); ++ int statusCode = response.getStatus(); ++ String message = RequestUtil.filter(response.getMessage()); + if (message == null) + message = ""; //$NON-NLS-1$ + +@@ -373,9 +381,9 @@ + */ + protected void log(String message) { + +- Logger logger = container.getLogger(); ++ Logger logger = (Logger) container.getLogger(); + if (logger != null) +- logger.log(this.toString() + ": " + message); //$NON-NLS-1$ ++ logger.info(this.toString() + ": " + message); //$NON-NLS-1$ + else + System.out.println(this.toString() + ": " + message); //$NON-NLS-1$ + +@@ -390,9 +398,9 @@ + */ + protected void log(String message, Throwable throwable) { + +- Logger logger = container.getLogger(); ++ Logger logger = (Logger) container.getLogger(); + if (logger != null) +- logger.log(this.toString() + ": " + message, throwable); //$NON-NLS-1$ ++ logger.info(this.toString() + ": " + message, throwable); //$NON-NLS-1$ + else { + System.out.println(this.toString() + ": " + message); //$NON-NLS-1$ + throwable.printStackTrace(System.out); +diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java +--- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 17 Apr 2006 15:24:57 -0000 1.46 ++++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 16 Nov 2007 16:03:10 -0000 +@@ -4,7 +4,7 @@ + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html +- * ++ * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +@@ -17,23 +17,22 @@ + import java.net.UnknownHostException; + import java.util.ArrayList; + +-import org.apache.catalina.Connector; + import org.apache.catalina.Context; + import org.apache.catalina.Engine; + import org.apache.catalina.Host; ++import org.apache.catalina.Lifecycle; + import org.apache.catalina.LifecycleEvent; + import org.apache.catalina.LifecycleException; + import org.apache.catalina.LifecycleListener; + import org.apache.catalina.Realm; ++import org.apache.catalina.connector.Connector; + import org.apache.catalina.core.StandardContext; + import org.apache.catalina.core.StandardHost; +-import org.apache.catalina.logger.FileLogger; + import org.apache.catalina.realm.MemoryRealm; + import org.apache.catalina.startup.Embedded; +-import org.apache.coyote.tomcat4.CoyoteConnector; +-import org.apache.coyote.tomcat4.CoyoteServerSocketFactory; ++import org.apache.coyote.http11.Http11Protocol; ++import org.apache.tomcat.util.net.jsse.JSSEImplementation; + import org.eclipse.core.runtime.CoreException; +-import org.eclipse.core.runtime.FileLocator; + import org.eclipse.core.runtime.IConfigurationElement; + import org.eclipse.core.runtime.IExtension; + import org.eclipse.core.runtime.IExtensionPoint; +@@ -56,6 +55,8 @@ + * should not be used + */ + public final static int SSL_DISABLED = -1; ++ ++ private final static String NULL = null; + + private String hostAddress; + +@@ -76,7 +77,9 @@ + private Host host = null; + + private Connector httpConnector = null; ++ private boolean hasConnection = false; + private Connector sslConnector = null; ++ private boolean hasSSLConnection = false; + // Con + private ArrayList contexts = new ArrayList(); + +@@ -92,24 +95,34 @@ + * java.lang.String) + */ + public synchronized void start(int port, String hostAddress) throws CoreException { +- this.hostAddress = hostAddress; ++ // if null passed for hostAddress, use local host ++ if (hostAddress == null) { ++ this.hostAddress = "127.0.0.1"; //$NON-NLS-1$ ++ } else { ++ this.hostAddress = hostAddress; ++ } ++ InetAddress iAddress = null; ++ ++ //Defaults to LOCALHOST ++ try{ ++ iAddress = InetAddress.getByName(this.hostAddress); ++ } catch (UnknownHostException uhe) { ++ // will default to all interfaces ++ } ++ ++ String hostname = iAddress.getHostName(); ++ + this.port = port; +- + if (isStarted) { + return; + } + isStarted = true; + try { +- FileLogger logger = new FileLogger(); +- logger.setDirectory(TomcatPlugin.getDefault().getStateLocation() +- .toOSString()); +- embedded = new Embedded(logger, new MemoryRealm()); +- embedded.setDebug(0); +- embedded.setLogger(logger); ++ embedded = new Embedded(new MemoryRealm()); + URL installURL = TomcatPlugin.getDefault().getBundle() + .getEntry("/"); //$NON-NLS-1$ +- URL resolvedURL = FileLocator.resolve(installURL); +- String home = FileLocator.toFileURL(resolvedURL).getFile(); ++ URL resolvedURL = Platform.resolve(installURL); ++ String home = Platform.asLocalURL(resolvedURL).getFile(); + System.setProperty("catalina.home", home); //$NON-NLS-1$ + String base = home; + System.setProperty("catalina.base", base); //$NON-NLS-1$ +@@ -120,14 +133,21 @@ + Realm realm = getRealm(); + embedded.setRealm(realm); + } +- ++ //the embedded application is now started by using embedded.start() ++ embedded.addLifecycleListener(new LifecycleListener(){ ++ public void lifecycleEvent(LifecycleEvent event) { ++ if (Lifecycle.START_EVENT.equals(event.getType())) ++ running = true; ++ } ++ ++ }); + // start now, and then add all the contexts.. + embedded.start(); + + // Create a very basic container hierarchy + engine = embedded.createEngine(); + +- host = embedded.createHost("localhost", home + "/webapps"); //$NON-NLS-1$ //$NON-NLS-2$ ++ host = embedded.createHost(hostname, home + "webapps"); //$NON-NLS-1$ + + // all request go to our only host + engine.setDefaultHost(host.getName()); +@@ -136,8 +156,9 @@ + ((StandardHost) host) + .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$ + } ++ + engine.addChild(host); +- ++ + // Install the assembled container hierarchy + PrintStream sysOut = System.out; + // reassign standard output to prevent Tomcat from writing +@@ -150,7 +171,7 @@ + } + + // Root context +- Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$ ++ Context root = embedded.createContext("", home + "webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$ + // this line should be replaced once tomcat provides support + // for setting the working directory + if (root instanceof StandardContext) { +@@ -159,20 +180,13 @@ + } + root.setLoader(embedded.createLoader(this.getClass() + .getClassLoader())); +- contexts.add(root); ++ + host.addChild(root); +- +- InetAddress iAddress = null; +- if (this.hostAddress != null) { +- try { +- iAddress = InetAddress.getByName(this.hostAddress); +- } catch (UnknownHostException uhe) { +- // will default to all interfaces +- } +- } ++ contexts.add(root); ++ + updateSslPort(iAddress); + if (this.port == 0) { +- this.port = SocketUtil.findUnusedLocalPort(iAddress); ++ this.port = SocketUtil.findUnusedLocalPort(iAddress); + if (this.port == -1) { + throw new CoreException( + new Status( +@@ -184,51 +198,55 @@ + } + } + +- // Create Connector +- Connector connector = embedded.createConnector(null, this.port, +- false); +- // Override defaults on CoyoteConnector +- if (connector instanceof CoyoteConnector) { +- CoyoteConnector connectorImpl = (CoyoteConnector) connector; +- if (iAddress != null) { +- // bug in Embedded that incorrectly sets host on connector. +- // pass null when creating connector, and set host here if +- // it is specified +- connectorImpl.setAddress(iAddress.getHostAddress()); +- } +- Preferences pref = TomcatPlugin.getDefault() +- .getPluginPreferences(); +- int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); +- if (acceptCount > 0) { +- connectorImpl.setAcceptCount(acceptCount); +- } +- int maxProcessors = pref +- .getInt(TomcatPlugin.PREF_MAX_PROCESSORS); +- if (maxProcessors > 0) { +- connectorImpl.setMaxProcessors(maxProcessors); +- } +- int minProcessors = pref +- .getInt(TomcatPlugin.PREF_MIN_PROCESSORS); +- if (minProcessors > 0) { +- connectorImpl.setMinProcessors(minProcessors); +- } +- if (this.sslPort > 0) { +- connectorImpl.setRedirectPort(this.sslPort); +- connectorImpl.setEnableLookups(true); +- connectorImpl.setConnectionTimeout(20000); +- connectorImpl.setUseURIValidationHack(false); +- connectorImpl.setDisableUploadTimeout(true); ++ // Create Connector ++ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false);; ++ ++ Preferences pref = TomcatPlugin.getDefault() ++ .getPluginPreferences(); ++ /** ++ * To extend additional properties, make use of org.apache.tomcat.util.IntrospectionUtils ++ * A Connector will initialize a protocolhandler defaults to org.apache.coyote.http11.Http11Protocol ++ * format : connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE"); ++ * ++ */ ++ ++ int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); ++ if (acceptCount > 0) { ++ connector.setProperty("backlog",""+acceptCount); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ ++ int maxProcessors = pref ++ .getInt(TomcatPlugin.PREF_MAX_PROCESSORS); ++ if (maxProcessors > 0) { ++ connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ ++ int minProcessors = pref ++ .getInt(TomcatPlugin.PREF_MIN_PROCESSORS); ++ if (minProcessors > 0) { ++ connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ ++ if (this.sslPort > 0) { ++ connector.setRedirectPort(this.sslPort); ++ connector.setEnableLookups(true); ++ connector.setProperty("soTimeout",""+20000); //$NON-NLS-1$ //$NON-NLS-2$ ++ //connector.setUseURIValidationHack(false); no longer available ++ connector.setUseBodyEncodingForURI(false); ++ String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT); ++ if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("disableUploadTimeout", disableUploadTimeout); //$NON-NLS-1$ + } +- // connectorImpl.setDebug(0); +- // If there is problem in embedded.addConnector() +- // there is no exception, so add a listener +- connectorImpl.addLifecycleListener(new LifecycleListener() { +- public void lifecycleEvent(LifecycleEvent event) { +- if ("start".equals(event.getType())) //$NON-NLS-1$ +- running = true; +- } +- }); + } ++ // connectorImpl.setDebug(0); ++ // If there is problem in embedded.addConnector() ++ // there is no exception, so add a listener ++ connector.addLifecycleListener(new LifecycleListener() { ++ public void lifecycleEvent(LifecycleEvent event) { ++ if (Lifecycle.START_EVENT.equals(event.getType())) ++ hasConnection = true; ++ } ++ }); + + // add Connector to Tomcat + PrintStream sysErr = System.err; +@@ -236,21 +254,16 @@ + // its version message there. + System.setErr(new PrintStream(new ByteArrayOutputStream())); + try { +- embedded.addConnector(connector); +- httpConnector = connector; ++ this.httpConnector = connector; ++ embedded.addConnector(this.httpConnector); ++ httpConnector.start(); + } finally { + System.setErr(sysErr); + } +- + if (this.sslPort > 0) { + createSSLConnector(iAddress, this.sslPort); + } + +- // if null passed for hostAddress, use local host +- if (this.hostAddress == null) { +- this.hostAddress = "127.0.0.1"; //$NON-NLS-1$ +- } +- + // running = true; + TomcatPlugin.getDefault().setAppserver(this); + +@@ -307,82 +320,115 @@ + * @throws CoreException + */ + private void createSSLConnector(InetAddress iAddress, int sslport) +- throws CoreException { ++ throws CoreException { ++ + // Create Connector +- this.sslConnector = embedded.createConnector(null, sslport, false); +- // Override defaults on CoyoteConnector +- if (this.sslConnector instanceof CoyoteConnector) { +- CoyoteConnector connectorImpl = (CoyoteConnector) this.sslConnector; +- if (iAddress != null) { +- // bug in Embedded that incorrectly sets host on connector. +- // pass null when creating connector, and set host here if +- // it is specified +- connectorImpl.setAddress(iAddress.getHostAddress()); +- } +- Preferences pref = TomcatPlugin.getDefault().getPluginPreferences(); +- int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); +- if (acceptCount > 0) { +- connectorImpl.setAcceptCount(acceptCount); +- } +- int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS); +- if (maxProcessors > 0) { +- connectorImpl.setMaxProcessors(maxProcessors); +- } +- int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS); +- if (minProcessors > 0) { +- connectorImpl.setMinProcessors(minProcessors); +- } +- connectorImpl.setUseURIValidationHack(false); +- connectorImpl.setDisableUploadTimeout(true); +- connectorImpl.setSecure(true); +- String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME); +- if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$ +- connectorImpl.setScheme(scheme); +- } +- connectorImpl.setEnableLookups(true); +- CoyoteServerSocketFactory factory = new CoyoteServerSocketFactory(); +- factory.setClientAuth(false); +- String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL); +- if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$ +- factory.setProtocol(protocol); +- } +- String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM); +- if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$ +- factory.setAlgorithm(algorithm); +- } +- String keyStoreFile = pref +- .getString(TomcatPlugin.PREF_KEY_STORE_FILE); +- if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$ +- factory.setKeystoreFile(keyStoreFile); +- } +- String keyStorePassword = pref +- .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD); +- if ((keyStorePassword != null) +- && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$ +- factory.setKeystorePass(keyStorePassword); +- } +- connectorImpl.setFactory(factory); +- connectorImpl.setDebug(0); +- // If there is problem in embedded.addConnector() +- // there is no exception, so add a listener +- connectorImpl.addLifecycleListener(new LifecycleListener() { +- public void lifecycleEvent(LifecycleEvent event) { +- if ("start".equals(event.getType())) //$NON-NLS-1$ +- running = true; +- } +- }); +- } ++ //Defaults to local if IAddress is null ++ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false); + +- // add Connector to Tomcat +- PrintStream sysErr = System.err; +- // reassign standard error to prevent Coyote from writing +- // its version message there. +- System.setErr(new PrintStream(new ByteArrayOutputStream())); +- try { +- embedded.addConnector(this.sslConnector); +- } finally { +- System.setErr(sysErr); ++ //--------------------create the Protocol-----------------------// ++ Preferences pref = TomcatPlugin.getDefault().getPluginPreferences(); ++ /** ++ * To extend additional properties, make use of org.apache.tomcat.util.IntrospectionUtils ++ * A Connector will initialize a protocolhandler which initialize a SSLImplementation which initialize ++ * a ServerSocketFactory ++ * format : connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE"); ++ * ++ */ ++ //----------------configure connector -------------------------------// ++ // by looking at the code, it seems like the protocol go in first ++ String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL); ++ if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("protocol",protocol); //$NON-NLS-1$ ++ } ++ String protocols = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOLS); ++ if ((protocols != null) && (!("".equals(protocols.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("protocols",protocols); //$NON-NLS-1$ ++ } ++ String protocolClassName = Http11Protocol.class.getName(); ++ connector.setProtocol(protocolClassName); ++ ++ String JSSEImplementationName = JSSEImplementation.class.getName(); ++ connector.setProperty("sslImplementation",JSSEImplementationName); //$NON-NLS-1$ ++ ++ String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT); ++ if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("disableUploadTimeout", disableUploadTimeout); //$NON-NLS-1$ ++ } ++ ++ String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM); ++ if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("algorithm", algorithm); //$NON-NLS-1$ ++ } ++ int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS); ++ if (maxProcessors > 0) { ++ //connector.setMaxProcessors(maxProcessors); ++ connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS); ++ if (minProcessors > 0) { ++ //connector.setMinProcessors(minProcessors); ++ connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ //this is making use of org.apache.tomcat.util.IntrospectionUtils ++ connector.setProperty("disableUploadTimeout",""+true); //$NON-NLS-1$ //$NON-NLS-2$ ++ String clientauth = pref.getString(TomcatPlugin.PREF_CLIENT_AUTHENTICATION); ++ if ((clientauth != null) && (!("".equals(clientauth.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("clientauth",clientauth); //$NON-NLS-1$ ++ } ++ ++ int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); ++ if (acceptCount > 0) { ++ connector.setProperty("backlog",""+acceptCount); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ ++ String keyStoreFile = pref ++ .getString(TomcatPlugin.PREF_KEY_STORE_FILE); ++ if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("keystore", keyStoreFile); //$NON-NLS-1$ ++ } ++ String keyStorePassword = pref ++ .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD); ++ if ((keyStorePassword != null) ++ && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$ ++ connector.setProperty("keypass", keyStorePassword); //$NON-NLS-1$ ++ } ++ //connector.setUseURIValidationHack(false); --no longer avaliable, hope they fixed the bug ++ connector.setUseBodyEncodingForURI(false); ++ // connector.setSecure(true); ---setting ssLImplementation set secure to true ++ String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME); ++ if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$ ++ connector.setScheme(scheme); ++ } ++ connector.setEnableLookups(true); ++ ++ //connector.setFactory(factory); --no longer needed, now handled by SSLImplemenatation ++ // If there is problem in embedded.addConnector() ++ // there is no exception, so add a listener ++ connector.addLifecycleListener(new LifecycleListener() { ++ public void lifecycleEvent(LifecycleEvent event) { ++ if (Lifecycle.START_EVENT.equals(event.getType())||Lifecycle.PERIODIC_EVENT.equals(event.getType())) ++ hasSSLConnection = true; ++ } ++ }); ++ // add Connector to Tomcat ++ PrintStream sysErr = (PrintStream) System.err; ++ // reassign standard error to prevent Coyote from writing ++ // its version message there. ++ System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ try{ ++ sslConnector = connector; ++ embedded.addConnector(this.sslConnector); ++ sslConnector.start(); ++ } catch(LifecycleException e){ ++ TomcatPlugin ++ .logError( ++ "Exception occurred while establishing secure connection.", //$NON-NLS-1$ ++ e); + } ++ finally { ++ System.setErr(sysErr); ++ } + } + + /** +@@ -461,17 +507,16 @@ + */ + public synchronized void start(String webappName, IPath path, ClassLoader customLoader) + throws CoreException { +- ++ + if (!isStarted) { + start(port, hostAddress); +- } ++ } + if (!running) { + throw new CoreException(new Status(IStatus.ERROR, + TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind( + TomcatResources.TomcatAppServer_addingWebapp, + webappName, path.toOSString()), null)); + } +- + String contextPath = webappName; + if (!contextPath.startsWith("/")) { //$NON-NLS-1$ + contextPath = "/" + contextPath; //$NON-NLS-1$ +@@ -486,7 +531,6 @@ + + WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader); + context.setLoader(embedded.createLoader(webappLoader)); +- + host.addChild(context); + contexts.add(context); + } catch (Exception exc) { +@@ -601,4 +645,4 @@ + return TomcatPlugin.getDefault().getStateLocation().append(webApp) + .toOSString(); + } +-} ++} +\ No newline at end of file +diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java +--- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java 23 May 2005 03:58:20 -0000 1.24 ++++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java 16 Nov 2007 16:03:10 -0000 +@@ -24,13 +24,16 @@ + public final static String PREF_ACCEPT_COUNT = "acceptCount"; //$NON-NLS-1$ + public final static String PREF_MAX_PROCESSORS = "maxProcessors"; //$NON-NLS-1$ + public final static String PREF_MIN_PROCESSORS = "minProcessors"; //$NON-NLS-1$ ++ public final static String DISABLE_UPLOAD_TIMEOUT = "disableUploadTimeout"; //$NON-NLS-1$ + + public final static String PREF_SSL_PORT = "sslPort"; //$NON-NLS-1$ + public final static String PREF_SSL_PROTOCOL = "sslProtocol"; //$NON-NLS-1$ ++ public final static String PREF_SSL_PROTOCOLS = "sslProtocols"; //$NON-NLS-1$ + public final static String PREF_SSL_SCHEME = "sslScheme"; //$NON-NLS-1$ + public final static String PREF_SSL_ALGORITHM = "sslAlgorithm"; //$NON-NLS-1$ + public final static String PREF_KEY_STORE_FILE = "keyStoreFile"; //$NON-NLS-1$ + public final static String PREF_KEY_STORE_PASSWORD = "keyStorePassword"; //$NON-NLS-1$ ++ public final static String PREF_CLIENT_AUTHENTICATION = "clientauth"; //$NON-NLS-1$ + + private static TomcatPlugin plugin; + // private static BundleContext bundleContext; --- eclipse-3.4.1.orig/debian/patches/eclipse-awt-libpath.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-awt-libpath.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-awt-libpath.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~ 2006-10-16 12:14:04.218388000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-10-16 12:52:27.888388000 +0200 +@@ -115,6 +115,12 @@ + if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then + AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH} + export AWT_LIB_PATH ++ elif [ -d /usr/lib/gcj-4.2 ]; then ++ AWT_LIB_PATH=/usr/lib/gcj-4.2 ++ export AWT_LIB_PATH ++ elif [ -d ${JAVA_HOME}/lib ]; then ++ AWT_LIB_PATH=${JAVA_HOME}/lib ++ export AWT_LIB_PATH + else + AWT_LIB_PATH=${JAVA_HOME}/jre/bin + export AWT_LIB_PATH --- eclipse-3.4.1.orig/debian/patches/eclipse-ecj-gcj.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-ecj-gcj.dpatch @@ -0,0 +1,523 @@ +#! /bin/sh -e +## +## DP: + +[ -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 + +@DPATCH@ +--- /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 @@ ++/** ++ * ++ */ ++package org.eclipse.jdt.internal.compiler.batch; ++ ++import java.io.BufferedOutputStream; ++import java.io.BufferedReader; ++import java.io.ByteArrayInputStream; ++import java.io.File; ++import java.io.FileOutputStream; ++import java.io.FileReader; ++import java.io.IOException; ++import java.io.InputStreamReader; ++import java.io.OutputStream; ++import java.io.PrintWriter; ++import java.io.UnsupportedEncodingException; ++import java.util.ArrayList; ++import java.util.HashSet; ++import java.util.Iterator; ++import java.util.Map; ++import java.util.StringTokenizer; ++import java.util.zip.CRC32; ++import java.util.zip.ZipEntry; ++import java.util.zip.ZipOutputStream; ++ ++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; ++import org.eclipse.jdt.internal.compiler.util.Messages; ++import org.eclipse.jdt.internal.compiler.util.SuffixConstants; ++ ++/** ++ * This is an alternate entry point for the command-line compiler which ++ * is simpler to integrate into GCC. In particular the option processing ++ * is more GNU-like and the recognized options are similar to those supported ++ * by other GCC front ends. ++ */ ++public class GCCMain extends Main { ++ ++ // All the compilation units specified on the command line. ++ private HashSet commandLineCompilationUnits = new HashSet(); ++ // True if we are only checking syntax. ++ private boolean syntaxOnly; ++ // If not null, the name of the output zip file. ++ // If null, we are generating class files in the file system, ++ // not a zip file. ++ private String zipDestination; ++ // The zip stream to which we're writing, or null if it hasn't been opened. ++ private ZipOutputStream zipStream; ++ ++ // If not null, the name of the zip file to which dependency class files ++ // should be written. ++ private String zipDependencyDestination; ++ // The zip stream to which dependency files should be written. ++ private ZipOutputStream zipDependencyStream; ++ ++ public GCCMain(PrintWriter outWriter, PrintWriter errWriter, ++ boolean systemExitWhenFinished) { ++ super(outWriter, errWriter, systemExitWhenFinished); ++ this.logger.setEmacs(); ++ } ++ ++ public GCCMain(PrintWriter outWriter, PrintWriter errWriter, ++ boolean systemExitWhenFinished, Map customDefaultOptions) { ++ super(outWriter, errWriter, systemExitWhenFinished, ++ customDefaultOptions); ++ this.logger.setEmacs(); ++ } ++ ++ private void fail(Exception t) { ++ this.logger.logException(t); ++ System.exit(1); ++ } ++ ++ public CompilationUnit[] getCompilationUnits() throws InvalidInputException { ++ CompilationUnit[] units = super.getCompilationUnits(); ++ for (int i = 0; i < units.length; ++i) ++ this.commandLineCompilationUnits.add(units[i]); ++ return units; ++ } ++ ++ private String combine(char[] one, char[] two) { ++ StringBuffer b = new StringBuffer(); ++ b.append(one); ++ b.append(two); ++ return b.toString(); ++ } ++ ++ private ZipOutputStream getZipOutput() throws IOException { ++ if (this.zipDestination != null && this.zipStream == null) { ++ OutputStream os; ++ if ("-".equals(this.zipDestination)) { //$NON-NLS-1$ ++ os = System.out; ++ } else { ++ os = new FileOutputStream(this.zipDestination); ++ } ++ zipStream = new ZipOutputStream(new BufferedOutputStream(os)); ++ zipStream.setMethod(ZipOutputStream.STORED); ++ } ++ return zipStream; ++ } ++ ++ private ZipOutputStream getDependencyOutput() throws IOException { ++ if (this.zipDependencyDestination != null && this.zipDependencyStream == null) { ++ OutputStream os = new FileOutputStream(zipDependencyDestination); ++ zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os)); ++ zipDependencyStream.setMethod(ZipOutputStream.STORED); ++ } ++ return zipDependencyStream; ++ } ++ ++ public void outputClassFiles(CompilationResult unitResult) { ++ if (this.syntaxOnly) { ++ return; ++ } ++ if (this.zipDestination == null) { ++ // Nothing special to do here. ++ super.outputClassFiles(unitResult); ++ return; ++ } ++ if (unitResult == null || unitResult.hasErrors()) { ++ return; ++ } ++ ++ // If we are compiling with indirect dispatch, we don't need ++ // any dependent classes. If we are using the C++ ABI, then we ++ // do need the dependencies in order to do proper layout. ++ boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit()); ++ if (this.zipDependencyDestination == null && !gcjCompile) { ++ return; ++ } ++ ++ try { ++ ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput(); ++ ClassFile[] classFiles = unitResult.getClassFiles(); ++ for (int i = 0; i < classFiles.length; ++i) { ++ ClassFile classFile = classFiles[i]; ++ String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class); ++ if (this.verbose) ++ this.out.println( ++ Messages.bind( ++ Messages.compilation_write, ++ new String[] { ++ String.valueOf(this.exportedClassFilesCounter+1), ++ filename ++ })); ++ ZipEntry entry = new ZipEntry(filename); ++ byte[] contents = classFile.getBytes(); ++ CRC32 crc = new CRC32(); ++ crc.update(contents); ++ entry.setSize(contents.length); ++ entry.setCrc(crc.getValue()); ++ dest.putNextEntry(entry); ++ dest.write(contents); ++ dest.closeEntry(); ++ } ++ } catch (IOException err) { ++ fail(err); ++ } ++ } ++ ++ private String getArgument(String option) { ++ int index = option.indexOf('='); ++ return option.substring(index + 1); ++ } ++ ++ private void addPath(ArrayList result, String currentClasspathName) { ++ String customEncoding = null; ++ AccessRule[] accessRules = new AccessRule[0]; ++ ++ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName); ++ FileSystem.Classpath currentClasspath = FileSystem ++ .getClasspath(currentClasspathName, ++ customEncoding, accessRuleSet); ++ if (currentClasspath != null) { ++ result.add(currentClasspath); ++ } ++ } ++ ++ private void parsePath(ArrayList result, String path) { ++ StringTokenizer iter = new StringTokenizer(path, File.pathSeparator); ++ while (iter.hasMoreTokens()) { ++ addPath(result, iter.nextToken()); ++ } ++ } ++ ++ 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$ ++ else if ("static-access".equals(token) //$NON-NLS-1$ ++ || "dep-ann".equals(token) //$NON-NLS-1$ ++ || "over-ann".equals(token)) { //$NON-NLS-1$ ++ // Some exceptions to the warning naming rule. ++ } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$ ++ // Compatibility with earlier versions of gcj. ++ token = "semicolon"; //$NON-NLS-1$ ++ } else { ++ // Turn "foo-bar-baz" into eclipse-style "fooBarBaz". ++ StringBuffer newToken = new StringBuffer(token.length()); ++ StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$ ++ boolean first = true; ++ while (t.hasMoreTokens()) { ++ String next = t.nextToken(); ++ if (first) { ++ newToken.append(next); ++ first = false; ++ } else { ++ newToken.append(Character.toUpperCase(next.charAt(0))); ++ newToken.append(next.substring(1)); ++ } ++ } ++ token = newToken.toString(); ++ } ++ super.handleWarningToken(token, isEnabling); ++ } ++ ++ private void turnWarningsToErrors() { ++ Object[] entries = this.options.entrySet().toArray(); ++ for (int i = 0, max = entries.length; i < max; i++) { ++ Map.Entry entry = (Map.Entry) entries[i]; ++ if (!(entry.getKey() instanceof String)) ++ continue; ++ if (!(entry.getValue() instanceof String)) ++ continue; ++ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) { ++ this.options.put(entry.getKey(), CompilerOptions.ERROR); ++ } ++ } ++ } ++ ++ /** ++ * Set the debug level to the indicated value. The level should be ++ * between 0 and 2, inclusive, but this is not checked. ++ * @param level the debug level ++ */ ++ private void setDebugLevel(int level) { ++ this.options.put( ++ CompilerOptions.OPTION_LocalVariableAttribute, ++ level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_LineNumberAttribute, ++ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_SourceFileAttribute, ++ CompilerOptions.GENERATE); ++ } ++ ++ private void readFileList(String file, ArrayList result) { ++ try { ++ BufferedReader b = new BufferedReader(new FileReader(file)); ++ String line; ++ while ((line = b.readLine()) != null) { ++ if (line.endsWith(SUFFIX_STRING_java)) ++ result.add(line); ++ } ++ b.close(); ++ } catch (IOException err) { ++ fail(err); ++ } ++ } ++ ++ private void readAllFileListFiles(ArrayList fileList, ArrayList result) { ++ Iterator it = fileList.iterator(); ++ while (it.hasNext()) { ++ readFileList((String) it.next(), result); ++ } ++ } ++ ++ private void handleWall(boolean enable) throws InvalidInputException { ++ // A somewhat arbitrary list. We use the GCC names ++ // here, and the local handleWarningToken translates ++ // for us. ++ 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 { ++ if ((argv == null) || (argv.length == 0)) { ++ // This is a "can't happen". ++ System.exit(1); ++ } ++ ++ ArrayList files = new ArrayList(); ++ ArrayList otherFiles = new ArrayList(); ++ String classpath = null; ++ boolean haveFileList = false; ++ boolean inhibitAllWarnings = false; ++ boolean treatWarningsAsErrors = false; ++ ++ for (int i = 0; i < argv.length; ++i) { ++ String currentArg = argv[i]; ++ ++ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$ ++ // Simply accept the last one. ++ String encoding = getArgument(currentArg); ++ try { // ensure encoding is supported ++ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding); ++ } catch (UnsupportedEncodingException e) { ++ throw new InvalidInputException( ++ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$ ++ } ++ this.options.put(CompilerOptions.OPTION_Encoding, encoding); ++ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$ ++ String arg = getArgument(currentArg); ++ if (this.destinationPath != null) { ++ StringBuffer errorMessage = new StringBuffer(); ++ errorMessage.append("-d"); //$NON-NLS-1$ ++ errorMessage.append(' '); ++ errorMessage.append(arg); ++ throw new InvalidInputException( ++ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ ++ } ++ this.destinationPath = arg; ++ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ ++ classpath = getArgument(currentArg); ++ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ ++ ++i; ++ if (i >= argv.length) ++ throw new InvalidInputException(this.bind("gcc.zipArg")); //$NON-NLS-1$ ++ this.zipDestination = argv[i]; ++ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$ ++ ++i; ++ if (i >= argv.length) ++ throw new InvalidInputException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$ ++ this.zipDependencyDestination = argv[i]; ++ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$ ++ if (currentArg.equals("-g0")) { //$NON-NLS-1$ ++ setDebugLevel(0); ++ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$ ++ || currentArg.equals("-g")) { //$NON-NLS-1$ ++ setDebugLevel(2); ++ } else { ++ // Handle -g1 but also things like -gstabs. ++ setDebugLevel(1); ++ } ++ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = true; ++ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = false; ++ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$ ++ handleWall(true); ++ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$ ++ handleWall(false); ++ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$ ++ handleWarningToken(currentArg.substring(5), false); ++ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$ ++ handleWarningToken(currentArg.substring(2), true); ++ } else if (currentArg.equals("-w")) { //$NON-NLS-1$ ++ inhibitAllWarnings = true; ++ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$ ++ // Ignore. ++ } else if (currentArg.equals("-v")) { //$NON-NLS-1$ ++ this.verbose = true; ++ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$ ++ this.syntaxOnly = true; ++ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$ ++ currentArg = getArgument(currentArg); ++ if (currentArg.equals("1.3")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3); ++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4); ++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); ++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); ++ } else { ++ throw new InvalidInputException(this.bind("configure.source", currentArg)); //$NON-NLS-1$ ++ } ++ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$ ++ currentArg = getArgument(currentArg); ++ if (currentArg.equals("1.1")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1); ++ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2); ++ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3); ++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4); ++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); ++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); ++ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14); ++ } else { ++ throw new InvalidInputException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$ ++ } ++ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$ ++ haveFileList = true; ++ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) { ++ files.add(currentArg); ++ } else if (currentArg.charAt(0) == '-'){ ++ // FIXME: error if not a file? ++ } else { ++ otherFiles.add(currentArg); ++ } ++ } ++ ++ // Read the file list file. We read them all, but really there ++ // will only be one. ++ if (haveFileList) ++ readAllFileListFiles(otherFiles, files); ++ ++ this.filenames = (String[]) files.toArray(new String[0]); ++ this.encodings = new String[this.filenames.length]; ++ this.destinationPaths = new String[this.filenames.length]; ++ for (int i = 0; i < this.filenames.length; ++i) ++ this.destinationPaths[i] = this.destinationPath; ++ ++ // Classpath processing. ++ ArrayList result = new ArrayList(); ++ if (classpath == null) ++ throw new InvalidInputException(this.bind("gcc.noClasspath")); //$NON-NLS-1$ ++ parsePath(result, classpath); ++ ++ // We must always create both output files, even if one is not used. ++ // That way we will always pass valid zip file on to jc1. ++ try { ++ getZipOutput(); ++ getDependencyOutput(); ++ } catch (IOException err) { ++ fail(err); ++ } ++ ++ if (inhibitAllWarnings) ++ disableWarnings(); ++ if (treatWarningsAsErrors) ++ turnWarningsToErrors(); ++ ++ this.checkedClasspaths = new FileSystem.Classpath[result.size()]; ++ result.toArray(this.checkedClasspaths); ++ ++ this.logger.logCommandLineArguments(argv); ++ this.logger.logOptions(this.options); ++ this.logger.logClasspath(this.checkedClasspaths); ++ } ++ ++ public boolean compile(String[] argv) { ++ boolean result = super.compile(argv); ++ try { ++ if (zipStream != null) { ++ zipStream.finish(); ++ zipStream.close(); ++ } ++ if (zipDependencyStream != null) { ++ zipDependencyStream.finish(); ++ zipDependencyStream.close(); ++ } ++ } catch (IOException err) { ++ fail(err); ++ } ++ return result; ++ } ++ ++ public static void main(String[] argv) { ++ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv); ++ 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 --- eclipse-3.4.1.orig/debian/patches/eclipse-gjdoc-reflection.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-gjdoc-reflection.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh -e +## +## DP: gjdoc bug, which can partly prevented by using the -reflection option. +## DP: See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23917 + +[ -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 + +@DPATCH@ +diff -r -u source-tree.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions +--- source-tree.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions 2005-11-08 14:12:45.000000000 +0100 ++++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions 2005-11-08 14:41:07.000000000 +0100 +@@ -1,3 +1,4 @@ ++-reflection + -charset "iso-8859-1" + -sourcepath "../org.eclipse.jdt.core/antadapter:../org.eclipse.jdt.core/batch:../org.eclipse.jdt.core/codeassist:../org.eclipse.jdt.core/compiler:../org.eclipse.jdt.core/dom:../org.eclipse.jdt.core/eval:../org.eclipse.jdt.core/formatter:../org.eclipse.jdt.core/model:../org.eclipse.jdt.core/search:../org.eclipse.jdt.debug/model:../org.eclipse.jdt.debug/jdi:../org.eclipse.jdt.debug/eval:../org.eclipse.jdt.debug.ui/ui:../org.eclipse.jdt.junit/src:../org.eclipse.jdt.junit.runtime/src:../org.eclipse.jdt.launching/launching:../org.eclipse.jdt.ui/ui:../org.eclipse.jdt.ui/core refactoring:../org.eclipse.jdt.ui/ui refactoring:../org.eclipse.jdt.ui/core extension" + -d reference/api +diff -r -u source-tree.orig/plugins/org.eclipse.pde.doc.user/pdeOptions source-tree/plugins/org.eclipse.pde.doc.user/pdeOptions +--- source-tree.orig/plugins/org.eclipse.pde.doc.user/pdeOptions 2005-11-08 14:12:45.000000000 +0100 ++++ source-tree/plugins/org.eclipse.pde.doc.user/pdeOptions 2005-11-08 14:41:32.000000000 +0100 +@@ -1,3 +1,4 @@ ++-reflection + -charset "iso-8859-1" + -sourcepath "../org.eclipse.pde.core/src:../org.eclipse.pde.ui/src" + -d reference/api +diff -r -u source-tree.orig/plugins/org.eclipse.platform.doc.isv/platformOptions source-tree/plugins/org.eclipse.platform.doc.isv/platformOptions +--- source-tree.orig/plugins/org.eclipse.platform.doc.isv/platformOptions 2005-11-08 14:12:44.000000000 +0100 ++++ source-tree/plugins/org.eclipse.platform.doc.isv/platformOptions 2005-11-08 14:40:19.000000000 +0100 +@@ -1,3 +1,4 @@ ++-reflection + -charset "iso-8859-1" + ../org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java + -sourcepath "../org.eclipse.core.runtime.compatibility/src-runtime:../org.eclipse.core.runtime.compatibility/src-model:../org.eclipse.core.commands/src:../org.eclipse.platform/src:../org.eclipse.ant.core/src:../org.eclipse.compare/compare:../org.eclipse.debug.core/core:../org.eclipse.debug.ui/ui:../org.eclipse.help/src:../org.eclipse.help.base/src:../org.eclipse.help.ui/src:../org.eclipse.core.runtime/src:../org.eclipse.core.resources/src:../org.eclipse.pde/src:../org.eclipse.jface/src:../org.eclipse.jface.text/src:../org.eclipse.jface.text/projection:../org.eclipse.text/src:../org.eclipse.text/projection:../org.eclipse.ui/src:../org.eclipse.ui.cheatsheets/src:../org.eclipse.ui.intro/src:../org.eclipse.ui.console/src:../org.eclipse.ui.editors/src:../org.eclipse.ui.forms/src:../org.eclipse.ui.ide/src:../org.eclipse.ui.ide/extensions:../org.eclipse.ui.views/src:../org.eclipse.ui.workbench/Eclipse UI:../org.eclipse.ui.workbench/Eclipse UI Editor Support:../org.eclipse.ui.workbench/Eclipse UI Components:../org.eclipse.ui.workbench.texteditor/src:../org.eclipse.swt/Eclipse SWT/win32/:../org.eclipse.swt/Eclipse SWT/common/:../org.eclipse.swt/Eclipse SWT/common_j2se/:../org.eclipse.swt/Eclipse SWT AWT/win32/:../org.eclipse.swt/Eclipse SWT AWT/common/:../org.eclipse.swt/Eclipse SWT Custom Widgets/common/:../org.eclipse.swt/Eclipse SWT Drag and Drop/win32/:../org.eclipse.swt/Eclipse SWT Drag and Drop/common/:../org.eclipse.swt/Eclipse SWT OLE Win32/win32/:../org.eclipse.swt/Eclipse SWT Printing/win32/:../org.eclipse.swt/Eclipse SWT Printing/common/:../org.eclipse.swt/Eclipse SWT Program/win32/:../org.eclipse.swt/Eclipse SWT Program/common/:../org.eclipse.swt/Eclipse SWT PI/win32/:../org.eclipse.swt/Eclipse SWT PI/common_j2se/:../org.eclipse.swt/Eclipse SWT Accessibility/win32/:../org.eclipse.swt/Eclipse SWT Accessibility/common/:../org.eclipse.swt/Eclipse SWT Browser/win32/:../org.eclipse.swt/Eclipse SWT Browser/common/:../org.eclipse.team.core/src:../org.eclipse.team.ui/src:../org.eclipse.update.configurator/src:../org.eclipse.update.core/src:../org.eclipse.search/search:../org.eclipse.search/new search:../org.eclipse.core.filebuffers/src:../org.eclipse.core.variables/src:../org.eclipse.core.expressions/src:../org.eclipse.ltk.core.refactoring/src:../org.eclipse.ltk.ui.refactoring/src:../org.eclipse.osgi/core/adaptor:../org.eclipse.osgi/eclipseAdaptor/src" --- eclipse-3.4.1.orig/debian/patches/eclipse-swt-x11.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-swt-x11.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-swt-x11.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 + +@DPATCH@ +--- source-tree/build.xml.orig 2005-09-07 07:50:30.365170496 +0000 ++++ source-tree/build.xml 2005-09-07 08:11:48.187911912 +0000 +@@ -50,6 +50,7 @@ + + + ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-ini-more-memory.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-ini-more-memory.dpatch @@ -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 + +@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 --- eclipse-3.4.1.orig/debian/patches/eclipse-javadoc-bootclasspath.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-javadoc-bootclasspath.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh -e +## +## DP: Property bootclasspath is not set, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=115401 + +[ -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 + +@DPATCH@ +diff -r -u source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml +--- source-tree.orig/plugins/org.eclipse.jdt.doc.isv/build.xml 2005-11-08 13:55:10.000000000 +0100 ++++ source-tree/plugins/org.eclipse.jdt.doc.isv/build.xml 2005-11-08 14:01:30.000000000 +0100 +@@ -1,6 +1,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -70,4 +76,4 @@ + + + +- +\ Kein Zeilenumbruch am Dateiende. ++ +diff -r -u source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml source-tree/plugins/org.eclipse.pde.doc.user/build.xml +--- source-tree.orig/plugins/org.eclipse.pde.doc.user/build.xml 2005-11-08 13:55:10.000000000 +0100 ++++ source-tree/plugins/org.eclipse.pde.doc.user/build.xml 2005-11-08 14:02:04.000000000 +0100 +@@ -1,6 +1,13 @@ + + + ++ ++ ++ ++ ++ ++ ++ + + + +@@ -69,4 +76,4 @@ + + + +- +\ Kein Zeilenumbruch am Dateiende. ++ --- eclipse-3.4.1.orig/debian/patches/eclipse-gnuformatterjdt.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-gnuformatterjdt.dpatch @@ -0,0 +1,256 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-gnuformatterjdt.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 + +@DPATCH@ +Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java +=================================================================== +RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v +retrieving revision 1.61 +diff -u -r1.61 DefaultCodeFormatterConstants.java +--- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 1 Apr 2005 10:54:15 -0000 1.61 ++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 18 Apr 2005 18:17:47 -0000 +@@ -3134,6 +3134,16 @@ + return DefaultCodeFormatterOptions.getEclipseDefaultSettings().getMap(); + } + ++ /** ++ * Returns the default GNU formatter settings ++ * ++ * @return the GNU default settings ++ * @since 3.1 ++ */ ++ public static Map getGNUSettings() { ++ return DefaultCodeFormatterOptions.getGNUSettings().getMap(); ++ } ++ + /** + *

Return the force value of the given alignment value. + * The given alignment value should be created using the createAlignmentValue(boolean, int, int) +Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java +=================================================================== +RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java,v +retrieving revision 1.63 +diff -u -r1.63 DefaultCodeFormatterOptions.java +--- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 1 Apr 2005 10:54:15 -0000 1.63 ++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 18 Apr 2005 18:17:48 -0000 +@@ -39,6 +39,12 @@ + return options; + } + ++ public static DefaultCodeFormatterOptions getGNUSettings() { ++ DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions(); ++ options.setGNUDefaultSettings(); ++ return options; ++ } ++ + public static DefaultCodeFormatterOptions getJavaConventionsSettings() { + DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions(); + options.setJavaConventionsSettings(); +@@ -2036,6 +2042,188 @@ + this.tab_size = 4; + } + ++ public void setGNUDefaultSettings() { ++ this.comment_format_header = false; ++ this.comment_format_html = true; ++ this.comment_format_source = true; ++ this.comment_indent_parameter_description = true; ++ this.comment_indent_root_tags = true; ++ this.comment_line_length = 80; ++ this.comment_insert_new_line_for_parameter = true; ++ this.comment_indent_root_tags = true; ++ this.align_type_members_on_columns = false; ++ this.alignment_for_arguments_in_allocation_expression = 18; ++ this.alignment_for_arguments_in_explicit_constructor_call = 18; ++ this.alignment_for_arguments_in_method_invocation = 18; ++ this.alignment_for_arguments_in_qualified_allocation_expression = 18; ++ this.alignment_for_binary_expression = 18; ++ this.alignment_for_compact_if = 16; ++ this.alignment_for_conditional_expression = 82; ++ this.alignment_for_expressions_in_array_initializer = 18; ++ this.alignment_for_multiple_fields = 16; ++ this.alignment_for_parameters_in_constructor_declaration = 18; ++ this.alignment_for_parameters_in_method_declaration = 18; ++ this.alignment_for_selector_in_method_invocation = 0; ++ this.alignment_for_superclass_in_type_declaration = 16; ++ this.alignment_for_superinterfaces_in_type_declaration = 16; ++ this.alignment_for_throws_clause_in_constructor_declaration = 16; ++ this.alignment_for_throws_clause_in_method_declaration = 16; ++ this.blank_lines_after_imports = 1; ++ this.blank_lines_after_package = 1; ++ this.blank_lines_before_field = 1; ++ this.blank_lines_before_first_class_body_declaration = 0; ++ this.blank_lines_before_imports = 1; ++ this.blank_lines_before_member_type = 1; ++ this.blank_lines_before_method = 1; ++ this.blank_lines_before_new_chunk = 1; ++ this.blank_lines_before_package = 2; ++ this.blank_lines_between_type_declarations = 1; ++ this.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE; ++ this.brace_position_for_array_initializer = DefaultCodeFormatterConstants.END_OF_LINE; ++ this.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED; ++ this.brace_position_for_block_in_case = DefaultCodeFormatterConstants.NEXT_LINE; ++ this.brace_position_for_constructor_declaration = DefaultCodeFormatterConstants.NEXT_LINE; ++ this.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE; ++ this.brace_position_for_switch = DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED; ++ this.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE; ++ this.compact_else_if = true; ++ this.continuation_indentation = 2; ++ this.continuation_indentation_for_array_initializer = 2; ++ this.keep_guardian_clause_on_one_line = false; ++ this.indent_body_declarations_compare_to_type_header = true; ++ this.indent_breaks_compare_to_cases = true; ++ this.indent_statements_compare_to_block = true; ++ this.indent_statements_compare_to_body = true; ++ this.indent_switchstatements_compare_to_cases = true; ++ this.indent_switchstatements_compare_to_switch = false; ++ this.insert_new_line_after_opening_brace_in_array_initializer = false; ++ this.insert_new_line_before_catch_in_try_statement = true; ++ this.insert_new_line_before_closing_brace_in_array_initializer = false; ++ this.insert_new_line_before_else_in_if_statement = true; ++ this.insert_new_line_before_finally_in_try_statement = true; ++ this.insert_new_line_before_while_in_do_statement = true; ++ this.insert_new_line_in_empty_anonymous_type_declaration = true; ++ this.insert_new_line_in_empty_block = true; ++ this.insert_new_line_in_empty_method_body = true; ++ this.insert_new_line_in_empty_type_declaration = true; ++ this.insert_space_after_assignment_operator = true; ++ this.insert_space_after_binary_operator = true; ++ this.insert_space_after_closing_brace_in_block = true; ++ this.insert_space_after_closing_paren_in_cast = true; ++ this.insert_space_after_colon_in_assert = true; ++ this.insert_space_after_colon_in_case = true; ++ this.insert_space_after_colon_in_conditional = true; ++ this.insert_space_after_colon_in_labeled_statement = true; ++ this.insert_space_after_comma_in_allocation_expression = true; ++ this.insert_space_after_comma_in_array_initializer = true; ++ this.insert_space_after_comma_in_constructor_declaration_parameters = true; ++ this.insert_space_after_comma_in_constructor_declaration_throws = true; ++ this.insert_space_after_comma_in_explicit_constructor_call_arguments = true; ++ this.insert_space_after_comma_in_for_increments = true; ++ this.insert_space_after_comma_in_for_inits = true; ++ this.insert_space_after_comma_in_method_declaration_parameters = true; ++ this.insert_space_after_comma_in_method_declaration_throws = true; ++ this.insert_space_after_comma_in_method_invocation_arguments = true; ++ this.insert_space_after_comma_in_multiple_field_declarations = true; ++ this.insert_space_after_comma_in_multiple_local_declarations = true; ++ this.insert_space_after_comma_in_superinterfaces = true; ++ this.insert_space_after_opening_brace_in_array_initializer = true; ++ this.insert_space_after_opening_bracket_in_array_allocation_expression = false; ++ this.insert_space_after_opening_bracket_in_array_reference = false; ++ this.insert_space_after_opening_paren_in_cast = false; ++ this.insert_space_after_opening_paren_in_catch = false; ++ this.insert_space_after_opening_paren_in_constructor_declaration = false; ++ this.insert_space_after_opening_paren_in_for = false; ++ this.insert_space_after_opening_paren_in_if = false; ++ this.insert_space_after_opening_paren_in_method_declaration = false; ++ this.insert_space_after_opening_paren_in_method_invocation = false; ++ this.insert_space_after_opening_paren_in_parenthesized_expression = false; ++ this.insert_space_after_opening_paren_in_switch = false; ++ this.insert_space_after_opening_paren_in_synchronized = false; ++ this.insert_space_after_opening_paren_in_while = false; ++ this.insert_space_after_postfix_operator = false; ++ this.insert_space_after_prefix_operator = false; ++ this.insert_space_after_question_in_conditional = true; ++ this.insert_space_after_semicolon_in_for = true; ++ this.insert_space_after_unary_operator = false; ++ this.insert_space_before_assignment_operator = true; ++ this.insert_space_before_binary_operator = true; ++ this.insert_space_before_closing_brace_in_array_initializer = true; ++ this.insert_space_before_closing_bracket_in_array_allocation_expression = false; ++ this.insert_space_before_closing_bracket_in_array_reference = false; ++ this.insert_space_before_closing_paren_in_cast = false; ++ this.insert_space_before_closing_paren_in_catch = false; ++ this.insert_space_before_closing_paren_in_constructor_declaration = false; ++ this.insert_space_before_closing_paren_in_for = false; ++ this.insert_space_before_closing_paren_in_if = false; ++ this.insert_space_before_closing_paren_in_method_declaration = false; ++ this.insert_space_before_closing_paren_in_method_invocation = false; ++ this.insert_space_before_closing_paren_in_parenthesized_expression = false; ++ this.insert_space_before_closing_paren_in_switch = false; ++ this.insert_space_before_closing_paren_in_synchronized = false; ++ this.insert_space_before_closing_paren_in_while = false; ++ this.insert_space_before_colon_in_assert = true; ++ this.insert_space_before_colon_in_case = false; ++ this.insert_space_before_colon_in_conditional = true; ++ this.insert_space_before_colon_in_default = false; ++ this.insert_space_before_colon_in_labeled_statement = false; ++ this.insert_space_before_comma_in_allocation_expression = false; ++ this.insert_space_before_comma_in_array_initializer = false; ++ this.insert_space_before_comma_in_constructor_declaration_parameters = false; ++ this.insert_space_before_comma_in_constructor_declaration_throws = false; ++ this.insert_space_before_comma_in_explicit_constructor_call_arguments = false; ++ this.insert_space_before_comma_in_for_increments = false; ++ this.insert_space_before_comma_in_for_inits = false; ++ this.insert_space_before_comma_in_method_declaration_parameters = false; ++ this.insert_space_before_comma_in_method_declaration_throws = false; ++ this.insert_space_before_comma_in_method_invocation_arguments = false; ++ this.insert_space_before_comma_in_multiple_field_declarations = false; ++ this.insert_space_before_comma_in_multiple_local_declarations = false; ++ this.insert_space_before_comma_in_superinterfaces = false; ++ this.insert_space_before_opening_brace_in_anonymous_type_declaration = true; ++ this.insert_space_before_opening_brace_in_array_initializer = true; ++ this.insert_space_before_opening_brace_in_block = true; ++ this.insert_space_before_opening_brace_in_constructor_declaration = true; ++ this.insert_space_before_opening_brace_in_method_declaration = true; ++ this.insert_space_before_opening_brace_in_switch = true; ++ this.insert_space_before_opening_brace_in_type_declaration = true; ++ this.insert_space_before_opening_bracket_in_array_allocation_expression = false; ++ this.insert_space_before_opening_bracket_in_array_reference = false; ++ this.insert_space_before_opening_bracket_in_array_type_reference = false; ++ this.insert_space_before_opening_paren_in_catch = true; ++ this.insert_space_before_opening_paren_in_constructor_declaration = false; ++ this.insert_space_before_opening_paren_in_for = true; ++ this.insert_space_before_opening_paren_in_if = true; ++ this.insert_space_before_opening_paren_in_method_declaration = false; ++ this.insert_space_before_opening_paren_in_method_invocation = false; ++ this.insert_space_before_opening_paren_in_parenthesized_expression = false; ++ this.insert_space_before_opening_paren_in_switch = true; ++ this.insert_space_before_opening_paren_in_synchronized = true; ++ this.insert_space_before_opening_paren_in_while = true; ++ this.insert_space_before_postfix_operator = false; ++ this.insert_space_before_prefix_operator = false; ++ this.insert_space_before_question_in_conditional = true; ++ this.insert_space_before_semicolon = false; ++ this.insert_space_before_semicolon_in_for = false; ++ this.insert_space_before_unary_operator = false; ++ this.insert_space_between_brackets_in_array_type_reference = false; ++ this.insert_space_between_empty_braces_in_array_initializer = false; ++ this.insert_space_between_empty_brackets_in_array_allocation_expression = false; ++ this.insert_space_between_empty_parens_in_constructor_declaration = false; ++ this.insert_space_between_empty_parens_in_method_declaration = false; ++ this.insert_space_between_empty_parens_in_method_invocation = false; ++ this.keep_else_statement_on_same_line = false; ++ this.keep_empty_array_initializer_on_one_line = true; ++ this.keep_simple_if_on_one_line = false; ++ this.keep_then_statement_on_same_line = false; ++ this.page_width = 80; ++ this.blank_lines_at_beginning_of_method_body = 0; ++ this.number_of_empty_lines_to_preserve = 1; ++ this.put_empty_statement_on_new_line = true; ++ this.tab_char = SPACE; ++ this.tab_size = 2; ++ } ++ + public void setJavaConventionsSettings() { + this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT; + this.alignment_for_arguments_in_enum_constant = Alignment.M_COMPACT_SPLIT; --- eclipse-3.4.1.orig/debian/patches/eclipse-fileinitializer.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-fileinitializer.dpatch @@ -0,0 +1,439 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-fileinitializer.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.core.runtime/plugin.xml.orig 2006-01-11 19:16:49.000000000 +0000 ++++ source-tree/plugins/org.eclipse.core.runtime/plugin.xml 2006-01-11 19:19:20.000000000 +0000 +@@ -6,4 +6,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +--- 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 @@ + */ + public static final String PT_PRODUCT = "products"; //$NON-NLS-1$ + ++ /** ++ * The simple identifier constant (value "initializers") of ++ * the extension point of the Core Runtime plug-in where plug-ins declare ++ * their the existence of initialization code. ++ * ++ * @since 3.2 ++ */ ++ public static final String PT_INITIALIZERS = "initializers"; //$NON-NLS-1$ ++ + /** + * The simple identifier constant (value "initializers") of + * the extension point of the Core Runtime plug-in where plug-ins declare +Index: source-tree/plugins/org.eclipse.core.runtime/schema/initializers.exsd +=================================================================== +RCS file: schema/initializers.exsd +diff -N schema/initializers.exsd +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ source-tree/plugins/org.eclipse.core.runtime/schema/initializers.exsd 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,138 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ Platform runtime supports plug-ins which would like to ++be initialized. That is, plug-ins that needs to be initialized when ++the initialization application is being run should provide an extension ++to this extension-point. ++The initializers are run when the org.eclipse.core.runtime.initializer application ++is being run. The initializers are run in any order. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 3.1 ++ ++ ++ ++ ++ ++ ++ ++ ++ Following is an example of initializer declaration: ++<p> ++<pre> ++ <extension id="myInitializer" point="org.eclipse.core.runtime.initializers"> ++ <initializer> ++ <initialize class="myInitializer.Doit"/> ++ </initializer> ++ </extension> ++</pre> ++</p> ++ ++ ++ ++ ++ ++ ++ ++ ++ The value of the class attribute must represent an ++implementor of ++<samp>org.eclipse.core.runtime.IPlatformRunnable</samp>. ++ ++ ++ ++ ++ ++ ++ ++ ++ [Enter information about supplied implementation of this extension point.] ++ ++ ++ ++ ++ ++ ++ ++ ++ Copyright (c) 2005 IBM Corporation and others.<br> ++All rights reserved. This program and the accompanying materials are made ++available under the terms of the Eclipse Public License v1.0 which ++accompanies ++this distribution, and is available at ++<a ++href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> ++ ++ ++ ++ +Index: source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/FileInitializer.java +=================================================================== +RCS file: src/org/eclipse/core/internal/runtime/FileInitializer.java +diff -N src/org/eclipse/core/internal/runtime/FileInitializer.java +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/FileInitializer.java 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,153 @@ ++package org.eclipse.core.internal.runtime; ++ ++import java.io.BufferedReader; ++import java.io.File; ++import java.io.FileNotFoundException; ++import java.io.FileReader; ++import java.io.IOException; ++import java.net.URL; ++import java.util.ArrayList; ++import java.util.Collections; ++import java.util.Enumeration; ++import java.util.LinkedList; ++ ++import org.eclipse.core.runtime.IPlatformRunnable; ++import org.eclipse.core.runtime.IStatus; ++import org.eclipse.core.runtime.Platform; ++import org.eclipse.core.runtime.Status; ++import org.eclipse.osgi.util.NLS; ++import org.osgi.framework.Bundle; ++ ++/** ++ *

++ * This application extracts files to their "localURL". The file patterns that you ++ * want to extract should be specified in a file with one pattern per line. This ++ * application should be run through the generic initializer mechanism and not ++ * run directly. ++ *

++ * ++ *

++ * To run this application, do something like: ++ *

++ * ++ *

++ * ++ * java -cp startup.jar org.eclipse.core.launcher.Main -application org.eclipse.core.runtime.initializer -fileInitializer <fileWithFilePatternsToExtract> ++ * ++ *

++ * ++ *

++ *

    ++ *
  • ++ * Note: Only the files that are extracted will be printed to the console. If you ++ * want to debug things, use the -consolelog option in ++ * org.eclipse.core.launcher.Main ++ *
    • ++ *
++ *

++ * ++ * @see Initializer ++ * @see Platform#asLocalURL(URL) ++ * @since 3.1 ++ */ ++public class FileInitializer implements IPlatformRunnable { ++ ++ private final String SWT_BUNDLE_NAME = "org.eclipse.swt"; //$NON-NLS-1$ ++ ++ public Object run(Object args) throws Exception { ++ ArrayList fileNamePatterns = getFileNamePatterns((String[]) args); ++ ++ // don't do anything if the arrayList is empty ++ if (fileNamePatterns == null || fileNamePatterns.size() < 1) { ++ return IPlatformRunnable.EXIT_OK; ++ } ++ ++ Bundle[] installedBundles = InternalPlatform.getDefault().getBundleContext().getBundles(); ++ LinkedList extractedFiles = new LinkedList(); ++ ++ for (int i = 0; i < installedBundles.length; i++) { ++ for (int j = 0; j < fileNamePatterns.size(); j++) { ++ ++ Enumeration e = installedBundles[i].findEntries("/", (String) fileNamePatterns.get(j), true); //$NON-NLS-1$ ++ String bundleName = installedBundles[i].getSymbolicName(); ++ ++ while(e != null && e.hasMoreElements()) { ++ URL fileURL = (URL) e.nextElement(); ++ String filePath = fileURL.getPath(); ++ ++ ++ if (bundleName.startsWith(SWT_BUNDLE_NAME)) { ++ // special case for swt ++ if (!bundleName.equals(SWT_BUNDLE_NAME + '.' + Platform.getWS() + '.' + Platform.getOS() + '.' + Platform.getOSArch())) ++ continue; ++ } else { ++ // everything but swt plugins ++ String[] path = filePath.split(File.separator); ++ // check to see if the file is should be extracted to the current os/arch ++ if (path.length == 4 && path[0].equals("os") && !(path[1].equals(Platform.getOS()) && path[2].equals(Platform.getOSArch()))) { //$NON-NLS-1$ ++ continue; ++ } ++ // check to see if the file is should be extracted to the current ws ++ if (path.length == 3 && path[0].equals("ws") && !path[1].equals(Platform.getWS())) { //$NON-NLS-1$ ++ continue; ++ } ++ } ++ ++ // the call to Platform.asLocalURL(URL) does the actual extraction ++ String localURL = Platform.asLocalURL(fileURL).getPath(); ++ ++ // only print the path if it hasn't been printed yet ++ int index = Collections.binarySearch(extractedFiles, localURL); ++ if (index < 0) { ++ extractedFiles.add(-(index + 1), localURL); ++ System.out.println("FileInitializer: " + localURL); //$NON-NLS-1$ ++ } ++ } ++ } // end for ++ } // end for ++ ++ return IPlatformRunnable.EXIT_OK; ++ } ++ ++ private final String ARG_FILE = "-fileInitializer"; //$NON-NLS-1$ ++ ++ private ArrayList getFileNamePatterns(String[] argsArray) { ++ ++ for (int i = 0; i < argsArray.length; i++) { ++ if (argsArray[i].equalsIgnoreCase(ARG_FILE)) { ++ ++ // the "file patterns" file was not specified ++ if (argsArray.length < i + 2) { ++ String msg = NLS.bind(Messages.fileInitializer_missingFileName, this.getClass().getName()); ++ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null); ++ InternalPlatform.getDefault().log(status); ++ return null; ++ } ++ ++ ArrayList fileList = new ArrayList(); ++ try { ++ BufferedReader in = new BufferedReader(new FileReader(argsArray[i + 1])); ++ String line; ++ while ((line = in.readLine()) != null) { ++ fileList.add(line); ++ } ++ in.close(); ++ } catch (FileNotFoundException e) { ++ String msg = NLS.bind(Messages.fileInitializer_fileNotFound, this.getClass().getName(), argsArray[i + 1]); ++ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null); ++ InternalPlatform.getDefault().log(status); ++ return null; ++ } catch (IOException e) { ++ String msg = NLS.bind(Messages.fileInitializer_IOError, this.getClass().getName(), argsArray[i + 1]); ++ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, e); ++ InternalPlatform.getDefault().log(status); ++ return null; ++ } ++ return fileList; ++ } ++ } ++ ++ // ARG_FILE wasn't found ++ return null; ++ } ++} +Index: source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Initializer.java +=================================================================== +RCS file: src/org/eclipse/core/internal/runtime/Initializer.java +diff -N src/org/eclipse/core/internal/runtime/Initializer.java +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Initializer.java 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,49 @@ ++/******************************************************************************* ++* Copyright (c) 2005 Red Hat Incoporated and others. ++* All rights reserved. This program and the accompanying materials ++* are made available under the terms of the Eclipse Public License v1.0 ++* which accompanies this distribution, and is available at ++* http://www.eclipse.org/legal/epl-v10.html ++* ++* Contributors: ++* IBM - Initial implementation ++*******************************************************************************/ ++package org.eclipse.core.internal.runtime; ++ ++import org.eclipse.core.runtime.CoreException; ++import org.eclipse.core.runtime.IConfigurationElement; ++import org.eclipse.core.runtime.IExtension; ++import org.eclipse.core.runtime.IExtensionPoint; ++import org.eclipse.core.runtime.IPlatformRunnable; ++import org.eclipse.core.runtime.IStatus; ++import org.eclipse.core.runtime.Platform; ++import org.eclipse.core.runtime.Status; ++import org.eclipse.osgi.util.NLS; ++ ++public class Initializer implements IPlatformRunnable { ++ ++ public Object run(Object args) throws Exception { ++ IExtensionPoint xpt = Platform.getExtensionRegistry().getExtensionPoint(Platform.PI_RUNTIME, Platform.PT_INITIALIZERS); ++ if (xpt == null) ++ return IPlatformRunnable.EXIT_OK; ++ ++ IExtension[] exts = xpt.getExtensions(); ++ for (int i = 0; i < exts.length; i++) { ++ IConfigurationElement[] configs = exts[i].getConfigurationElements(); ++ IPlatformRunnable initializer = null; ++ if (configs.length != 0) { ++ try { ++ initializer = (IPlatformRunnable) configs[0].createExecutableExtension("initialize"); //$NON-NLS-1$ ++ initializer.run(args); ++ } catch(CoreException e) { ++ String msg = NLS.bind(Messages.initializer_error, exts[i].getExtensionPointUniqueIdentifier()); ++ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, e); ++ InternalPlatform.getDefault().log(status); ++ return null; ++ } ++ } ++ } ++ return IPlatformRunnable.EXIT_OK; ++ } ++ ++} +--- 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; + --- eclipse-3.4.1.orig/debian/patches/eclipse-tomcat55-build.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-tomcat55-build.dpatch @@ -0,0 +1,134 @@ +#! /bin/sh -e +## + +[ -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 + +@DPATCH@ + +--- source-tree/plugins/org.eclipse.tomcat/build.xml.orig 2006-07-05 12:47:26.000000000 -0400 ++++ source-tree/plugins/org.eclipse.tomcat/build.xml 2006-07-05 12:50:49.000000000 -0400 +@@ -144,50 +144,64 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-enableall.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-enableall.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-enableall.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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2006-01-11 20:48:37.000000000 +0000 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2006-01-11 20:50:48.000000000 +0000 +@@ -60,7 +60,7 @@ + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS + +-MOZILLACFLAGS = -O \ ++MOZILLACFLAGS = -O2 \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DXPCOM_GLUE=1 \ +@@ -88,7 +88,7 @@ + MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o + GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o + +-CFLAGS = -O -Wall \ ++CFLAGS = -O2 -Wall \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ +@@ -99,7 +99,7 @@ + LIBS = -shared -fPIC -s + + +-all: make_swt make_atk make_gnome make_glx ++all: make_swt make_atk make_gnome make_glx make_awt make_cairo make_mozilla + + # + # SWT libs --- eclipse-3.4.1.orig/debian/patches/eclipse-icu4j-build-files.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-icu4j-build-files.dpatch @@ -0,0 +1,405 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-icu4j-build-files.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 + +@DPATCH@ +--- source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/build.xml.orig 1969-12-31 19:00:00.000000000 -0500 ++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/build.xml 2006-09-23 19:14:54.000000000 -0400 +@@ -0,0 +1,172 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +--- source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu.base/build.xml.orig 1969-12-31 19:00:00.000000000 -0500 ++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu.base/build.xml 2006-09-23 19:23:47.000000000 -0400 +@@ -0,0 +1,172 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +--- source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/META-INF/MANIFEST.MF.orig 2007-03-11 00:18:12.000000000 -0500 ++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/META-INF/MANIFEST.MF 2006-12-13 17:17:00.000000000 -0500 +@@ -2,17 +2,23 @@ + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName + Bundle-SymbolicName: com.ibm.icu; singleton:=true +-Bundle-Version: 3.4.5 ++Bundle-Version: 3.4.5.20061213 + Bundle-Vendor: %providerName + Bundle-Localization: plugin + Bundle-Copyright: Licensed Materials - Property of IBM + (C) Copyright IBM Corp. 2000, 2006. All Rights Reserved. + IBM is a registered trademark of IBM Corp. +-Export-Package: com.ibm.icu.lang, +- com.ibm.icu.math, +- com.ibm.icu.text, +- com.ibm.icu.util ++Export-Package: com.ibm.icu.lang;version="3.4.5", ++ com.ibm.icu.math;version="3.4.5", ++ com.ibm.icu.text;version="3.4.5", ++ com.ibm.icu.util;version="3.4.5", ++ com.ibm.icu.impl;x-internal:=true, ++ com.ibm.icu.impl.data;x-internal:=true, ++ com.ibm.icu.impl.data.icudt34b;x-internal:=true, ++ com.ibm.icu.impl.data.icudt34b.coll;x-internal:=true, ++ com.ibm.icu.impl.data.icudt34b.rbnf;x-internal:=true, ++ com.ibm.icu.impl.data.icudt34b.translit;x-internal:=true + Eclipse-LazyStart: true + Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 +- ++Bundle-ClassPath: icu-data.jar,. --- eclipse-3.4.1.orig/debian/patches/eclipse-updatehomedir.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-updatehomedir.dpatch @@ -0,0 +1,249 @@ +#! /bin/sh -e +## +## DP: Install location should automatically be added to homedir if +## DP: ECLIPSE_HOME is not +## DP: writable(https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630) + +[ -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 + +@DPATCH@ +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 2006-10-22 20:11:31.000000000 +0200 +@@ -35,6 +35,7 @@ + import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.MultiStatus; ++import org.eclipse.core.runtime.Platform; + import org.eclipse.osgi.util.NLS; + import org.eclipse.update.configuration.IActivity; + import org.eclipse.update.configuration.IConfiguredSite; +@@ -803,7 +804,9 @@ + } + } else { + File container = getSiteContaining(file); +- if (container != null) { ++ // allow the install location to pass even though it looks like this ++ // site is contained in another site ++ if (container != null && !siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) { + verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null); + return verifyStatus; + } +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 2006-10-22 20:11:31.000000000 +0200 +@@ -76,6 +76,13 @@ + public IQueryUpdateSiteAdapter getQuerySearchSite() { + return null; + } ++ ++ /* (non-Javadoc) ++ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature() ++ */ ++ public IFeature getFeature() { ++ return null; ++ } + } + + public void addVersionedIdentifier(VersionedIdentifier vid) { +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 2006-10-22 20:11:31.000000000 +0200 +@@ -133,6 +133,14 @@ + public IQueryUpdateSiteAdapter getQuerySearchSite() { + return null; + } ++ ++ /* (non-Javadoc) ++ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature() ++ */ ++ public IFeature getFeature() { ++ return null; ++ } ++ + } + + public SiteSearchCategory() { +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 2006-10-22 20:11:31.000000000 +0200 +@@ -285,6 +285,10 @@ + monitor.worked(1); + monitor.done(); + } ++ ++ public IFeature getFeature() { ++ return candidate; ++ } + } + + private ArrayList candidates; +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 2006-10-22 20:11:31.000000000 +0200 +@@ -7,6 +7,7 @@ + * + * Contributors: + * IBM Corporation - initial API and implementation ++ * Red Hat Incorporated - getFeature() API addition + *******************************************************************************/ + package org.eclipse.update.search; + +@@ -50,4 +51,12 @@ + * @param monitor a progress monitor to report search progress within the provided site + */ + public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor); ++ ++/** ++ * Returns IFeature associated with the IUpdateSearchQuery ++ * ++ * @return the IFeature that is associated with the IUpdateSearchQuery ++ * @since 3.2 ++ */ ++ public IFeature getFeature(); + } +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java +--- source-tree.orig/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 2006-10-22 19:59:44.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 2006-10-22 20:11:31.000000000 +0200 +@@ -282,6 +282,10 @@ + // currently, the next conditional is only executed (qsite!=null) when + // running an update search. + if (qsite != null && searchFeatureProvidedSites) { ++ // do not update features that are installed in read-only locations ++ IFeature feature = query.getFeature(); ++ if (feature != null && !feature.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK()) ++ continue; + // check for mapping + IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite); + // when there is no mapped site the feature is not updatable +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java +--- source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 2006-10-22 19:58:27.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 2006-10-22 20:11:30.000000000 +0200 +@@ -153,7 +153,7 @@ + addPage(licensePage); + optionalFeaturesPage = new OptionalFeaturesPage(config); + addPage(optionalFeaturesPage); +- targetPage = new TargetPage(config); ++ targetPage = new TargetPage(config, isUpdate); + addPage(targetPage); + } + +diff -r -N -u source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java +--- source-tree.orig/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2006-10-22 19:58:27.000000000 +0200 ++++ source-tree/plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2006-10-22 20:11:31.000000000 +0200 +@@ -18,6 +18,9 @@ + import java.util.HashSet; + import java.util.Iterator; + ++import org.eclipse.core.runtime.CoreException; ++import org.eclipse.core.runtime.IStatus; ++import org.eclipse.core.runtime.Platform; + import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.jface.dialogs.IDialogSettings; + import org.eclipse.jface.resource.ImageDescriptor; +@@ -92,6 +95,7 @@ + private Label installLocation; + private Button changeLocation; + static HashSet added; ++ private boolean isUpdate; // whether the wizard is updating a feature or installing a new one + + class JobsContentProvider + extends DefaultContentProvider +@@ -236,13 +240,14 @@ + /** + * Constructor for ReviewPage2 + */ +- public TargetPage(IInstallConfiguration config) { ++ public TargetPage(IInstallConfiguration config, boolean isUpdate) { + super("Target"); //$NON-NLS-1$ + setTitle(UpdateUIMessages.InstallWizard_TargetPage_title); + setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc); + this.config = config; + UpdateUI.getDefault().getLabelProvider().connect(this); + configListener = new ConfigListener(); ++ this.isUpdate = isUpdate; + } + + public void setJobs(IInstallFeatureOperation[] jobs) { +@@ -273,7 +278,7 @@ + label.setLayoutData(gd); + + installLocation = new Label(client, SWT.NULL); +- installLocation.setText("foo"); //$NON-NLS-1$ ++ installLocation.setText(""); //$NON-NLS-1$ + gd = new GridData(GridData.FILL_HORIZONTAL); + installLocation.setLayoutData(gd); + +@@ -656,12 +661,45 @@ + continue; + } + +- jobs[i].setTargetSite(getFirstTargetSite(jobs[i])); ++ IConfiguredSite csite = getFirstTargetSite(jobs[i]); ++ if (csite == null && Platform.getInstallLocation().isReadOnly() && isUpdate == false) { ++ // there are no updateable sites, the installation location is read-only and we are installing a new feature ++ // make an update site in the user's home direcotry ++ File site = new File(System.getProperty("user.home") + File.separator + ".eclipse" + File.separator + //$NON-NLS-1$ //$NON-NLS-2$ ++ Platform.getProduct().getId() + File.separator + "updates"); //$NON-NLS-1$ ++ ++ try { ++ csite = config.createConfiguredSite(site); ++ config.addConfiguredSite(csite); ++ IStatus status = csite.verifyUpdatableStatus(); ++ if (!status.isOK()) ++ throw new CoreException(status); ++ ++ } catch (CoreException e) { ++ // there was a problem, the user must choose an installation site ++ csite = null; ++ // no need to check if the directory exists because File.delete() returns false if it's not there ++ deleteDir(site); ++ } ++ } + ++ jobs[i].setTargetSite(csite); + } + + } +- ++ ++ private boolean deleteDir(File dir) { ++ if (dir.isDirectory()) { ++ String[] files = dir.list(); ++ for (int i=0; i < files.length; i++) { ++ if (!deleteDir(new File(dir, files[i]))) { ++ return false; ++ } ++ } ++ } ++ return dir.delete(); ++ } ++ + private IConfiguredSite getMostReceantlyUsedSite() { + IDialogSettings master = UpdateUI.getDefault().getDialogSettings(); + IDialogSettings section = master.getSection(TargetSiteDialog.MOST_RECEANTLY_USED_SITE_URL); +@@ -696,7 +734,7 @@ + IConfiguredSite[] sites = config.getConfiguredSites(); + for (int i = 0; i < sites.length; i++) { + IConfiguredSite csite = sites[i]; +- if (getSiteVisibility(csite, job)) ++ if (getSiteVisibility(csite, job) && csite.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK()) + return csite; + } + return null; --- eclipse-3.4.1.orig/debian/patches/eclipse-java-home.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-java-home.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh -e +## +## DP: Set JAVA_HOME in all places + +[ -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 + +@DPATCH@ +--- source-tree/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile~ 2006-01-18 22:12:26.000000000 +0100 ++++ source-tree/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile 2006-02-19 04:59:55.766546664 +0100 +@@ -17,7 +17,7 @@ + OS_TYPE = linux + + #Set this to be the location of your JRE +-JAVA_HOME = ~/vm/sun142 ++JAVA_HOME ?= /usr/lib/jvm/java-6-openjdk + + JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} + COMMON_INCLUDE = -I include +--- source-tree/features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-02-29 22:15:56.000000000 +0100 ++++ source-tree/features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-02-29 22:16:10.000000000 +0100 +@@ -36,7 +36,7 @@ + defaultOSArch="" + defaultWS="gtk" + defaultJava=DEFAULT_JAVA_JNI +-javaHome="" ++javaHome="/usr/lib/jvm/java-6-openjdk" + makefile="" + if [ "$OS" = "" ]; then + OS=`uname -s` --- eclipse-3.4.1.orig/debian/patches/eclipse-libswt-xulrunner.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-libswt-xulrunner.dpatch @@ -0,0 +1,464 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-libswt-mozilla.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 + +@DPATCH@ +diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2006-08-05 18:30:50.000000000 +0000 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-08-05 18:33:39.000000000 +0000 +@@ -49,6 +49,9 @@ + else + MODEL=`uname -m` + fi ++ if [ ${MODEL} = 'unknown' ]; then ++ MODEL=`uname -m` ++ fi + fi + case $MODEL in + "x86_64") +@@ -92,9 +95,9 @@ + fi + + if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- GECKO_LIBS=`pkg-config --libs mozilla-xpcom` ++ if [ x`pkg-config --exists xulrunner-xpcom && echo YES` = "xYES" ]; then ++ GECKO_INCLUDES=`pkg-config --cflags xulrunner-xpcom` ++ GECKO_LIBS=`pkg-config --libs xulrunner-xpcom` + export GECKO_INCLUDES + export GECKO_LIBS + MAKE_MOZILLA=make_mozilla +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2006-10-09 18:57:26.776969250 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2006-10-09 18:57:38.953730250 +0200 +@@ -199,7 +199,7 @@ + # + # Mozilla lib + # +-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB) ++make_mozilla:$(MOZILLA_LIB) + + $(MOZILLA_LIB): $(MOZILLA_OBJECTS) + $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} +@@ -217,22 +217,22 @@ + $(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp + + $(PROFILE14_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE17_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE18_OBJECTS): xpcom_profile.cpp +- $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp ++ $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp + + $(PROFILE14_LIB): $(PROFILE14_OBJECTS) +- $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ++ $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS} + + $(PROFILE17_LIB): $(PROFILE17_OBJECTS) +- $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ++ $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS} + + $(PROFILE18_LIB): $(PROFILE18_OBJECTS) +- $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ++ $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS} + + # + # GLX lib +@@ -261,4 +261,4 @@ + # Clean + # + clean: +- rm -f *.o *.so ++ rm -f *.o *.so +\ No newline at end of file +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java.orig 2006-09-21 16:57:23.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2006-10-09 18:39:38.154184500 +0200 +@@ -89,6 +89,7 @@ + public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3; + public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012; + public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$ ++ public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$ + + public static final native void memmove(nsID dest, int /*long*/ src, int nbytes); + public static final native void memmove(int /*long*/ dest, nsID src, int nbytes); +@@ -103,9 +104,8 @@ + public static final native void memmove(byte[] dest, char[] src, int nbytes); + public static final native int NS_GetComponentManager(int /*long*/[] result); + public static final native int NS_GetServiceManager(int /*long*/[] result); +-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider); ++public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount); + public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result); +-public static final native int NS_TermEmbedding(); + public static final native int strlen_PRUnichar(int /*long*/ s); + public static final native int /*long*/ nsEmbedCString_new(); + public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length); +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig 2006-10-09 18:15:24.031307500 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2006-10-09 18:39:38.154184500 +0200 +@@ -85,14 +85,16 @@ + } + #endif + +-#ifndef NO_NS_1InitEmbedding +-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding) +- (JNIEnv *env, jclass that, jint arg0, jint arg1) ++#ifndef NO_NS_1InitXPCOM3 ++JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3) ++ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) + { + jint rc = 0; +- XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC); +- rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1); +- XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC); ++ XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC); ++ rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1, ++ (nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3, ++ (PRUint32) arg4); ++ XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC); + return rc; + } + #endif +@@ -113,18 +115,6 @@ + } + #endif + +-#ifndef NO_NS_1TermEmbedding +-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding) +- (JNIEnv *env, jclass that) +-{ +- jint rc = 0; +- XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC); +- rc = (jint)NS_TermEmbedding(); +- XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC); +- return rc; +-} +-#endif +- + #ifndef NO_PR_1Free + JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free) + (JNIEnv *env, jclass that, jint arg0) +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp.orig 2006-09-21 16:57:23.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp 2006-10-09 18:39:38.150184250 +0200 +@@ -31,15 +31,14 @@ + + #ifdef NATIVE_STATS + +-int XPCOM_nativeFunctionCount = 132; +-int XPCOM_nativeFunctionCallCount[132]; ++int XPCOM_nativeFunctionCount = 131; ++int XPCOM_nativeFunctionCallCount[131]; + char * XPCOM_nativeFunctionNames[] = { + "Call", + "NS_1GetComponentManager", + "NS_1GetServiceManager", +- "NS_1InitEmbedding", ++ "NS_1InitXPCOM3_FUNC", + "NS_1NewLocalFile", +- "NS_1TermEmbedding", + "PR_1Free", + "PR_1Malloc", + "VtblCall__II", +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h.orig 2006-09-21 16:57:32.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h 2006-10-09 18:39:38.150184250 +0200 +@@ -32,7 +32,7 @@ + #define NDEBUG + + #include "nsCOMPtr.h" +-#include "nsProfileDirServiceProvider.h" ++#include "profdirserviceprovider/nsProfileDirServiceProvider.h" + #include "xpcom_stats.h" + + #endif /* INC_xpcom_profile_H */ +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h.orig 2006-09-21 16:57:20.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h 2006-10-09 18:39:38.150184250 +0200 +@@ -32,7 +32,6 @@ + #define NDEBUG + + #include "nsXPCOM.h" +-#include "nsEmbedAPI.h" + #include "nsEmbedString.h" + #include "nsIInputStream.h" + #include "nsISupportsUtils.h" +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h.orig 2006-09-21 16:57:34.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h 2006-10-09 18:39:38.154184500 +0200 +@@ -41,9 +41,8 @@ + Call_FUNC, + NS_1GetComponentManager_FUNC, + NS_1GetServiceManager_FUNC, +- NS_1InitEmbedding_FUNC, ++ NS_1InitXPCOM3_FUNC, + NS_1NewLocalFile_FUNC, +- NS_1TermEmbedding_FUNC, + PR_1Free_FUNC, + PR_1Malloc_FUNC, + VtblCall__II_FUNC, +--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java.orig 2006-09-21 16:57:19.000000000 +0200 ++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2006-10-09 18:39:38.154184500 +0200 +@@ -10,15 +10,75 @@ + *******************************************************************************/ + package org.eclipse.swt.browser; + +-import java.io.*; +-import java.util.*; +-import org.eclipse.swt.*; +-import org.eclipse.swt.widgets.*; +-import org.eclipse.swt.graphics.*; +-import org.eclipse.swt.internal.*; +-import org.eclipse.swt.internal.gtk.*; +-import org.eclipse.swt.internal.mozilla.*; +-import org.eclipse.swt.layout.*; ++import java.io.File; ++import java.io.UnsupportedEncodingException; ++import java.util.Locale; ++import java.util.StringTokenizer; ++ ++import org.eclipse.swt.SWT; ++import org.eclipse.swt.SWTError; ++import org.eclipse.swt.SWTException; ++import org.eclipse.swt.graphics.Point; ++import org.eclipse.swt.graphics.Rectangle; ++import org.eclipse.swt.internal.Callback; ++import org.eclipse.swt.internal.Converter; ++import org.eclipse.swt.internal.Library; ++import org.eclipse.swt.internal.gtk.GdkEvent; ++import org.eclipse.swt.internal.gtk.LONG; ++import org.eclipse.swt.internal.gtk.OS; ++import org.eclipse.swt.internal.mozilla.XPCOM; ++import org.eclipse.swt.internal.mozilla.XPCOMObject; ++import org.eclipse.swt.internal.mozilla.nsEmbedString; ++import org.eclipse.swt.internal.mozilla.nsIAppShell; ++import org.eclipse.swt.internal.mozilla.nsIBaseWindow; ++import org.eclipse.swt.internal.mozilla.nsICategoryManager; ++import org.eclipse.swt.internal.mozilla.nsIComponentManager; ++import org.eclipse.swt.internal.mozilla.nsIComponentRegistrar; ++import org.eclipse.swt.internal.mozilla.nsIContextMenuListener; ++import org.eclipse.swt.internal.mozilla.nsICookie; ++import org.eclipse.swt.internal.mozilla.nsICookieManager; ++import org.eclipse.swt.internal.mozilla.nsID; ++import org.eclipse.swt.internal.mozilla.nsIDOMEvent; ++import org.eclipse.swt.internal.mozilla.nsIDOMMouseEvent; ++import org.eclipse.swt.internal.mozilla.nsIDOMWindow; ++import org.eclipse.swt.internal.mozilla.nsIDirectoryService; ++import org.eclipse.swt.internal.mozilla.nsIDocShell; ++import org.eclipse.swt.internal.mozilla.nsIEmbeddingSiteWindow; ++import org.eclipse.swt.internal.mozilla.nsIFile; ++import org.eclipse.swt.internal.mozilla.nsIIOService; ++import org.eclipse.swt.internal.mozilla.nsIInterfaceRequestor; ++import org.eclipse.swt.internal.mozilla.nsILocalFile; ++import org.eclipse.swt.internal.mozilla.nsIPrefBranch; ++import org.eclipse.swt.internal.mozilla.nsIPrefLocalizedString; ++import org.eclipse.swt.internal.mozilla.nsIPrefService; ++import org.eclipse.swt.internal.mozilla.nsIProperties; ++import org.eclipse.swt.internal.mozilla.nsIRequest; ++import org.eclipse.swt.internal.mozilla.nsIServiceManager; ++import org.eclipse.swt.internal.mozilla.nsISimpleEnumerator; ++import org.eclipse.swt.internal.mozilla.nsISupports; ++import org.eclipse.swt.internal.mozilla.nsISupportsWeakReference; ++import org.eclipse.swt.internal.mozilla.nsITooltipListener; ++import org.eclipse.swt.internal.mozilla.nsIURI; ++import org.eclipse.swt.internal.mozilla.nsIURIContentListener; ++import org.eclipse.swt.internal.mozilla.nsIWeakReference; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowser; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserChrome; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserChromeFocus; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserFocus; ++import org.eclipse.swt.internal.mozilla.nsIWebBrowserStream; ++import org.eclipse.swt.internal.mozilla.nsIWebNavigation; ++import org.eclipse.swt.internal.mozilla.nsIWebProgress; ++import org.eclipse.swt.internal.mozilla.nsIWebProgressListener; ++import org.eclipse.swt.internal.mozilla.nsIWindowWatcher; ++import org.eclipse.swt.layout.FillLayout; ++import org.eclipse.swt.widgets.Composite; ++import org.eclipse.swt.widgets.Display; ++import org.eclipse.swt.widgets.Event; ++import org.eclipse.swt.widgets.Label; ++import org.eclipse.swt.widgets.Listener; ++import org.eclipse.swt.widgets.Menu; ++import org.eclipse.swt.widgets.Shell; ++import org.eclipse.swt.widgets.Widget; + + /** + * Instances of this class implement the browser user interface +@@ -175,40 +235,43 @@ + * - mozilla17profile/mozilla17profile-gcc should succeed for mozilla 1.7.x and firefox + * - mozilla18profile/mozilla18profile-gcc should succeed for mozilla 1.8.x (seamonkey) + */ +- try { +- Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e1) { +- try { +- Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e2) { +- try { +- Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e3) { +- try { +- Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e4) { +- try { +- Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e5) { +- try { +- Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$ +- usingProfile = true; +- } catch (UnsatisfiedLinkError e6) { +- /* +- * fail silently, the Browser will still work without profile support +- * but will abort any attempts to navigate to HTTPS pages +- */ +- } +- } +- } +- } +- } +- } ++// Library.loadLibrary("swt-mozilla17-profile"); ++ // We build the profile stuff without the need for a separate DSO ++ usingProfile = true; ++// try { ++// Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e1) { ++// try { ++// Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e2) { ++// try { ++// Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e3) { ++// try { ++// Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e4) { ++// try { ++// Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e5) { ++// try { ++// Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$ ++// usingProfile = true; ++// } catch (UnsatisfiedLinkError e6) { ++// /* ++// * fail silently, the Browser will still work without profile support ++// * but will abort any attempts to navigate to HTTPS pages ++// */ ++// } ++// } ++// } ++// } ++// } ++// } + + int /*long*/[] retVal = new int /*long*/[1]; + nsEmbedString pathString = new nsEmbedString(mozillaPath); +@@ -218,11 +281,11 @@ + if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER); + + nsILocalFile localFile = new nsILocalFile(retVal[0]); +- rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0); ++ rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0); + localFile.Release(); + if (rc != XPCOM.NS_OK) { + dispose(); +- SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + rc = XPCOM.NS_GetComponentManager(result); +@@ -283,7 +346,7 @@ + rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result); + if (rc != XPCOM.NS_OK) error(rc); + if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); +- properties.Release(); ++ // properties.Release() is now after the Set below + + nsIFile profileDir = new nsIFile(result[0]); + result[0] = 0; +@@ -305,24 +368,15 @@ + pathString.dispose(); // + + profileDir = new nsIFile(result[0]); +- result[0] = 0; +- +- rc = XPCOM_PROFILE.NS_NewProfileDirServiceProvider(true, result); ++ ++ // Set the profile dir property so that it's initialized for ++ // things like password manager and https ++ buffer = Converter.wcsToMbcs(null, XPCOM.NS_APP_USER_PROFILE_50_DIR, true); ++ rc = properties.Set(buffer, profileDir.getAddress()); + if (rc != XPCOM.NS_OK) error(rc); +- if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); +- +- final int /*long*/ dirServiceProvider = result[0]; ++ properties.Release(); ++ + result[0] = 0; +- rc = XPCOM_PROFILE.ProfileDirServiceProvider_Register(dirServiceProvider); +- if (rc != XPCOM.NS_OK) error(rc); +- rc = XPCOM_PROFILE.ProfileDirServiceProvider_SetProfileDir(dirServiceProvider, profileDir.getAddress()); +- if (rc != XPCOM.NS_OK) error(rc); +- +- getDisplay().addListener(SWT.Dispose, new Listener() { +- public void handleEvent(Event e) { +- XPCOM_PROFILE.ProfileDirServiceProvider_Shutdown(dirServiceProvider); +- } +- }); + } + + /* +@@ -1354,27 +1408,6 @@ + tip = null; + + BrowserCount--; +- /* +- * This code is intentionally commented. It is not possible to reinitialize +- * Mozilla once it has been terminated. NS_InitEmbedding always fails after +- * NS_TermEmbedding has been called. The workaround is to call NS_InitEmbedding +- * once and never call NS_TermEmbedding. +- */ +-// if (BrowserCount == 0) { +-// if (AppShell != null) { +-// // Shutdown the appshell service. +-// rc = AppShell.Spindown(); +-// if (rc != XPCOM.NS_OK) error(rc); +-// AppShell.Release(); +-// AppShell = null; +-// } +-// WindowCreator.Release(); +-// WindowCreator = null; +-// PromptService.Release(); +-// PromptService = null; +-// XPCOM.NS_TermEmbedding(); +-// mozilla = false; +-// } + } + + void Activate() { --- eclipse-3.4.1.orig/debian/patches/eclipse-efj.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-efj.dpatch @@ -0,0 +1,552 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-efj.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 + +@DPATCH@ +Index: source-tree/plugins/org.eclipse.jdt.core/plugin.xml +=================================================================== +RCS file: /home/eclipse/org.eclipse.jdt.core/plugin.xml,v +retrieving revision 1.76 +diff -u -r1.76 plugin.xml +--- source-tree/plugins/org.eclipse.jdt.core/plugin.xml 4 Jan 2005 10:43:40 -0000 1.76 ++++ source-tree/plugins/org.eclipse.jdt.core/plugin.xml 25 Jan 2005 05:04:57 -0000 +@@ -209,4 +209,15 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + +Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java +=================================================================== +RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java,v +retrieving revision 1.8 +diff -u -r1.8 CodeFormatter.java +--- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java 7 Jun 2004 15:46:28 -0000 1.8 ++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java 25 Jan 2005 05:04:58 -0000 +@@ -62,7 +62,7 @@ + * level of zero or below has no effect. + * @param lineSeparator the line separator to use in formatted source, + * if set to null, then the platform default one will be used. +- * @return the text edit ++ * @return the text edit or null if the given string cannot be formatted. + * @throws IllegalArgumentException if offset is lower than 0, length is lower than 0 or + * length is greater than source length. + */ +Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java +=================================================================== +RCS file: formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java +diff -N formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,427 @@ ++/******************************************************************************* ++ * Copyright (c) 2004 Ben Konrath ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Eclipse Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/epl-v10.html ++ * ++ * Contributors: ++ * Ben Konrath - initial implementation ++ *******************************************************************************/ ++ ++package org.eclipse.jdt.core.formatter; ++ ++import java.io.BufferedReader; ++import java.io.BufferedWriter; ++import java.io.File; ++import java.io.FileInputStream; ++import java.io.FileReader; ++import java.io.FileWriter; ++import java.io.IOException; ++import java.io.Writer; ++import java.text.MessageFormat; ++import java.util.ArrayList; ++import java.util.HashMap; ++import java.util.Map; ++import java.util.MissingResourceException; ++import java.util.ResourceBundle; ++ ++import javax.xml.parsers.ParserConfigurationException; ++import javax.xml.parsers.SAXParser; ++import javax.xml.parsers.SAXParserFactory; ++ ++import org.eclipse.core.runtime.IPlatformRunnable; ++import org.eclipse.core.runtime.Platform; ++import org.eclipse.jdt.core.ToolFactory; ++import org.eclipse.jdt.internal.core.util.Util; ++import org.eclipse.jface.text.BadLocationException; ++import org.eclipse.jface.text.Document; ++import org.eclipse.jface.text.IDocument; ++import org.eclipse.text.edits.TextEdit; ++import org.xml.sax.Attributes; ++import org.xml.sax.InputSource; ++import org.xml.sax.SAXException; ++import org.xml.sax.helpers.DefaultHandler; ++ ++/** ++ * Class that handles the org.eclipse.jdt.core.JavaCodeFormatter the ++ * application. The map file reading code is based on code in ProfileStore.java ++ * (org.eclipse.jdf.ui). ++ * ++ * There are a couple improvments that could be made: ++ * 1. Add an import clean up option (requires stuff from org.eclipse.jdt.ui). ++ * 2. Make a list of all the files first and then format. You could then ++ * remove duplicate files. ++ * ++ * @author Ben Konrath ++ */ ++public class CodeFormatterApplication implements IPlatformRunnable { ++ ++ /** ++ * A SAX event handler to parse the config xml. ++ */ ++ private final static class ConfigHandler extends DefaultHandler { ++ ++ /** ++ * Identifiers for the XML file. ++ */ ++ private final String XML_NODE_ROOT = "profiles"; //$NON-NLS-1$ ++ ++ private final String XML_NODE_PROFILE = "profile"; //$NON-NLS-1$ ++ ++ private final String XML_NODE_SETTING = "setting"; //$NON-NLS-1$ ++ ++ private final String XML_ATTRIBUTE_VERSION = "version"; //$NON-NLS-1$ ++ ++ private final String XML_ATTRIBUTE_ID = "id"; //$NON-NLS-1$ ++ ++ private final String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$ ++ ++ private final String XML_ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$ ++ ++ private int fVersion; ++ ++ private String fName; ++ ++ private Map fSettings; ++ ++ public void startElement(String uri, String localName, String qName, ++ Attributes attributes) throws SAXException { ++ ++ if (qName.equals(XML_NODE_SETTING)) { ++ ++ final String key = attributes.getValue(XML_ATTRIBUTE_ID); ++ final String value = attributes.getValue(XML_ATTRIBUTE_VALUE); ++ fSettings.put(key, value); ++ ++ } else if (qName.equals(XML_NODE_PROFILE)) { ++ ++ fName = attributes.getValue(XML_ATTRIBUTE_NAME); ++ fSettings = new HashMap(200); ++ ++ } else if (qName.equals(XML_NODE_ROOT)) { ++ ++ try { ++ fVersion = Integer.parseInt(attributes ++ .getValue(XML_ATTRIBUTE_VERSION)); ++ } catch (NumberFormatException ex) { ++ throw new SAXException(ex); ++ } ++ ++ } ++ } ++ ++ public Map getSettings() { ++ return fSettings; ++ } ++ ++ public int getVersion() { ++ return fVersion; ++ } ++ ++ public String getName() { ++ return fName; ++ } ++ ++ } ++ ++ /** ++ * Deals with the messages in the properties file (cut n' pasted from a ++ * generated class). ++ */ ++ private final static class FormatterAppMessages { ++ private static final String BUNDLE_NAME = "org.eclipse.jdt.core.formatter.FormatterAppMessages";//$NON-NLS-1$ ++ ++ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle ++ .getBundle(BUNDLE_NAME); ++ ++ public static String getString(String key) { ++ try { ++ return RESOURCE_BUNDLE.getString(key); ++ } catch (MissingResourceException e) { ++ return '!' + key + '!'; ++ } ++ } ++ ++ public static String getFormattedString(String key, String arg) { ++ return getFormattedString(key, new String[] { arg }); ++ } ++ ++ public static String getFormattedString(String key, String[] args) { ++ return MessageFormat.format(getString(key), args); ++ } ++ } ++ ++ /* ++ * FIXME This value should come from ProfileVersioner.CURRENT_VERSION, however ++ * this class cannot be included here because it is internal to ++ * org.eclipse.jdt.ui and becuase this plugin (org.eclipse.jdt.core) does ++ * not require org.eclipse.jdt.ui (nor should it). Refactoring this to make ++ * it an external class of org.eclipse.jdt.core would solve these problems. ++ */ ++ int CURRENT_VERSION = 6; ++ ++ /** ++ * Read the xml config file and return a Map representing the options that ++ * are in the specified config file. ++ */ ++ public Map readConfig(String filename) { ++ ++ try { ++ final FileInputStream reader = new FileInputStream(new File( ++ filename)); ++ final ConfigHandler handler = new ConfigHandler(); ++ ++ try { ++ InputSource inputSource = new InputSource(reader); ++ final SAXParserFactory factory = SAXParserFactory.newInstance(); ++ final SAXParser parser = factory.newSAXParser(); ++ parser.parse(inputSource, handler); ++ if (handler.getVersion() != CURRENT_VERSION) ++ return null; ++ configName = handler.getName(); ++ return handler.getSettings(); ++ ++ } finally { ++ try { reader.close(); } catch (IOException e) { /* ignore */ } ++ } ++ ++ } catch (IOException e) { ++ Util.log(e, FormatterAppMessages ++ .getString("ConfigFile.reading.error")); //$NON-NLS-1$ ++ } catch (SAXException e) { ++ Util.log(e, FormatterAppMessages ++ .getString("ConfigFile.reading.error")); //$NON-NLS-1$ ++ } catch (ParserConfigurationException e) { ++ Util.log(e, FormatterAppMessages ++ .getString("ConfigFile.reading.error")); //$NON-NLS-1$ ++ } ++ return null; ++ } ++ ++ /** ++ * Runs the Java code formatter application ++ */ ++ public Object run(Object args) throws Exception { ++ ++ ArrayList fileList = processCommandLine((String[]) args); ++ ++ // nothing to do ++ if (fileList == null || fileList.isEmpty()) ++ return EXIT_OK; ++ ++ if (!quiet) { ++ if (configName != null) ++ System.out.println(FormatterAppMessages.getFormattedString("CommandLine.config.file", configName)); //$NON-NLS-1$ ++ System.out.println(FormatterAppMessages.getString("CommandLine.start")); //$NON-NLS-1$ ++ } ++ ++ // format the list of files and/or directories ++ while (!fileList.isEmpty()) { ++ File file = (File) fileList.remove(0); ++ ++ if (file.isDirectory()) ++ formatDirTree(file); ++ else ++ formatFile(file); ++ } ++ ++ if (!quiet) { ++ System.out.println(FormatterAppMessages.getString("CommandLine.done")); //$NON-NLS-1$ ++ } ++ ++ return EXIT_OK; ++ } ++ ++ private void displayHelp(String message) { ++ System.err.println(message); ++ System.out.println(""); //$NON-NLS-1$ ++ displayHelp(); ++ } ++ ++ private String configName; ++ ++ /* ++ * The output will look like this: ++ * ++ * "Usage: eclipse -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] ++ * Java source files and/or directories to format. ++ * Only files ending with .java will be formatted in the given directory. ++ * OPTIONS: ++ * -config Use the formatting style from the specified config file. ++ * This file must be an xml file that has been exported by Eclipse 3.0. ++ * -help Display this message. ++ * -quiet Only print error messages. ++ * -verbose Be verbose about the formatting job. ++ */ ++ private void displayHelp() { ++ String binaryName = Platform.getOS().equals(Platform.OS_WIN32) ? "eclipse.exe" : "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$ ++ ++ // this is UG-LY. is there a way to make this look nicer? ++ System.out.println(FormatterAppMessages.getFormattedString("CommandLine.usage", //$NON-NLS-1$ ++ binaryName + " -application org.eclipse.jdt.core.JavaCodeFormatter")); //$NON-NLS-1$ ++ System.out.println(""); //$NON-NLS-1$ ++ ++ System.out.println(" " + FormatterAppMessages.getString("CommandLine.files") //$NON-NLS-1$ //$NON-NLS-2$ ++ + "\t" + FormatterAppMessages.getString("CommandLine.files.msg1")); //$NON-NLS-1$ //$NON-NLS-2$ ++ System.out.println("\t\t" //$NON-NLS-1$ ++ + FormatterAppMessages.getFormattedString("CommandLine.files.msg2", ".java")); //$NON-NLS-1$ //$NON-NLS-2$ ++ ++ System.out.println(FormatterAppMessages.getString("CommandLine.options")); //$NON-NLS-1$ ++ System.out.println(" " + FormatterAppMessages.getFormattedString("CommandLine.config", ARG_CONFIG) //$NON-NLS-1$ //$NON-NLS-2$ ++ + "\t" + FormatterAppMessages.getString("CommandLine.config.msg1")); //$NON-NLS-1$ //$NON-NLS-2$ ++ System.out.println("\t\t\t" + FormatterAppMessages.getString("CommandLine.config.msg2")); //$NON-NLS-1$ //$NON-NLS-2$ ++ System.out.println(" " + ARG_HELP + "\t\t" + FormatterAppMessages.getString("CommandLine.help")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ System.out.println(" " + ARG_QUIET + "\t\t" + FormatterAppMessages.getString("CommandLine.quiet")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ System.out.println(" " + ARG_VERBOSE +"\t\t" + FormatterAppMessages.getString("CommandLine.verbose")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ } ++ ++ private final String ARG_HELP = "-help"; //$NON-NLS-1$ ++ private final String ARG_CONFIG = "-config"; //$NON-NLS-1$ ++ private final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$ ++ private final String ARG_QUIET = "-quiet"; //$NON-NLS-1$ ++ private boolean verbose = false; ++ private boolean quiet = false; ++ ++ private ArrayList processCommandLine(String[] argsArray) { ++ ++ ArrayList args = new ArrayList(); ++ for (int i = 0; i < argsArray.length; i++) { ++ args.add(argsArray[i]); ++ } ++ ++ // look for flag-like args ++ if (args.remove(ARG_HELP)) { ++ displayHelp(); ++ return null; ++ } ++ if (args.remove(ARG_VERBOSE)) ++ verbose = true; ++ if (args.remove(ARG_QUIET)) ++ quiet = true; ++ ++ if (quiet && verbose) { ++ displayHelp(FormatterAppMessages.getFormattedString ++ ("CommandLineError.quiet.verbose", new String[] {ARG_QUIET, ARG_VERBOSE})); //$NON-NLS-1$ ++ return null; ++ } ++ args.remove("-pdelaunch"); //$NON-NLS-1$ ++ ++ // look for flag/param args ++ int index = args.indexOf(ARG_CONFIG); ++ if (index >= 0) { ++ args.remove(index); ++ String configFile = (String) args.remove(index); ++ options = readConfig(configFile); ++ if (options == null) { ++ displayHelp(FormatterAppMessages ++ .getFormattedString("CommandLineError.config", configFile)); //$NON-NLS-1$ ++ return null; ++ } ++ } ++ ++ // only the files and directories should remain ++ ArrayList fileList = new ArrayList(); ++ while (!args.isEmpty()) { ++ String fileName = (String) args.remove(0); ++ File file = new File(fileName); ++ if (file.exists()) { ++ fileList.add(file); ++ } else { ++ displayHelp(FormatterAppMessages ++ .getFormattedString("CommandLineError.file", fileName)); //$NON-NLS-1$ ++ return null; ++ } ++ } ++ ++ if (fileList.isEmpty()) ++ displayHelp(FormatterAppMessages.getString("CommandLineError.file.dir")); //$NON-NLS-1$ ++ ++ return fileList; ++ } ++ ++ /** ++ * Recursively format the Java source code that is contained in the ++ * directory rooted at dir. ++ */ ++ private void formatDirTree(File dir) { ++ ++ File[] files = dir.listFiles(); ++ if (files == null) ++ return; ++ ++ for (int i = 0; i < files.length; i++) { ++ File file = files[i]; ++ if (file.isDirectory()) { ++ formatDirTree(file); ++ } else if (file.getPath().endsWith(".java")) { //$NON-NLS-1$ ++ formatFile(file); ++ } ++ } ++ } ++ ++ // internal representation of configuration options in the xml file ++ private Map options = null; ++ ++ /** ++ * Format the given Java source file. ++ */ ++ private void formatFile(File file) { ++ ++ IDocument doc = new Document(); ++ try { ++ // read the file ++ final BufferedReader in = new BufferedReader(new FileReader(file)); ++ if (verbose) { ++ System.out.println(FormatterAppMessages.getFormattedString ++ ("CommandLine.formatting", file.getName())); //$NON-NLS-1$ ++ } ++ String line; ++ String contents = ""; //$NON-NLS-1$ ++ try { ++ while ((line = in.readLine()) != null) ++ contents = contents ++ + System.getProperty("line.separator") + line; //$NON-NLS-1$ ++ } finally { ++ try { in.close(); } catch (IOException e) { /* ignore */ } ++ } ++ ++ // format the file (the meat and potatoes) ++ doc.set(contents); ++ TextEdit edit = ToolFactory.createCodeFormatter(options).format( ++ CodeFormatter.K_COMPILATION_UNIT, doc.get(), 0, ++ doc.getLength(), 0, null); ++ if (edit != null) { ++ edit.apply(doc); ++ } else { ++ System.err.println ++ (FormatterAppMessages.getFormattedString("Edit.problem", file.getName())); //$NON-NLS-1$ ++ return; ++ } ++ ++ // write the file ++ final Writer out = new BufferedWriter(new FileWriter(file, false)); ++ try { ++ out.write(doc.get()); ++ out.flush(); ++ } finally { ++ try { out.close(); } catch (IOException e) { /* ignore */ } ++ } ++ ++ } catch (IOException e) { ++ String errorMessage = FormatterAppMessages.getString("Exception.io") + " " //$NON-NLS-1$ //$NON-NLS-2$ ++ + e.getLocalizedMessage(); ++ Util.log(e, errorMessage); ++ System.err.println(errorMessage); ++ System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$ ++ ++ } catch (BadLocationException e) { ++ String errorMessage = FormatterAppMessages.getString("Exception.bad.location") + " " //$NON-NLS-1$ //$NON-NLS-2$ ++ + e.getLocalizedMessage(); ++ Util.log(e, errorMessage); ++ System.err.println(errorMessage); ++ System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$ ++ } ++ } ++ ++} +Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties +=================================================================== +RCS file: formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties +diff -N formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,47 @@ ++/******************************************************************************* ++ * Copyright (c) 2004 Ben Konrath ++ * All rights reserved. This program and the accompanying materials ++ * are made available under the terms of the Eclipse Public License v1.0 ++ * which accompanies this distribution, and is available at ++ * http://www.eclipse.org/legal/epl-v10.html ++ * ++ * Contributors: ++ * Ben Konrath - initial implementation ++ *******************************************************************************/ ++ ++CommandLine.start=Starting format job ... ++CommandLine.done=Done. ++CommandLine.config.file=Configuration Name: {0} ++CommandLine.formatting=Formatting: {0} ++ ++CommandLine.usage=Usage: {0} [ OPTIONS ] ++ ++CommandLine.files= ++CommandLine.files.msg1=Java source files and/or directories to format. ++CommandLine.files.msg2=Only files ending with {0} will be formatted in the given directory. ++ ++CommandLine.options=OPTIONS: ++CommandLine.config={0} ++CommandLine.config.msg1=Use the formatting style from the specified config file. ++CommandLine.config.msg2=This file must be an xml file that has been exported by Eclipse 3.0. ++CommandLine.help=Display this message. ++CommandLine.quiet=Only print error messages. ++CommandLine.verbose=Be verbose about the formatting job. ++ ++ ++CommandLineError.file={0} does not exsit. Please specify only valid Java Source files. ++CommandLineError.config=There was problem reading the config file, {0}. ++CommandLineError.file.dir=You must specify at least one file or dirctory to format. ++CommandLineError.quiet.verbose=You cannot use the options {0} and {1} together. ++ ++ ++Exception.io=Caught IOExecption: ++Exception.bad.location=Caught BadLocationException: ++Exception.skip=Skipping File. ++ ++ ++ConfigFile.reading.error=Error Reading config file. ++ ++ ++Edit.problem=The Eclipse formatter had a problem {0}, Skipping. ++ +Content-Type: text/plain + --- eclipse-3.4.1.orig/debian/patches/eclipse-jsch-build-files.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-jsch-build-files.dpatch @@ -0,0 +1,167 @@ +#! /bin/sh -e +## +## DP: Debian specific patch, converted from eclipse-jsch-build-files.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 + +@DPATCH@ +diff -ruN source-tree/baseLocation/plugins/jsch-0.1.28.orig/build.xml source-tree/baseLocation/plugins/jsch-0.1.28/build.xml +--- source-tree/baseLocation/plugins/jsch-0.1.28.orig/build.xml 2003-05-20 08:48:05.000000000 +0200 ++++ source-tree/baseLocation/plugins/jsch-0.1.28/build.xml 2006-10-17 23:43:49.000000000 +0200 +@@ -13,6 +13,7 @@ + + + ++ + + + +@@ -42,7 +43,10 @@ + + + +- ++ ++ ++ ++ + + + ++ ++ ++ ++About ++ ++ ++

About This Content

++ ++

May 11, 2006

++

License

++ ++

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise ++indicated below, the Content is provided to you under the terms and conditions of the ++Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available ++at http://www.eclipse.org/legal/epl-v10.html. ++For purposes of the EPL, "Program" will mean the Content.

++ ++

If you did not receive this Content directly from the Eclipse Foundation, the Content is ++being redistributed by another party ("Redistributor") and different terms and conditions may ++apply to your use of any object code in the Content. Check the Redistributor's license that was ++provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise ++indicated below, the terms and conditions of the EPL still apply to any source code in the Content ++and such source code may be obtained at http://www.eclipse.org.

++ ++

Third Party Content

++ ++

The Content includes items that have been sourced from third parties as set out below. If you ++did not receive this Content directly from the Eclipse Foundation, the following is provided ++for informational purposes only, and you should look to the Redistributor’s license for ++terms and conditions of use.

++ ++

JSch 0.1.28

++ ++

The plug-in is based on software developed by Atsuhiko Yamanaka, JCraft, Inc., and others and ++made available at http://www.jcraft.com/. ++ ++

The Content shall be defined as the "JSch".

++ ++

Use of JSch is governed by the terms and conditions of the following license:

++ ++
Copyright (c) 2002,2006 ymnk, JCraft,Inc. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++
++ 1. Redistributions of source code must retain the above copyright notice,
++ this list of conditions and the following disclaimer.
++
++ 2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in
++ the documentation and/or other materials provided with the distribution.
++
++ 3. The names of the authors may not be used to endorse or promote products
++ derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
++INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
++INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++
++ ++

NOTE: Although the SSH2 protocol depends on cryptographic algorithms, JSch relies on a Java™ Cryptography Extension (JCE) ++to provide this functionality and does not in itself contain any cryptographic code.

++ ++Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. ++ ++ ++ ++ +diff -ruN source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/META-INF/eclipse.inf source-tree/baseLocation/plugins/jsch-0.1.28/resources/META-INF/eclipse.inf +--- source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/META-INF/eclipse.inf 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/baseLocation/plugins/jsch-0.1.28/resources/META-INF/eclipse.inf 2006-06-29 19:42:00.000000000 +0200 +@@ -0,0 +1,2 @@ ++#Thu Jun 29 19:42:18 EDT 2006 ++pack200.conditioned=true +diff -ruN source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/META-INF/MANIFEST.MF source-tree/baseLocation/plugins/jsch-0.1.28/resources/META-INF/MANIFEST.MF +--- source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/META-INF/MANIFEST.MF 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/baseLocation/plugins/jsch-0.1.28/resources/META-INF/MANIFEST.MF 2006-05-10 15:13:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++Manifest-Version: 1.0 ++Bundle-ManifestVersion: 2 ++Bundle-Version: 0.1.28 ++Export-Package: com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, ++ com.jcraft.jsch.jcraft;x-internal:=true ++Created-By: 1.4.0 (Sun Microsystems Inc.) ++Bundle-SymbolicName: com.jcraft.jsch ++Bundle-Name: %bundleName ++Bundle-Localization: plugin ++Bundle-Vendor: %venderName ++Bundle-ClassPath: . ++Bundle-RequiredExecutionEnvironment: J2SE-1.4 ++ +diff -ruN source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/plugin.properties source-tree/baseLocation/plugins/jsch-0.1.28/resources/plugin.properties +--- source-tree/baseLocation/plugins/jsch-0.1.28.orig/resources/plugin.properties 1970-01-01 01:00:00.000000000 +0100 ++++ source-tree/baseLocation/plugins/jsch-0.1.28/resources/plugin.properties 2006-05-02 09:10:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++############################################################################### ++# Copyright (c) 2006 IBM Corporation and others. ++# All rights reserved. This program and the accompanying materials ++# are made available under the terms of the Eclipse Public License v1.0 ++# which accompanies this distribution, and is available at ++# http://www.eclipse.org/legal/epl-v10.html ++# ++# Contributors: ++# Atsuhiko Yamanaka, JCraft,Inc. - initial API and implementation. ++# IBM Corporation - implementation ++############################################################################### ++venderName=JCraft, Inc. ++bundleName=JSch --- eclipse-3.4.1.orig/debian/patches/eclipse-swttools.dpatch +++ eclipse-3.4.1/debian/patches/eclipse-swttools.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh -e +## +## DP: Patch build scripts to build the swttools before the +## DP: build.cfiles target get executed. + +[ -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 + +@DPATCH@ +diff -r -u source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml +--- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2005-11-18 15:13:43.000000000 +0100 ++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2005-11-18 15:18:05.000000000 +0100 +@@ -21,7 +21,6 @@ + + + +- + + + +@@ -190,8 +189,11 @@ + + + ++ ++ ++ + +- ++ + + + +@@ -286,6 +288,8 @@ + + + ++ ++ + + + + +--- 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 @@ + + + +- + + + +@@ -271,7 +270,10 @@ + + + +- ++ ++ ++ ++ + + + +@@ -392,6 +394,8 @@ + + + ++ ++ + + + --- eclipse-3.4.1.orig/debian/linda/eclipse-platform +++ eclipse-3.4.1/debian/linda/eclipse-platform @@ -0,0 +1,5 @@ +Tag: image-in-usr-lib +Data: .*.(png|gif|jpg) + +Tag: usr-lib-in-arch-all +Data: .*.jsp --- eclipse-3.4.1.orig/debian/linda/eclipse-jdt +++ eclipse-3.4.1/debian/linda/eclipse-jdt @@ -0,0 +1,2 @@ +Tag: image-in-usr-lib +Data: .*.(gif|jpg|png) --- eclipse-3.4.1.orig/debian/linda/eclipse +++ eclipse-3.4.1/debian/linda/eclipse @@ -0,0 +1,2 @@ +Tag: image-in-usr-lib +Data: .*.(png|gif|jpg) --- eclipse-3.4.1.orig/debian/linda/eclipse-pde +++ eclipse-3.4.1/debian/linda/eclipse-pde @@ -0,0 +1,2 @@ +Tag: image-in-usr-lib +Data: .*.jpg --- eclipse-3.4.1.orig/debian/linda/eclipse-source +++ eclipse-3.4.1/debian/linda/eclipse-source @@ -0,0 +1,2 @@ +Tag: image-in-usr-lib +Data: .*.(png|jpg) --- eclipse-3.4.1.orig/debian/linda/eclipse-rcp +++ eclipse-3.4.1/debian/linda/eclipse-rcp @@ -0,0 +1,2 @@ +Tag: image-in-usr-lib +Data: .*.(png|gif|jpg) --- eclipse-3.4.1.orig/debian/extra/filenamepatterns.txt +++ eclipse-3.4.1/debian/extra/filenamepatterns.txt @@ -0,0 +1 @@ +*.so --- eclipse-3.4.1.orig/debian/extra/links.txt +++ eclipse-3.4.1/debian/extra/links.txt @@ -0,0 +1,21 @@ +/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 --- eclipse-3.4.1.orig/debian/extra/lib.link +++ eclipse-3.4.1/debian/extra/lib.link @@ -0,0 +1 @@ +path=/usr/lib/ --- eclipse-3.4.1.orig/debian/extra/efj.sh +++ eclipse-3.4.1/debian/extra/efj.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +# Having any sort of classpath causes massive breakage, with Kaffe at least. +unset CLASSPATH; export CLASSPATH + +# Allow the user to specify their own Java home, we check for it later. +#unset JAVA_HOME; export JAVA_HOME + +CMDLINEARGS="" +VMARGS="" +INSTALL="/usr/lib/eclipse" +STARTUP="/usr/lib/eclipse/startup.jar" + +if [ -x /usr/bin/zenity ]; then + DIALOG=/usr/bin/zenity +elif [ -x /usr/bin/kdialog ]; then + DIALOG=/usr/bin/kdialog +elif [ -x /usr/bin/xdialog ]; then + DIALOG=/usr/bin/xdialog +else + DIALOG=echo +fi + +# Make sure this directory exists. +if [ ! -d ~/.eclipse ]; then + mkdir ~/.eclipse > /dev/null 2>&1 + if [ $? -ne 0 ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="Could not create settings directory at ~/.eclipse." + fi +fi + +# Just in case Eclipse tries to put something in the home directory. +cd ~ + +# Load default settings from the user's configuration file. +if [ -f ~/.eclipse/eclipserc ]; then + . ~/.eclipse/eclipserc +fi + +# Process the command line options. These override the eclipserc file, so we do +# them after parsing that file. +while [ "$1" ]; do + if [ "$1" = "-h" -o "$1" = "--help" ]; then + echo "Eclipse Starter Script" + echo "Usage:" + echo "eclipse [options [value]]" + echo "See eclipse(1) for more information." + echo "" + echo "Also see ~/.eclipse/eclipserc, which provides some default values" + exit 0 + elif [ "$1" = "-vm" ]; then + shift + unset JAVA_HOME + JAVACMD="$1" + shift + elif [ "$1" = "-install" ]; then + shift + INSTALL="$1" + shift + elif [ "$1" = "-startup" ]; then + shift + STARTUP="$1" + shift + elif [ "$1" = "-vmargs" ]; then + shift + while [ "$1" ]; do + VMARGS="${VMARGS} $1" + shift + done + else + CMDLINEARGS="${CMDLINEARGS} $1" + shift + fi +done + +# If the user has specified a custom JAVA, we check it for validity. +# JAVA defines the virtual machine that Eclipse will use to launch itself. +if [ -n "${JAVA_HOME}" ]; then + echo "using specified vm: ${JAVA_HOME}" + if [ ! -x "${JAVA_HOME}/bin/java" ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="The custom VM you have chosen is not a valid executable." + exit 1 + fi +fi + +# If the user has not set JAVA_HOME, cycle through our list of compatible VM's +# and pick the first one that exists. +if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then + echo "searching for compatible vm..." + javahomelist=`cat /etc/eclipse/java_home | grep -v '^#' | grep -v '^$' | while read line ; do echo -n $line ; echo -n ":" ; done` + OFS="$IFS" + IFS=":" + for JAVA_HOME in $javahomelist ; do + echo -n " testing ${JAVA_HOME}..." + if [ -x "${JAVA_HOME}/bin/java" ]; then + export JAVA_HOME + echo "found" + break + else + echo "not found" + fi + done + IFS="$OFS" +fi + +# If we don't have a JAVA_HOME yet, we're doomed. +if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="A suitable Java Virtual Machine for running the Eclipse Platform could not be located." + exit 1 +fi + +# Set JAVACMD from JAVA_HOME +if [ -n "${JAVA_HOME}" -a -z "${JAVACMD}" ]; then + JAVACMD="$JAVA_HOME/bin/java" +fi + +case $CLASSPATH in + */usr/lib/eclipse/startup.jar*) ;; + *) CLASSPATH=$CLASSPATH:/usr/lib/eclipse/startup.jar +esac + +export CLASSPATH + +# Do the actual launch of the Eclipse Code Formatter with the selected VM. +exec $JAVA_HOME/bin/java \ + org.eclipse.core.launcher.Main \ + -application org.eclipse.jdt.core.JavaCodeFormatter \ + ${1+"$@"} \ + -vmargs -Djava.library.path=/usr/lib/jni \ + -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.2/classmap.db \ + -Dgnu.gcj.runtime.VMClassLoader.library_control=never \ + -Dosgi.locking=none ${VMARGS} --- eclipse-3.4.1.orig/debian/extra/arch-files.txt +++ eclipse-3.4.1/debian/extra/arch-files.txt @@ -0,0 +1,4 @@ +eclipse +plugins/org.eclipse.core.resources.linux_* +plugins/org.eclipse.update.core.linux_* +plugins/org.eclipse.swt* --- eclipse-3.4.1.orig/debian/extra/package-links.txt +++ eclipse-3.4.1/debian/extra/package-links.txt @@ -0,0 +1,21 @@ +/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 --- eclipse-3.4.1.orig/debian/extra/eclipse.sh +++ eclipse-3.4.1/debian/extra/eclipse.sh @@ -0,0 +1,178 @@ +#!/bin/bash + +# Having any sort of classpath causes massive breakage, with Kaffe at least. +unset CLASSPATH; export CLASSPATH + +# Allow the user to specify their own Java home, we check for it later. +#unset JAVA_HOME; export JAVA_HOME + +CMDLINEARGS="" +VMARGS="" +INSTALL="/usr/lib/eclipse" +STARTUP="" + +if [ -x /usr/bin/zenity ]; then + DIALOG=/usr/bin/zenity + DIALOGW="$DIALOG --warning" +elif [ -x /usr/bin/kdialog ]; then + DIALOG=/usr/bin/kdialog + DIALOGW="$DIALOG --warningyesno" +elif [ -x /usr/bin/xdialog ]; then + DIALOG=/usr/bin/xdialog + DIALOGW="$DIALOG --warning" +else + DIALOG=echo + DIALOGW="$DIALOG" +fi + + +# Make sure this directory exists. +if [ ! -d ~/.eclipse ]; then + mkdir ~/.eclipse > /dev/null 2>&1 + if [ $? -ne 0 ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="Could not create settings directory at ~/.eclipse." + fi +fi + +# Just in case Eclipse tries to put something in the home directory. +cd ~ + +# Load default settings from the user's configuration file. +if [ -f ~/.eclipse/eclipserc ]; then + . ~/.eclipse/eclipserc +fi + +# Process the command line options. These override the eclipserc file, so we do +# them after parsing that file. +while [ "$1" ]; do + if [ "$1" = "-h" -o "$1" = "--help" ]; then + echo "Eclipse Starter Script" + echo "Usage:" + echo "eclipse [options [value]]" + echo "See eclipse(1) for more information." + echo "" + echo "Also see ~/.eclipse/eclipserc, which provides some default values" + exit 0 + elif [ "$1" = "-vm" ]; then + shift + unset JAVA_HOME + JAVACMD="$1" + shift + elif [ "$1" = "-install" ]; then + shift + INSTALL="$1" + shift + elif [ "$1" = "-startup" ]; then + shift + STARTUP="-startup $1" + shift + elif [ "$1" = "-vmargs" ]; then + shift + while [ "$1" ]; do + VMARGS="${VMARGS} $1" + shift + done + else + CMDLINEARGS="${CMDLINEARGS} $1" + shift + fi +done + +# If the user has specified a custom JAVA, we check it for validity. +# JAVA defines the virtual machine that Eclipse will use to launch itself. +if [ -n "${JAVA_HOME}" ]; then + echo "using specified vm: ${JAVA_HOME}" + if [ ! -x "${JAVA_HOME}/bin/java" ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="The custom VM you have chosen is not a valid executable." + exit 1 + fi +fi + +# If the user has not set JAVA_HOME, cycle through our list of compatible VM's +# and pick the first one that exists. +if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then + echo "searching for compatible vm..." + javahomelist=`cat /etc/eclipse/java_home | grep -v '^#' | grep -v '^$' | while read line ; do echo -n $line ; echo -n ":" ; done` + OFS="$IFS" + IFS=":" + for JAVA_HOME in $javahomelist ; do + echo -n " testing ${JAVA_HOME}..." + if [ -x "${JAVA_HOME}/bin/java" ]; then + export JAVA_HOME + echo "found" + break + else + echo "not found" + fi + done + IFS="$OFS" +fi + +# If we don't have a JAVA_HOME yet, we're doomed. +if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then + $DIALOG \ + --error \ + --title="Could not launch Eclipse Platform" \ + --text="A suitable Java Virtual Machine for running the Eclipse Platform could not be located." + exit 1 +fi + +# Set JAVACMD from JAVA_HOME +if [ -n "${JAVA_HOME}" -a -z "${JAVACMD}" ]; then + JAVACMD="$JAVA_HOME/bin/java" +fi + +# Set path for the Mozilla SWT binding +MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME%*/} +if false && [ -n "$MOZILLA_FIVE_HOME" -a -e $MOZILLA_FIVE_HOME/libgtkembedmoz.so ]; then + : +elif [ -e @MOZILLA_FIVE_HOME_DEFAULT@/libgtkembedmoz.so ]; then + export MOZILLA_FIVE_HOME=@MOZILLA_FIVE_HOME_DEFAULT@ +elif [ -e /usr/lib/firefox/libgtkembedmoz.so ]; then + export MOZILLA_FIVE_HOME=/usr/lib/firefox +elif [ -e /usr/lib/xulrunner/libgtkembedmoz.so ]; then + export MOZILLA_FIVE_HOME=/usr/lib/xulrunner +elif [ -e /usr/lib/mozilla-firefox/libgtkembedmoz.so ]; then + export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox +elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then + export MOZILLA_FIVE_HOME=/usr/lib/mozilla +else + $DIALOGW \ + --title="Integrated browser support not working" \ + --text="This Eclipse build doesn't have support for the integrated browser." + [ $? -eq 0 ] || exit 1 +fi + +EXT=/usr/local/lib/eclipse/.eclipseextension +if [ ! -f $EXT ]; then + if ! touch $EXT 2>/dev/null; then + cat <<-EOF + Could not create $EXT. Please run as root: + touch $EXT + chmod 2775 $EXT + chown root:staff $EXT + EOF + fi + chmod 2775 $EXT 2> /dev/null || true + chown root:staff $EXT 2> /dev/null || true +fi + +# libraries from the mozilla choosen take precedence +LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + +# Do the actual launch of Eclipse with the selected VM. +exec /usr/lib/eclipse/eclipse \ + -vm "${JAVACMD}" \ + -install "${INSTALL}" \ + "${STARTUP}" \ + ${CMDLINEARGS} \ + -vmargs -Djava.library.path=/usr/lib/jni \ + -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.2/classmap.db \ + -Dgnu.gcj.runtime.VMClassLoader.library_control=never \ + -Dosgi.locking=none ${VMARGS} --- eclipse-3.4.1.orig/debian/extra/eclipse32.xpm +++ eclipse-3.4.1/debian/extra/eclipse32.xpm @@ -0,0 +1,207 @@ +/* XPM */ +static char *eclipse32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 169 2", +" c #00004D", +". c #000053", +"X c #03035B", +"o c #08075B", +"O c #0A0A56", +"+ c #0C0C5B", +"@ c #100E5A", +"# c #14155E", +"$ c #0B0C62", +"% c #111166", +"& c #141468", +"* c #171962", +"= c #191665", +"- c #18156A", +"; c #1B1B65", +": c #1A1A6C", +"> c #1E1E70", +", c #1E206B", +"< c #201F71", +"1 c #21226C", +"2 c #242374", +"3 c #282777", +"4 c #282779", +"5 c #2C2B7B", +"6 c #312E7F", +"7 c #33337E", +"8 c #343281", +"9 c #383684", +"0 c #3B3985", +"q c #3E3B88", +"w c #413E8B", +"e c #483F8A", +"r c #44428D", +"t c #48448F", +"y c #4B4B8D", +"u c #494590", +"i c #4C4A93", +"p c #50478F", +"a c #514C95", +"s c #514E98", +"d c #535194", +"f c #555199", +"g c #585696", +"h c #59569E", +"j c #5C599C", +"k c #5E59A0", +"l c #605E9D", +"z c #685C9F", +"x c #615CA2", +"c c #64629F", +"v c #6561A3", +"b c #6763A8", +"n c #6965A3", +"m c #6A65AA", +"M c #6C69A6", +"N c #6D68AC", +"B c #706CAC", +"V c #736EB1", +"C c #7471AC", +"Z c #7875AF", +"A c #7671B3", +"S c #7974B4", +"D c #7D76B8", +"F c #7D79B2", +"G c #7F79B8", +"H c #718ABD", +"J c #758EC0", +"K c #7690C1", +"L c #7A93C4", +"P c #7E97C8", +"I c #8676B3", +"U c #817CB6", +"Y c #827BBA", +"T c #8877B6", +"R c #897CBA", +"E c #927CB8", +"W c #8480B9", +"Q c #8A85BD", +"! c #AC88BB", +"~ c #B687BA", +"^ c #B488BA", +"/ c #BA88BA", +"( c #8B86C1", +") c #8E89C3", +"_ c #839BCC", +"` c #9084C2", +"' c #918CC3", +"] c #9985C2", +"[ c #9692C4", +"{ c #9792C8", +"} c #9995C6", +"| c #9A95C8", +" . c #9E99CB", +".. c #87A0D0", +"X. c #8BA3D3", +"o. c #A68BC4", +"O. c #AC8EC7", +"+. c #A790CA", +"@. c #A19DCC", +"#. c #B592C5", +"$. c #B293CA", +"%. c #BD92C4", +"&. c #BE97CB", +"*. c #BC9BD1", +"=. c #A5A1CD", +"-. c #AAA6D1", +";. c #AEAAD3", +":. c #B0ACD4", +">. c #B9AAD6", +",. c #B4B1D7", +"<. c #B5B2D8", +"1. c #B9B6D9", +"2. c #BCB9DB", +"3. c #C18BBC", +"4. c #D092BF", +"5. c #C694C6", +"6. c #C596C9", +"7. c #CE96C7", +"8. c #CF9ACB", +"9. c #C09DD1", +"0. c #D59EC6", +"q. c #D89CCB", +"w. c #C4A9D7", +"e. c #C9A1D4", +"r. c #C3B7DB", +"t. c #C1BDDE", +"y. c #DAA4CC", +"u. c #D7A4D5", +"i. c #D0A8D5", +"p. c #D5A9DC", +"a. c #DFA1D0", +"s. c #DFABD3", +"d. c #DBAADC", +"f. c #DCBCE2", +"g. c #E2A9D5", +"h. c #E7A8D8", +"j. c #EAADDD", +"k. c #E2B2D5", +"l. c #E5B5D8", +"z. c #E6B9DA", +"x. c #EDB6DF", +"c. c #E1AEE1", +"v. c #E5B1E2", +"b. c #ECB2E2", +"n. c #EEBFE1", +"m. c #F1B4E3", +"M. c #F3BBE6", +"N. c #C5C2E0", +"B. c #C8C5E1", +"V. c #CBC8E3", +"C. c #D3C6E3", +"Z. c #D1CEE6", +"A. c #DFC9E7", +"S. c #D5D1E8", +"D. c #D9D4EA", +"F. c #EBC2E4", +"G. c #E1DEEE", +"H. c #ECD5ED", +"J. c #EEDFF1", +"K. c #F3C6EA", +"L. c #F0C9E6", +"P. c #F7CCEC", +"I. c #F5D3ED", +"U. c #F7D9EF", +"Y. c #F0DEF1", +"T. c #F8DBF0", +"R. c #F1E4F3", +"E. c gray100", +"W. c None", +/* pixels */ +"W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.W.W.0.y.d.e.*.+.` Y Y Y R T U W W.W.W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.y.l.F.f.>.| ) Y G S S V B N m B B S W.W.W.W.W.W.W.", +"W.W.W.W.W.W.k.L.H.C.<.-. .) D D D V V N b x x h c M W.W.W.W.W.W.", +"W.W.W.W.W.z.U.J.S.B.1.;.@.' S S V N N b x x k f d d j W.W.W.W.W.", +"W.W.W.W.l.T.R.G.D.V.2.;.@.' A V V N b b x h h s i u y d W.W.W.W.", +"W.W.W.s.P.J.G.G.D.V.2.;. .) V V m b x x k f s i t r q q d W.W.W.", +"W.W.0.x.Y.S.Z.D.Z.N.1.-.} Q N N b b k h f s i u w q 8 8 0 d W.W.", +"W.W.k.P.F.t.N.B.t.2.:.@.[ Y N b x k k f s i u r q 9 8 8 4 0 W.W.", +"W.4.x.K.r.<.1.1.<.;.=.| Q S m x k h f s i r q q 9 8 5 4 2 4 w W.", +"W.0.M.f.=.-.-.-.=. .} Q S N x k j f s i u q q 9 8 5 4 2 > ; 7 W.", +"W.q.m.w.| | | | } ' R S N b j k f s u t q q 9 8 5 4 2 > : & 2 W.", +"W.h.m.X.X.X.X.X.X......._ _ _ _ _ P P L L L K K J J H H H H H W.", +"W.j.b.` Y D V V B m b x j h f a u t w q 9 7 5 4 2 > - & % $ $ W.", +"W.b.m.Y S V V N m b x x h f s i t w q 8 8 5 4 2 > - & % $ o X W.", +"W.m.m.X.X.X.X..........._ _ _ _ P P P L L J L J K J H H H H H W.", +"W.v.b.Y V N m b x j h f s u r w 0 9 8 5 3 2 > - & $ $ $ X . X W.", +"W.g.m.] N N b x k h f i u u q 9 8 8 4 4 2 > : & % $ X X . . + W.", +"W.q.m.X.X.X.X...X......._ _ _ _ P P P L L L J J J J J H H H H W.", +"W.7.b.9.x k k h f s u r w 0 9 8 4 4 < > - & $ $ X X . . . ; W.", +"W.3.g.c.Y k h s i u r q 9 8 6 4 4 < > - & $ $ X X . X . . O , W.", +"W.W.8.v.$.k s i u r q 0 8 6 4 4 < > - & % $ X X . . . * W.W.", +"W.W.5.u.d.I i u r q 0 8 6 4 4 < > - % $ $ X X . . . O ; W.W.", +"W.W.W.5.d.9.x r q 9 8 6 5 2 < : - % $ $ X X X . . . ; W.W.W.", +"W.W.W.W.5.d.O.a 9 8 6 4 2 < > & % $ $ X X . . . # W.W.W.W.", +"W.W.W.W.W.6.u.o.a 5 4 2 < : - & $ $ X X . . * W.W.W.W.W.", +"W.W.W.W.W.W.5.e.$.z 3 1 : - % $ $ X X . . . O * W.W.W.W.W.W.", +"W.W.W.W.W.W.W.^ &.9.E p - = $ $ X X . . . + # , W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.W.W.! #.$.E x e < $ X = 1 ; ; 1 W.W.W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.", +"W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.W." +}; --- eclipse-3.4.1.orig/debian/extra/efj.1 +++ eclipse-3.4.1/debian/extra/efj.1 @@ -0,0 +1,35 @@ +.TH EFJ "1" "June 2006" +.SH NAME +efj \- manual page for Eclipse Formatter for Java +.SH SYNOPSIS +.B efj \fR +.SH DESCRIPTION +EFJ is the commanline version of the Eclipse source code formatter. +The main motivation for EFJ comes from a request to use Eclipse's Java formatter without +having to install the entire Eclipse Platform, JDT or a GUI toolkit. It is possible to run +a nightly cron job which checks out the code, formats it and checks it back in. EFJ could also +be used in a server side commit hook. + +.SH OPTIONS +.TP +\fB\-config\fR Use the formatting style from the specified config file. This file must be an xml file that has been exported by Eclipse. +.TP +\fB\-help\fR Display this message. +.TP +\fB\-quiet\fR Only print error messages. +.TP +\fB\-verbose\fR Be verbose about the formatting job. +.PP +.SH SEE ALSO +eclipse(1) +.SH ISSUES +You may also notice that an empty workspace directory is created in the directory that efj +is called from. This is because EFJ is just a GUI-less version of eclipse. Affords exists +to disable this behaviour. +.SH "REPORTING BUGS" +Report bugs to Ben Konrath . +.SH AUTHOR +ecj was written by Ben Konrath . See the web site +http://www.bagu.org/eclipse/efj/ for more information. + +This manual page was written by Stephan Michels . --- eclipse-3.4.1.orig/debian/extra/eclipse.1 +++ eclipse-3.4.1/debian/extra/eclipse.1 @@ -0,0 +1,226 @@ +.TH ECLIPSE 1 +.SH NAME +eclipse \- A kind of universal tool platform. +.SH SYNOPSIS +.B eclipse +.I "[platform options]" "[\-vmargs [Java VM arguments]]" +.SH "DESCRIPTION" +.B Eclipse +is a kind of universal tool platform - an open extensible IDE for anything and nothing in paticular. +.PP +This manual page documents briefly +.BR Eclipse, +a kind of universal tool platform. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. Most of description are +just cut and paste from Eclipse's document. + +.SH PLATFORM OPTIONS +A summary of platform options are included below. Some of this options can +be set by editing ~/.eclipse/eclipserc (but options given on the commandline +will overwrite them). This is usefull, when you start eclipse via menu entry. +.TP +.B \-arch +Defines the processor architecture on which the Eclipse platform is running. +The Eclipse platform ordinarily computes the optimal setting using the +prevailing value of Java os.arch property. If specified here, this is the +value that the Eclipse platform uses. The value specified here is available +to plug-ins as BootLoader.getOSArch(). Example values: "x86", "sparc", +"PA-RISC", "ppc". +.TP +.B \-application +The application to run. Applications are declared by plug-ins supplying +extensions to the org.eclipse.core.runtime.applications extension point. +This argument is typically not needed. If specified, the value overrides +the value supplied by the configuration. If not specified, the Eclipse +Workbench is run. +.TP +.B \-clean +Any cached data used by the OSGi framework and eclipse runtime will be wiped +clean. This will clean the caches used to store bundle dependency resolution +and eclipse extension registry data. Using this option will force eclipse to +reinitialize these caches. +.TP +.B \-configuration +The location for the Eclipse Platform configuration file, expressed as a +URL. The configuration file determines the location of the Eclipse platform, +the set of available plug-ins, and the primary feature. Note that relative +URLs are not allowed. The configuration file is written to this location +when the Eclipse platform is installed or updated. +.TP +.B \-console [port] +If set to a non-null value, the OSGi console (if installed) is enabled. If +the value is a suitable integer, it is interpreted as the port on which +the console listens and directs its output to the given port. Handy for +investigating the state of the system. +.TP +.B \-consolelog +Mirrors the Eclipse platform's error log to the console used to run Eclipse. +Handy when combined with -debug. +.TP +.B \-data +The path of the workspace on which to run the Eclipse platform. The +workspace location is also the default location for projects. Relative paths +are interpreted relative to the directory that Eclipse was started from. +.TP +.B \-debug [optionsFile] +Puts the platform in debug mode and loads the debug options from the file at +the given location, if specified. This file indicates which debug points are +available for a plug-in and whether or not they are enabled. If a file +location is not given, the platform looks in the directory that eclipse was +started from for a file called ".options". Both URLs and file system paths +are allowed as file locations. +.PP +.B Note: +On Debian, eclipse expects that the following arguments is a path to a +option file. You are not allowed to omit this file! +.TP +.B \-dev [classpathEntries] +Puts the platform in development mode. The optional classpath entries (a +comma separated list) are added to the runtime classpath of each plug-in. For +example, when the workspace contains plug-ins being developed, specifying +-dev bin adds a classpath entry for each plug-in project's directory named +bin, allowing freshly generated class files to be found there. Redundant or +non-existent classpath entries are eliminated. +.TP +.B \-endSplash +Specifies the command to use to take down the splash screen. Typically +supplied by the Eclipse executable. +.TP +.B \-feature +The identifier of the product being run. This controls various branding +information and what application is used. +.TP +.B \-framework +The URL location of the OSGi framework. Useful if the Eclipse install is +disjoint. +.TP +.B \-initialize +Initializes the configuration being run. All runtime related data structures +and caches are refreshed. Any user/plug-in defined configuration data is not +purged. No application is run, any product specifications are ignored and no +UI is presented (e.g., the splash screen is not drawn) +.TP +.B \-install +The install location of the platform. This setting indicates the location of +the basic Eclipse plug-ins and is useful if the Eclipse install is disjoint. +.TP +.B \-keyring +The location of the authorization database (or "key ring" file) on disk. This +argument must be used in conjunction with the -password option. Relative +paths are interpreted relative to the directory that Eclipse was started from. +.TP +.B \-name +The name to be displayed in task bar item when the application starts up. When +not set, the name is the name of the executable. +.TP +.B \-nl +Defines the name of the locale on which the Eclipse platform is running. The +Eclipse platform ordinarily computes the optimal setting automatically. If +specified here, this is the value that the Eclipse platform uses. The value +specified here is available to plug-ins as BootLoader.getNL(). Example +values: "en_US" and "fr_FR_EURO". +.PP +You need to install additonal language strings, before that works! Such +strings are available in the +.B eclipse-i18n +package. +.TP +.B \-noExit +The VM will not exit after the eclipse application has ended. This is useful +for examining the OSGi framework after the eclipse application has ended. +.TP +.B \-noLazyRegistryCacheLoading +The platform's plug-in registry cache loading optimization is deactivated. +By default, configuration elements are loaded from the registry cache +(when available) only on demand, reducing memory footprint. This option +forces the registry cache to be fully loaded at startup. +.TP +.B \-noRegistryCache +The internal extension registry cache is neither read or written +.TP +.B \-nosplash +Runs the platform without putting up the splash screen. +.TP +.B \-os +Defines the operating system on which the Eclipse platform is running. The +Eclipse platform ordinarily computes the optimal setting using the +prevailing value of Java os.name property. If specified here, this is the +value that the Eclipse platform uses. The value specified here is available +to plug-ins as BootLoader.getOS(), and used to resolve occurrences of the +$os$ variable in paths mentioned in the plug-in manifest file. Example +values: "win32", "linux", "hpux", "solaris", "aix". +.TP +.B \-password +The password for the authorization database. Used in conjunction with the +-keyring option. +.TP +.B \-perspective +The perspective to open in the active workbench window on startup. If this +parameter is not specified, the perspective that was active on shutdown will +be opened. +.TP +.B \-plugincustomization +The location of a properties file containing default settings for plug-in +preferences. These default settings override default settings specified in +the primary feature. Relative paths are interpreted relative to the directory +that eclipse was started from. +.TP +.B \-product +The ID of the product to run. The product gives the launched instance of +Eclipse its personality, and determines the product customization information +used. This replaces -feature, which is still supported for compatibility. +.TP +.B \-refresh +Option for performing a global refresh of the workspace on startup. This will +reconcile any changes that were made in the file system since the platform +was last run. +.TP +.B \-showlocation +Option for displaying the location of the workspace in the window title bar. +In release 2.0 this option only worked in conjunction with the -data command +line argument. +.TP +.B \-showSplash +Specifies the command to use to show the splash screen. Typically supplied +by the Eclipse executable. +.TP +.B \-startup +The location of jar used to startup eclipse. The jar referred to must have +the Main-Class attribute set. If this parameter is not set, the startup.jar +located in the same folder than the executable is used. +.TP +.B \-user +The location of the user area. The user area contains data (e.g., preferences) +specific to the OS user and independent of any Eclipse install, configuration +or instance. +.TP +.B \-vm +The location of Java Runtime executable to use to run the Eclipse platform. +Relative paths are interpreted relative to the directory that eclipse was +started from. +.TP +.B \-vmargs +When passed to the Eclipse, this option is used to customize the operation of +the Java VM used to run Eclipse. If specified, this option must come at the +end of the command line. The given arguments are dependant on VM that is +being run. +.TP +.B \-ws +The window system value. The value should be one of the Eclipse window system +names known to Eclipse (e.g., win32, motif, ...). +.SH NOTES +Eclipse will search for a java virtual machine in this order: VM given with +the "\-vm " argument, $JAVA_HOME/bin/java from $HOME/.eclipse/eclipserc +and then in the environment and at last use /usr/bin/java. +.SH SEE ALSO +java(1) +.SH FILES +Configuration file is $HOME/.eclipse/eclipserc, error log in +/.metadata/.log, where is the path to your workspace. +.SH BUGS +Eclipse has a bugzilla, which can be found at bugs.eclipse.org. +.SH AUTHOR +This manual page was written by Takashi Okamoto , +for the Debian GNU/Linux system (but may be used by others). It was updated +by Jan Schulz and Stephan Michels . --- eclipse-3.4.1.orig/debian/extra/java_home +++ eclipse-3.4.1/debian/extra/java_home @@ -0,0 +1,8 @@ +# This file determines the search order the Eclipse Platform uses to find a +# 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/default-java +/usr/lib/jvm/java-gcj +/usr/lib/kaffe/pthreads + --- eclipse-3.4.1.orig/debian/extra/local.link +++ eclipse-3.4.1/debian/extra/local.link @@ -0,0 +1 @@ +path=/usr/local/lib/ --- eclipse-3.4.1.orig/debian/extra/eclipse.png.uu +++ eclipse-3.4.1/debian/extra/eclipse.png.uu @@ -0,0 +1,58 @@ +begin 644 eclipse.png +MB5!.1PT*&@H````-24A$4@```#`````P"`,```!@W`FU```#`%!,5$4A&R$> +M&A[U[_7(L]-4!X5G,Y5!!W<@&R4M`5XG!TM<+I(Q(D.MD3XP-`C03!$46!DT3!4(1!3L<"U(8"T8E%5HT'W=$,85"-'(V*EP_,FT] +M,&DZ+F-$-G)"-F@-`3H<"UH:#4TN&W@S'WPT)&Y"-75$-G9`-'&$=51 +M3HE44HL$`T,&!$<5$V(>'6@R,7]$0I8[.H185Z-658P-#E0/#TQ/3Z1:6[=? +M8+5;6ZQ34YA75XZ.CN8#!3]F:<9B9;Q>8))E9IH5&&%'2XY97)$*#D0=(5

^1M=M9J<_R_J. +M6-G"````"7!(67,```L3```+$P$`FIP8````!W1)344'U0$>`0@R`DV?GP`` +M!B9)1$%42,>5E5M`C'D8QK-)#J,FI9)HBL;45$R'E6+3-A6F$"DL34V1:M-Y +M5&@Z.720,3.=B&PQ*8TFGW?[YO27NR%W\W< +M/+_W>=]O+OXJNS\1E=T_`TU-WP+EQ<4[2581.#M[>$0`/`Z7R_5*]//S]_$X.7&]O%#8@<*YJY#'^,Z4J*CHZ"]) +MS&UM;!@,9W0(PPF-Q8$H-%W]\2(Y?E-TM!F)CHZ9CB&A,!@&UM;&QH2QF!"( +M/&R?$A6=9F8VFP1^=70,#6=,F3)#VT!I+$9(H;PB.1GBZ9M]=#]"&C.F:FL: +M&&@9&T\#2`$*BBM2HM/3?7P=V`X.$Q$U-37=V1;FYE.!*:2AH:$Q(I175$1! +MG$VCT^DT-1J-2J7[;DY/2XL!YL_4UM;6U-0"IF,%"+]`0?*FS0YT*16@4RGQ +M=-_2RLI+0%U=7>Z:-;-F:2):$Y3"^[L5R5%I/FRIGJJJ*H72N.W!]?NRRP!* +M)76YN;M<9@%:&A/P"A3>0T&Z+XVJ^AG0N&W@U[_;VMI.-7 +MRQH[4IB&0G--2AIL1`H4ZO%EU_-0I4"KS\C+18((`QO3II-!RSP<$ +M"N15J0,O[W1TR.O1.":398T8)E`Q@1!:6EKNW3_I0$-!54\Z\/(9&/7U5<6,E3D^U=;O9Q0AF_8EU,(%?SA"KL1P7S<1,5S^C>7;UZ1 +MR^4='>17RBXH(`U""',S9;K8H>"\RL;62KLI7"?A3` +M<#,U\K:S`V%P\`TP.#3XYO<1WB)]!"^0[N[NIP\>]#R^\!B_$AQM.%E/4>3[ +M&AL(JK``&W(*"_?O)W=R,YVTQ@4;R$'/A]K[GKQ0TDWPE.`!TM/3(Y??^O[* +MR>L@R`J.V]O;4Q1%/J\;2L\#557Y^C[KA +M[?^',F,RA0T-+94-I:6E^?GY!P:CYP0RJ%0B4@O.<\7I#;(NZO+Q8(AQ+I-<"9\+7D?EY +MZBHU081P+B+"F1%C256\L(\I`0,)!M:N6+$B/%R9_V(>2SVC1B!((H2C,:<' +MLNV7#EI]GIO)YV,XV!/2BQ:%A[LK\U`PIO8H*=1>ZI=NB&$LLU)T6^[:FQG" +M]T0PO\C]8YXU)N.N1"!!02J5>0=YZ'/&4X9\9^[9&QH2$N*Y?/ER97PXK\[Z +M02*1)*'06AW!B["VUM^NT]AN.2LW+'0YXN[NOA#'#^?'U%0G)9'"N2-'MG-X +MUM:Q8-CK&QOH6TL<^"Z8@* +MX.I*CL>\2NO%2+$8#1"ZNL#@.#\`@,#(PD!#SN['K4.I(J]X/GF\H*\[?3M +MO#=%)Q\%RJLE1#PA`?);T0#A76_OH]8-$E%BHD@DXO)24WGPQ/)(Q&*N*%$( +M^<,0W[HQ((`0WKUJO7/M1-F)$T)P>$$"[D<@+11"G,QO!`.%5[_=OM:)EX`C +MD@C$H"62'!`*RT;%$1#^_./O1[T`*&5EHFOB`\(#`$P6E@G+R@X?_D\>A4_D +57X@B2RUJ!,3)`````$E%3D2N0F"" +` +end --- eclipse-3.4.1.orig/debian/extra/eclipse.desktop +++ eclipse-3.4.1/debian/extra/eclipse.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Eclipse +Comment=Develop applications in a variety of different programming languages +Exec=/usr/bin/eclipse +Icon=eclipse48.png +Terminal=false +Type=Application +Categories=Development; +StartupNotify=true