diff -Nru eclipse-3.5.2/debian/changelog eclipse-3.5.2/debian/changelog
--- eclipse-3.5.2/debian/changelog	2010-04-22 14:38:20.000000000 +0200
+++ eclipse-3.5.2/debian/changelog	2010-05-09 00:40:27.000000000 +0200
@@ -1,3 +1,12 @@
+eclipse (3.5.2-2ubuntu4.1) lucid-proposed; urgency=low
+
+  [ Niels Thykier ]
+  * Added Recommends on default-jdk | sun-java6-jdk for eclipse-jdt.
+    (LP: #576952)
+  * Added patch to deal with broken help-menu. (Closes: #576106, LP: #549904)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 09 May 2010 00:39:43 +0200
+
 eclipse (3.5.2-2ubuntu4) lucid; urgency=low
 
   * No source change rebuild to pick up new location of sat4j (LP: #566131).
diff -Nru eclipse-3.5.2/debian/control eclipse-3.5.2/debian/control
--- eclipse-3.5.2/debian/control	2010-04-22 14:37:25.000000000 +0200
+++ eclipse-3.5.2/debian/control	2010-05-09 00:37:32.000000000 +0200
@@ -74,6 +74,7 @@
          junit4 (>= 4.7-3),
          libhamcrest-java (>= 1.1-4),
          ${misc:Depends}
+Recommends: default-jdk | sun-java6-jdk
 Suggests: eclipse
 Replaces: eclipse-jdt-gcj
 Description: Eclipse Java Development Tools (JDT)
diff -Nru eclipse-3.5.2/debian/patches/fix-help-contents.patch eclipse-3.5.2/debian/patches/fix-help-contents.patch
--- eclipse-3.5.2/debian/patches/fix-help-contents.patch	1970-01-01 01:00:00.000000000 +0100
+++ eclipse-3.5.2/debian/patches/fix-help-contents.patch	2010-05-09 00:38:30.000000000 +0200
@@ -0,0 +1,40 @@
+Description: Fixes the problem with the servlet compiler being unable
+ to find the classes it needs.
+ .
+ This problem is Debian specific.
+Author: Niels Thykier <niels@thykier.net>
+Forwarded: not needed
+
+diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+index 3303026..61cb9c0 100644
+--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
++++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+@@ -20,6 +20,7 @@ import java.util.Enumeration;
+ import java.util.StringTokenizer;
+ 
+ import org.osgi.framework.Bundle;
++import org.osgi.framework.BundleContext;
+ import org.osgi.framework.Constants;
+ 
+ /**
+@@ -75,6 +76,20 @@ public class JspClassLoader extends URLClassLoader {
+ 	private void addBundleClassPathJars(Bundle bundle) {
+ 		Dictionary headers = bundle.getHeaders();
+ 		String classPath = (String) headers.get(Constants.BUNDLE_CLASSPATH);
++		BundleContext context = bundle.getBundleContext();
++		Bundle[] inner = context.getBundles();
++		for(int i = 0 ; i < inner.length ; i++){
++		    String loc = inner[i].getLocation();
++		    if(loc.startsWith("reference:file:plugins/")){
++			String p = loc.replaceFirst("^reference:file:", "file:///usr/lib/eclipse/");
++			try {
++			    URL u = new URL(p);
++			    super.addURL(u);
++			} catch(Exception e){
++			    e.printStackTrace();
++			}
++		    }
++		}
+ 		if (classPath != null) {
+ 			StringTokenizer tokenizer = new StringTokenizer(classPath, ","); //$NON-NLS-1$
+ 			while (tokenizer.hasMoreTokens()) {
diff -Nru eclipse-3.5.2/debian/patches/series eclipse-3.5.2/debian/patches/series
--- eclipse-3.5.2/debian/patches/series	2010-04-16 16:54:36.000000000 +0200
+++ eclipse-3.5.2/debian/patches/series	2010-05-09 00:38:30.000000000 +0200
@@ -14,3 +14,4 @@
 eclipse-build-generatedScripts.patch
 osgi-services-symlink-javax.patch
 ecj-gccmain-java.patch
+fix-help-contents.patch