The following commit has been merged in the master branch:
commit 86825fed440fb03ef500b8901f5c080089e37f40
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Sat Oct 22 10:18:21 2011 +0200
d/patches/find-newer-servlet-api.patch: Patch to support libservlet2.5.
diff --git a/debian/changelog b/debian/changelog
index 8cd7af4..b7f5482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
eclipse (3.7.0-1) UNRELEASED; urgency=low
+ [ Benjamin Drung ]
* Upload to unstable.
* Use pkg-config to determine CFLAGS and LIBS for gnomeproxy.
* Eclipse 3.7 requires at least version 3.3 of asm3.
@@ -9,7 +10,10 @@ eclipse (3.7.0-1) UNRELEASED; urgency=low
* Add patch to find libjasper-java 5.5.33-1 on Debian.
* Update lintian overrides.
- -- Benjamin Drung <bdr...@debian.org> Tue, 20 Sep 2011 16:07:58 +0200
+ [ Damien Raude-Morvan ]
+ * d/patches/find-newer-servlet-api.patch: Patch to support libservlet2.5.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Sat, 22 Oct 2011 10:17:47 +0200
eclipse (3.7~exp-5) experimental; urgency=low
diff --git a/debian/patches/find-newer-servlet-api.patch
b/debian/patches/find-newer-servlet-api.patch
new file mode 100644
index 0000000..1d0b7e2
--- /dev/null
+++ b/debian/patches/find-newer-servlet-api.patch
@@ -0,0 +1,47 @@
+Description: Support finding jsp-2.1-api in Debian
+Author: Damien Raude-Morvan <draz...@debian.org>
+
+
+Index: b/dependencies.properties
+===================================================================
+--- a/dependencies.properties
++++ b/dependencies.properties
+@@ -1,7 +1,7 @@
+
com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar
+ com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
+
javax.servlet_2.5.0.v201103041518.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+-javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.0.jar
++javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.1.jar
+
org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
+ org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
+
org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
+Index:
b/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar/META-INF/MANIFEST.MF
+===================================================================
+---
a/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar/META-INF/MANIFEST.MF
++++
b/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar/META-INF/MANIFEST.MF
+@@ -17,9 +17,9 @@
+ Bundle-Version: 5.5.17.v201004212143
+ Bundle-ManifestVersion: 2
+ 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.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
+ 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
+Index: b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+===================================================================
+--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+@@ -8,7 +8,7 @@
+ Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
+ 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]",
+ org.apache.jasper.servlet;version="[0, 6)",
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.http;version="1.2.0",
diff --git a/debian/patches/series b/debian/patches/series
index fb70da3..3a4a0e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ eclipse-build-generatedScripts.patch
debian-load-internal-swt.patch
gnomeproxy-makefile.patch
find-newer-system-jasper.patch
+find-newer-servlet-api.patch
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
