[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-5-29-g06e5342

[Niels Thykier]

The following commit has been merged in the master branch:
commit 06e5342c895990d46d3f0c28f338d5d3685cf5fd
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 22 12:25:35 2011 +0200

    Corrected the ranges for servlet-api

diff --git a/debian/patches/find-newer-servlet-api.patch b/debian/patches/find-newer-servlet-api.patch
index 1d0b7e2..041d553 100644
--- a/debian/patches/find-newer-servlet-api.patch
+++ b/debian/patches/find-newer-servlet-api.patch
@@ -26,9 +26,9 @@ Index: b/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar/META-INF
 - version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
 - vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
 - "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
-+ version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1]",javax.ser
-+ vlet.jsp.el;version="[2.0, 2.1]",javax.servlet.jsp.resources;version=
-+ "[2.0, 2.1]",javax.servlet.jsp.tagext;version="[2.0, 2.1]",javax.serv
++ version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.2)",javax.ser
++ vlet.jsp.el;version="[2.0, 2.2)",javax.servlet.jsp.resources;version=
++ "[2.0, 2.2)",javax.servlet.jsp.tagext;version="[2.0, 2.2)",javax.serv
   let.resources;version="[2.4, 3.0)",javax.xml.parsers,org.apache.commo
   ns.el;version="[1.0.0,2.0.0)",org.apache.commons.logging;version="[1.
   0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,org.apache.tool
@@ -41,7 +41,7 @@ Index: b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
  Import-Package: javax.servlet;version="[2.4, 3.0)",
   javax.servlet.http;version="[2.4, 3.0)",
 - javax.servlet.jsp;version="[2.0, 2.1)",
-+ javax.servlet.jsp;version="[2.0, 2.1]",
++ javax.servlet.jsp;version="[2.0, 2.2)",
   org.apache.jasper.servlet;version="[0, 6)",
   org.osgi.framework;version="1.3.0",
   org.osgi.service.http;version="1.2.0",

-- 
eclipse - Powerful IDE written in java - Debian package.