[pkg-java] r15845 - in trunk/libjasper-java/debian: . patches
Tony Mancill
tmancill at alioth.debian.org
Sun Mar 11 04:36:19 UTC 2012
Author: tmancill
Date: 2012-03-11 04:36:17 +0000 (Sun, 11 Mar 2012)
New Revision: 15845
Added:
trunk/libjasper-java/debian/patches/
trunk/libjasper-java/debian/patches/series
trunk/libjasper-java/debian/patches/servlet25.diff
Modified:
trunk/libjasper-java/debian/ant.properties
trunk/libjasper-java/debian/changelog
trunk/libjasper-java/debian/control
trunk/libjasper-java/debian/rules
Log:
apply patch for #658804; Remove Michael Koch from Uploaders. (Closes: #654072); set dist to unstable for team upload
Modified: trunk/libjasper-java/debian/ant.properties
===================================================================
--- trunk/libjasper-java/debian/ant.properties 2012-03-10 09:59:10 UTC (rev 15844)
+++ trunk/libjasper-java/debian/ant.properties 2012-03-11 04:36:17 UTC (rev 15845)
@@ -1,5 +1,5 @@
-jsp-api.jar=/usr/share/java/jsp-api-2.0.jar
-servlet-api.jar=/usr/share/java/servlet-api-2.4.jar
+jsp-api.jar=/usr/share/java/jsp-api-2.1.jar
+servlet-api.jar=/usr/share/java/servlet-api-2.5.jar
#ant.home=/usr/share/ant/
ant.jar=/usr/share/java/ant.jar
compile.source=1.5
Modified: trunk/libjasper-java/debian/changelog
===================================================================
--- trunk/libjasper-java/debian/changelog 2012-03-10 09:59:10 UTC (rev 15844)
+++ trunk/libjasper-java/debian/changelog 2012-03-11 04:36:17 UTC (rev 15845)
@@ -1,3 +1,14 @@
+libjasper-java (5.5.33-3) unstable; urgency=low
+
+ * Team upload.
+ * Replace dependencies on Servlet 2.4 library with 2.5. (Closes: #658804).
+ * Bump Standards-Version to 3.9.3. No changes were required.
+
+ [tony mancill]
+ * Remove Michael Koch from Uploaders. (Closes: #654072)
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sat, 10 Mar 2012 17:07:23 -0430
+
libjasper-java (5.5.33-2) unstable; urgency=low
* d/control: Update Vcs-Svn and Vcs-Browser
Modified: trunk/libjasper-java/debian/control
===================================================================
--- trunk/libjasper-java/debian/control 2012-03-10 09:59:10 UTC (rev 15844)
+++ trunk/libjasper-java/debian/control 2012-03-11 04:36:17 UTC (rev 15845)
@@ -2,11 +2,11 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>,
+Uploaders: Marcus Better <marcus at better.se>
Niels Thykier <niels at thykier.net>, Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libcommons-el-java,
- libcommons-logging-java, libecj-java, libservlet2.4-java
-Standards-Version: 3.9.2
+ libcommons-logging-java, libecj-java, libservlet2.5-java
+Standards-Version: 3.9.3
Homepage: http://tomcat.apache.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjasper-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjasper-java
@@ -14,7 +14,7 @@
Package: libjasper-java
Architecture: all
Depends: libcommons-el-java, libcommons-logging-java, libecj-java,
- libservlet2.4-java, ${misc:Depends}
+ libservlet2.5-java, ${misc:Depends}
Description: Implementation of the JSP Container
Jasper2 is a implementation of the JSP Container for Apache Tomcat 5.5
that is clean and easy to extend. It also forms the basis of the
Added: trunk/libjasper-java/debian/patches/series
===================================================================
--- trunk/libjasper-java/debian/patches/series (rev 0)
+++ trunk/libjasper-java/debian/patches/series 2012-03-11 04:36:17 UTC (rev 15845)
@@ -0,0 +1 @@
+servlet25.diff
Added: trunk/libjasper-java/debian/patches/servlet25.diff
===================================================================
--- trunk/libjasper-java/debian/patches/servlet25.diff (rev 0)
+++ trunk/libjasper-java/debian/patches/servlet25.diff 2012-03-11 04:36:17 UTC (rev 15845)
@@ -0,0 +1,104 @@
+Description: Dummy compatibility with Servlet 2.5 API
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/658804
+Forwarded: no
+Last-Update: 2012-03-10
+
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
+@@ -20,8 +20,10 @@ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+
+ import javax.servlet.Servlet;
++import javax.servlet.ServletContext;
+ import javax.servlet.ServletRequest;
+ import javax.servlet.ServletResponse;
++import javax.servlet.jsp.JspApplicationContext;
+ import javax.servlet.jsp.JspFactory;
+ import javax.servlet.jsp.JspEngineInfo;
+ import javax.servlet.jsp.PageContext;
+@@ -175,4 +177,8 @@ public class JspFactoryImpl extends JspF
+ return null;
+ }
+ }
++
++ public JspApplicationContext getJspApplicationContext(ServletContext context) {
++ throw new UnsupportedOperationException("getJspApplicationContext");
++ }
+ }
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/JspContextWrapper.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/JspContextWrapper.java
+@@ -41,6 +41,8 @@ import javax.servlet.jsp.el.VariableReso
+ import javax.servlet.jsp.tagext.BodyContent;
+ import javax.servlet.jsp.tagext.VariableInfo;
+
++import javax.el.ELContext;
++
+ import org.apache.commons.el.VariableResolverImpl;
+ import org.apache.jasper.compiler.Localizer;
+
+@@ -451,5 +453,9 @@ public class JspContextWrapper
+ }
+ return alias;
+ }
++
++ public ELContext getELContext() {
++ throw new UnsupportedOperationException("getELContext");
++ }
+ }
+
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/servlet/JspCServletContext.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/servlet/JspCServletContext.java
+@@ -427,5 +427,10 @@ public class JspCServletContext implemen
+ }
+
+
++ public String getContextPath() {
++ throw new UnsupportedOperationException("getContextPath");
++ }
++
++
+
+ }
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
+@@ -142,4 +142,8 @@ class ImplicitTagLibraryInfo extends Tag
+
+ return tagFile;
+ }
++
++ public TagLibraryInfo[] getTagLibraryInfos() {
++ throw new UnsupportedOperationException("getTagLibraryInfos");
++ }
+ }
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/PageContextImpl.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/PageContextImpl.java
+@@ -44,6 +44,8 @@ import javax.servlet.jsp.el.ExpressionEv
+ import javax.servlet.jsp.el.VariableResolver;
+ import javax.servlet.jsp.tagext.BodyContent;
+
++import javax.el.ELContext;
++
+ import org.apache.commons.el.ExpressionEvaluatorImpl;
+ import org.apache.commons.el.VariableResolverImpl;
+ import org.apache.jasper.Constants;
+@@ -933,4 +935,8 @@ public class PageContextImpl extends Pag
+ return retValue;
+ }
+
++ public ELContext getELContext() {
++ throw new UnsupportedOperationException("getELContext");
++ }
++
+ }
+--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
++++ libjasper-java-5.5.33/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+@@ -763,4 +763,8 @@ class TagLibraryInfoImpl extends TagLibr
+ }
+
+ protected TagLibraryValidator tagLibraryValidator;
++
++ public TagLibraryInfo[] getTagLibraryInfos() {
++ throw new UnsupportedOperationException("getTagLibraryInfos");
++ }
+ }
Modified: trunk/libjasper-java/debian/rules
===================================================================
--- trunk/libjasper-java/debian/rules 2012-03-10 09:59:10 UTC (rev 15844)
+++ trunk/libjasper-java/debian/rules 2012-03-11 04:36:17 UTC (rev 15845)
@@ -9,7 +9,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
JAR := $(JAVA_HOME)/bin/jar
-DEB_JARS := ant ant-launcher ant-trax
+DEB_JARS := ant ant-launcher ant-trax el-api-2.1
install/libjasper-java::
cd build/shared/classes/ && $(JAR) cf ../../jasper.jar *
More information about the pkg-java-commits
mailing list