[SCM] eclipse - Powerful IDE written in java - Debian package. branch, oneiric, updated. debian/3.5.2-10-12-gabdcbae

[James Page]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, oneiric has been updated
       via  abdcbaef8f58e43539c1f932b91d7f81c71d05b8 (commit)
      from  690102a27a06527d724986e88890d0b775e1b903 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit abdcbaef8f58e43539c1f932b91d7f81c71d05b8
Author: James Page <james.page at canonical.com>
Date:   Mon Jul 18 12:31:07 2011 +0100

    Merge in 3.5.6-11

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                   |   19 +++++++++++++++++++
 debian/control                     |    8 ++++----
 debian/eclipse-platform.NEWS       |   21 +++++++++++++++++++++
 debian/patches/sat4j-version.patch |    4 ++--
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d485456..4ec08df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 at 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 --git a/debian/control b/debian/control
index 4c6f54a..f2af88d 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,8 @@ Build-Depends: ant (>= 1.8.2),
                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 @@ Depends: ant (>= 1.8.2),
          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 --git a/debian/eclipse-platform.NEWS b/debian/eclipse-platform.NEWS
index 22d3289..6f99f6b 100644
--- a/debian/eclipse-platform.NEWS
+++ b/debian/eclipse-platform.NEWS
@@ -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 at 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 --git a/debian/patches/sat4j-version.patch b/debian/patches/sat4j-version.patch
index ac265dd..6bb8086 100644
--- a/debian/patches/sat4j-version.patch
+++ b/debian/patches/sat4j-version.patch
@@ -12,6 +12,6 @@ index e5918c6..a9e7496 100644
  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"


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.