diff -Nru eclipse-3.5.2/debian/changelog eclipse-3.5.2/debian/changelog
--- eclipse-3.5.2/debian/changelog	2011-05-26 21:19:59.000000000 +0100
+++ eclipse-3.5.2/debian/changelog	2011-07-18 11:02:34.000000000 +0100
@@ -1,3 +1,22 @@
+eclipse (3.5.2-11ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #812161).  Remaining changes:
+    - debian/patches/gnomeproxy-makefile.patch: Set Java include path for
+      libgnomeproxy.
+    - debian/patches/gnomeproxy-pkg-config.patch: Use pkg-config to find
+      include files and libraries for libgnomeproxy.  (LP: #749218)
+    - Use xulrunner-1.9.2-dev, not xulrunner-dev, as eclipse isn't 2.0
+      compatible yet.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 18 Jul 2011 11:02:29 +0100
+
+eclipse (3.5.2-11) unstable; urgency=low
+
+  * Rebuild against new sat4j.  (Closes: #632999)
+    - This may trigger #587657 for people upgrading.
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 14 Jul 2011 17:13:19 +0200
+
 eclipse (3.5.2-10ubuntu2) oneiric; urgency=low
 
   * debian/patches/gnomeproxy-makefile.patch: Set Java include path for
diff -Nru eclipse-3.5.2/debian/control eclipse-3.5.2/debian/control
--- eclipse-3.5.2/debian/control	2011-05-26 21:18:04.000000000 +0100
+++ eclipse-3.5.2/debian/control	2011-07-15 01:30:28.000000000 +0100
@@ -40,8 +40,8 @@
                maven-ant-helper,
                maven-repo-helper,
                pkg-config,
-               sat4j (>= 2.2.3),
-               sat4j (<< 2.2.4),
+               sat4j (>= 2.3.0),
+               sat4j (<< 2.3.1),
                unzip,
                xulrunner-1.9.2-dev (>= 1.9.1.3-2),
                zip
@@ -134,8 +134,8 @@
          liblucene2-java (>= 2.9.4+ds1),
          liblucene2-java (<< 2.9.5),
          libservlet2.5-java (>= 6.0.20-8),
-         sat4j (>= 2.2.3),
-         sat4j (<< 2.2.4),
+         sat4j (>= 2.3.0),
+         sat4j (<< 2.3.1),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
diff -Nru eclipse-3.5.2/debian/eclipse-platform.NEWS eclipse-3.5.2/debian/eclipse-platform.NEWS
--- eclipse-3.5.2/debian/eclipse-platform.NEWS	2011-05-15 11:33:19.000000000 +0100
+++ eclipse-3.5.2/debian/eclipse-platform.NEWS	2011-07-18 11:56:02.000000000 +0100
@@ -1,3 +1,24 @@
+eclipse-platform (3.5.2-11) unstable; urgency=low
+
+  As with the 3.5.2-6 this upgrade may cause some eclipse plugins to
+  silently disappear.  If these plugins were required when opening
+  eclipse, it will cause an error (or a stack trace of some kind).
+  
+  The solution is to manually fix the "bundles.info" file in your
+  ~/.eclipse.  For more information on how to fix this file, please
+  refer to #587657[1].  Alternatively, removing ~/.eclipse and
+  re-installing all plugins should also work.
+  
+  We apologise for the inconvience and have already reported this to
+  upstream[2], where we hope to come up with a much more stable
+  solution.
+  
+  [1] http://bugs.debian.org/587657
+  
+  [2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=351485
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 14 Jul 2011 17:15:00 +0200
+
 eclipse-platform (3.5.2-6) unstable; urgency=low
 
   The upgrade of eclipse may cause plugins to silently disappear.
diff -Nru eclipse-3.5.2/debian/patches/sat4j-version.patch eclipse-3.5.2/debian/patches/sat4j-version.patch
--- eclipse-3.5.2/debian/patches/sat4j-version.patch	2011-05-26 21:18:05.000000000 +0100
+++ eclipse-3.5.2/debian/patches/sat4j-version.patch	2011-07-15 01:30:29.000000000 +0100
@@ -12,6 +12,6 @@
  Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
 - org.sat4j.core;bundle-version="2.1.0",
 - org.sat4j.pb;bundle-version="2.1.0",
-+ org.sat4j.core;bundle-version="[2.1.0,2.3)",
-+ org.sat4j.pb;bundle-version="[2.1.0,2.3)",
++ org.sat4j.core;bundle-version="[2.1.0,2.4)",
++ org.sat4j.pb;bundle-version="[2.1.0,2.4)",
   org.eclipse.core.jobs;bundle-version="3.3.0"