Bug#780701: jakarta-taglibs-standard: Transition from servlet 2.5 -> 3.0

[Artur Rona]

Package: src:jakarta-taglibs-standard
Version: 1.1.2-3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

     - debian/ant.properties, debian/control, debian/rules:
       + Transition from servlet 2.5 -> 3.0.

We thought you might be interested in doing the same.
-------------- next part --------------
diff -Nru jakarta-taglibs-standard-1.1.2/debian/ant.properties jakarta-taglibs-standard-1.1.2/debian/ant.properties
--- jakarta-taglibs-standard-1.1.2/debian/ant.properties	2015-03-15 02:48:03.000000000 +0100
+++ jakarta-taglibs-standard-1.1.2/debian/ant.properties	2015-03-18 00:42:26.000000000 +0100
@@ -2,6 +2,6 @@
 dist.dir=dist
 ant.build.javac.source=1.5
 ant.build.javac.target=1.5
-servlet24.jar=/usr/share/java/servlet-api-2.5.jar
-jsp20.jar=/usr/share/java/jsp-api-2.1.jar
+servlet24.jar=/usr/share/java/servlet-api-3.0.jar
+jsp20.jar=/usr/share/java/jsp-api-2.2.jar
 xalan.jar=/usr/share/java/xalan2.jar
diff -Nru jakarta-taglibs-standard-1.1.2/debian/control jakarta-taglibs-standard-1.1.2/debian/control
--- jakarta-taglibs-standard-1.1.2/debian/control	2015-03-14 23:20:00.000000000 +0100
+++ jakarta-taglibs-standard-1.1.2/debian/control	2015-03-18 00:43:22.000000000 +0100
@@ -10,7 +10,7 @@
  debhelper (>= 7.0.50~),
  javahelper,
  maven-repo-helper (>= 1.5~)
-Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java
+Build-Depends-Indep: default-jdk, libservlet3.0-java, libxalan2-java
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
diff -Nru jakarta-taglibs-standard-1.1.2/debian/rules jakarta-taglibs-standard-1.1.2/debian/rules
--- jakarta-taglibs-standard-1.1.2/debian/rules	2015-03-14 23:20:00.000000000 +0100
+++ jakarta-taglibs-standard-1.1.2/debian/rules	2015-03-18 00:42:26.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/el-api-2.1.jar
+export CLASSPATH=/usr/share/java/el-api-2.2.jar
 
 DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
 MAVEN_REPO           := http://repo1.maven.org/maven2