This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit d1e4e4da414c4bf5dc2d7590bbcd01c250c79ba0 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 16 11:01:59 2013 +0200 Removed 0011-fix-classpath-lintian-warnings.patch and specified the classpath of jasper.jar in libtomcat8-java.manifest instead --- debian/changelog | 2 ++ debian/libtomcat8-java.manifest | 1 + .../0011-fix-classpath-lintian-warnings.patch | 27 -------------------- debian/patches/series | 1 - 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 634f92d..8361cba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low * Added the EL and WebSocket APIs to libservlet3.1-java-doc * Use a Lintian override to clear the codeless-jar warnings on the tomcat-i18n jars instead of a patch turning them into zip files. + * Removed 0011-fix-classpath-lintian-warnings.patch and specified + the classpath of jasper.jar in libtomcat8-java.manifest instead. -- Emmanuel Bourg <[email protected]> Thu, 12 Sep 2013 16:10:10 +0200 diff --git a/debian/libtomcat8-java.manifest b/debian/libtomcat8-java.manifest index 8125b4e..ad271e0 100644 --- a/debian/libtomcat8-java.manifest +++ b/debian/libtomcat8-java.manifest @@ -19,6 +19,7 @@ usr/share/java/tomcat8-jasper.jar: Export-Package: org.apache.jasper;version="8.0.0";uses:="javax.servlet,javax.servlet.jsp.tagext,org.apache.jasper.compiler,org.apache.jasper.servlet,org.apache.tools.ant",org.apache.jasper.compiler;version="8.0.0";uses:="javax.el,javax.servlet,javax.servlet.jsp.tagext,javax.xml.parsers,org.apache.jasper,org.apache.jasper.compiler.tagplugin,org.apache.jasper.servlet,org.apache.jasper.util,org.apache.jasper.xmlparser,org.apache.juli.logging,org.apache.tomcat,org.apache.tools.ant,org.eclip [...] Import-Package: javax.el;version="[1.0.0, 3.0.0)",javax.servlet;version="[2.6.0, 4.0.0)",javax.servlet.descriptor;version="[2.6.0, 4.0.0)",javax.servlet.http;version="[2.6.0, 4.0.0)",javax.servlet.jsp;version="[2.2.0, 3.0.0)",javax.servlet.jsp.el;version="[2.2.0, 3.0.0)",javax.servlet.jsp.resources;version="[2.2.0, 3.0.0)",javax.servlet.jsp.tagext;version="[2.2.0, 3.0.0)",javax.servlet.resources;version="[2.6.0, 4.0.0)",javax.xml.parsers;version="0",org.apache.el;version="[8.0.0, 8.0.0] [...] Unversioned-Imports: javax.xml.parsers.*,org.w3c.dom.*,org.xml.sax.* + Class-Path: ecj.jar el-api-3.0.jar servlet-api-3.1.jar jsp-api-2.3.jar usr/share/java/tomcat8-juli.jar: Bundle-ManifestVersion: 2 diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch deleted file mode 100644 index b6c0c2b..0000000 --- a/debian/patches/0011-fix-classpath-lintian-warnings.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix missing-classpath lintian warnings -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2011-05-16 ---- a/build.xml -+++ b/build.xml -@@ -755,6 +755,7 @@ - <jarIt jarfile="${jasper.jar}" - filesDir="${tomcat.classes}" - filesId="files.jasper" -+ manifest="${tomcat.manifests}/jasper.jar.manifest" - meta-inf="${tomcat.manifests}/jasper.jar"/> - - <!-- Jasper EL Implementation JAR File --> ---- /dev/null -+++ b/res/META-INF/jasper.jar.manifest -@@ -0,0 +1,10 @@ -+Manifest-Version: 1.0 -+Specification-Title: Apache Tomcat -+Specification-Version: @VERSION_MAJOR_MINOR@ -+Specification-Vendor: Apache Software Foundation -+Implementation-Title: Apache Tomcat -+Implementation-Version: @VERSION@ -+Implementation-Vendor: Apache Software Foundation -+X-Compile-Source-JDK: @source.jdk@ -+X-Compile-Target-JDK: @target.jdk@ -+Class-Path: ecj.jar tomcat-el-api-3.0.jar tomcat-servlet-api-3.1.jar tomcat-jsp-api-2.3.jar diff --git a/debian/patches/series b/debian/patches/series index 2552426..1a2679a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,6 @@ 0006-add-JARs-below-var-to-class-loader.patch 0009-Use-java.security.policy-file-in-catalina.sh.patch 0010-debianize-build-xml.patch -0011-fix-classpath-lintian-warnings.patch 0012-java7-compat.patch 0013-dont-look-for-build-properties-in-user-home.patch 0014-JDTCompiler.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
