diff -Nru libcommons-el-java-1.0/debian/ant.properties libcommons-el-java-1.0/debian/ant.properties --- libcommons-el-java-1.0/debian/ant.properties 2013-09-10 08:56:46.000000000 +0000 +++ libcommons-el-java-1.0/debian/ant.properties 2016-06-03 14:37:32.000000000 +0000 @@ -1,3 +1,3 @@ -jsp-api.jar=/usr/share/java/servlet-3.0.jar +jsp-api.jar=/usr/share/java/servlet-3.1.jar junit.jar=/usr/share/java/junit.jar build.sysclasspath=only diff -Nru libcommons-el-java-1.0/debian/changelog libcommons-el-java-1.0/debian/changelog --- libcommons-el-java-1.0/debian/changelog 2013-09-10 09:13:28.000000000 +0000 +++ libcommons-el-java-1.0/debian/changelog 2016-06-03 14:41:45.000000000 +0000 @@ -1,3 +1,11 @@ +libcommons-el-java (1.0-9) unstable; urgency=medium + + * Transition to the Servlet API 3.1 + * Standards-Version updated to 3.9.8 (no changes) + * Switch to debhelper level 9 + + -- Emmanuel Bourg Fri, 03 Jun 2016 16:41:42 +0200 + libcommons-el-java (1.0-8) unstable; urgency=low * debian/control: diff -Nru libcommons-el-java-1.0/debian/compat libcommons-el-java-1.0/debian/compat --- libcommons-el-java-1.0/debian/compat 2013-09-10 08:32:15.000000000 +0000 +++ libcommons-el-java-1.0/debian/compat 2016-06-03 14:40:53.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libcommons-el-java-1.0/debian/control libcommons-el-java-1.0/debian/control --- libcommons-el-java-1.0/debian/control 2013-09-10 08:54:49.000000000 +0000 +++ libcommons-el-java-1.0/debian/control 2016-06-03 14:40:49.000000000 +0000 @@ -3,16 +3,16 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Niels Thykier , Emmanuel Bourg -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant -Build-Depends-Indep: junit (>= 3.8.1), libservlet3.0-java -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant +Build-Depends-Indep: junit (>= 3.8.1), libservlet3.1-java +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-el-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-el-java Homepage: http://commons.apache.org/el/ Package: libcommons-el-java Architecture: all -Depends: libservlet3.0-java, ${misc:Depends} +Depends: libservlet3.1-java, ${misc:Depends} Description: Implementation of the JSP 2.0 Expression Language interpreter The JSP 2.0 specification provides a portable API for evaluating "EL Expressions": The classes and interfaces in the javax.servlet.jsp.el diff -Nru libcommons-el-java-1.0/debian/patches/0004-add-OSGi-metadata.patch libcommons-el-java-1.0/debian/patches/0004-add-OSGi-metadata.patch --- libcommons-el-java-1.0/debian/patches/0004-add-OSGi-metadata.patch 2013-09-10 08:58:17.000000000 +0000 +++ libcommons-el-java-1.0/debian/patches/0004-add-OSGi-metadata.patch 2016-06-03 14:37:24.000000000 +0000 @@ -12,10 +12,10 @@ Implementation-Title: org.apache.commons.el Implementation-Vendor: Apache Software Foundation Implementation-Version: 1.0 -+Import-Package: javax.servlet;version="3.0",javax.servlet.http;version -+ ="3.0",javax.servlet.jsp;version="2.2",javax.servlet.jsp.el;version=" -+ 2.2",javax.servlet.jsp.resources;version="2.2",javax.servlet.jsp.tage -+ xt;version="2.2",javax.servlet.resources;version="3.0" ++Import-Package: javax.servlet;version="3.1",javax.servlet.http;version ++ ="3.1",javax.servlet.jsp;version="2.3",javax.servlet.jsp.el;version=" ++ 2.3",javax.servlet.jsp.resources;version="2.3",javax.servlet.jsp.tage ++ xt;version="2.3",javax.servlet.resources;version="3.1" +Bundle-ManifestVersion: 2 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo + ns.el.parser;version="1.0.0" diff -Nru libcommons-el-java-1.0/debian/rules libcommons-el-java-1.0/debian/rules --- libcommons-el-java-1.0/debian/rules 2013-09-10 08:54:20.000000000 +0000 +++ libcommons-el-java-1.0/debian/rules 2016-06-03 14:34:59.000000000 +0000 @@ -13,7 +13,7 @@ JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -DEB_JARS := servlet-api-3.0 jsp-api-2.2 junit +DEB_JARS := servlet-api-3.1 jsp-api-2.3 junit DEB_ANT_BUILD_TARGET := jar-only javadoc # Additional options to pass to the Java virtual machine