[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 8231915f190bd6b8350f65b5d4034af8e6832cd0

[Niels Thykier]

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, master has been updated
       via  8231915f190bd6b8350f65b5d4034af8e6832cd0 (commit)
       via  9c9c252e2c9d1f395eb3b14f10428295b8ab8d04 (commit)
       via  1623ee41ebd49bc405c0f126359d39f76e3c63b3 (commit)
      from  233d5c733730153eafc6942bce22f586f9aa3d50 (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 8231915f190bd6b8350f65b5d4034af8e6832cd0
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Dec 10 22:31:44 2009 +0100

    Added Closes for fixed bug.

commit 9c9c252e2c9d1f395eb3b14f10428295b8ab8d04
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Dec 10 19:23:41 2009 +0100

    Added libservlet2.5-java.

commit 1623ee41ebd49bc405c0f126359d39f76e3c63b3
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Dec 10 11:54:45 2009 +0100

    Bumped servlet2.4 revision and made it use jsp-api-2.0

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

Summary of changes:
 debian/changelog                 |    6 ++++--
 debian/control                   |    7 ++++---
 debian/patches/system-jars.patch |    4 ++--
 system-jars.csv                  |    4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90b2af9..bc117f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,11 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
     (Closes: #554584, #521312)
   * Stopped eclipse from unpacking native libraries into ~/.eclipse.
     (Closes: #351729)
-  * Corrected Depends and Recommends. (Closes: #554677)
+  * Corrected Depends and Recommends.
     - eclipse-jdt now only suggests eclipse.
-    - removed strict depedency on openjdk.
+    - removed strict dependency on openjdk.
+    - removed recommends on eclipse-*-gcj packages.
+    (Closes: #554677, #558246)
   * Removed obsolete linda overrides.
   * New maintainers. (Closes: #526489)
   * Removed the need for Zenity (Closes: #528070)
diff --git a/debian/control b/debian/control
index a8358cf..753a5d4 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,8 @@ Build-Depends: ant (>= 1.7.1),
                libjsch-java (>= 0.1.37-3),
                liblucene2-java,
                libpango1.0-dev,
-               libservlet2.4-java (>= 5.0.30-9),
-               libservlet2.5-java,
+               libservlet2.4-java (>= 5.0.30-10),
+               libservlet2.5-java (>= 6.0.20-8),
                libxt-dev,
                libxtst-dev,
                lsb-release,
@@ -111,7 +111,8 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
          libcommons-httpclient-java (>= 3.1-9),
          libcommons-logging-java (>= 1.1.1-6),
          libjsch-java (>= 0.1.37-3),
-         libservlet2.4-java (>= 5.0.30-9),
+         libservlet2.4-java (>= 5.0.30-10),
+         libservlet2.5-java (>= 6.0.20-8),
          libswt-gtk-3.5-java (= ${binary:Version}),
          sat4j (>= 2.1.0),
          xulrunner-1.9.1,
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 8954b5c..e8ba68b 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -186,9 +186,9 @@ Applied-Upstream: no
 +plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
 +plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
 +plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
-+#plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
++plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
 +plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
-+#plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
++plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
 +#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
 +plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
 +plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
diff --git a/system-jars.csv b/system-jars.csv
index bd80ab5..fbc2f85 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -29,9 +29,9 @@ plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
 plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
 plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
 plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
-#plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
+plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
 plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
-#plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
+plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
 #plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
 plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
 plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar


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