[jetty9] 40/99: Use the Tomcat 7 jars from /usr/share/tomcat7/lib

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit a0e3b736fda1806948b86233fa924b516a37d3ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 7 10:05:22 2013 +0100

    Use the Tomcat 7 jars from /usr/share/tomcat7/lib
---
 debian/changelog                  | 7 +++++++
 debian/libjetty8-extra-java.links | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed39992..8b41fcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.3-9) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Use the Tomcat 7 jars from /usr/share/tomcat7/lib
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 Nov 2013 10:01:43 +0100
+
 jetty8 (8.1.3-8) unstable; urgency=low
 
   * Don't build jetty-spdy module with Java 7 (Closes: #717119).
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
index fe1d32e..c4af34a 100644
--- a/debian/libjetty8-extra-java.links
+++ b/debian/libjetty8-extra-java.links
@@ -1,9 +1,9 @@
-usr/share/java/tomcat-annotations-api.jar    usr/share/jetty8/lib/annotations/javax.annotation.jar
+usr/share/tomcat7/lib/annotations-api.jar    usr/share/jetty8/lib/annotations/javax.annotation.jar
 usr/share/java/asm3.jar                      usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
 usr/share/java/asm3-commons.jar              usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
 usr/share/java/gnumail.jar                   usr/share/jetty8/lib/jndi/javax.mail.jar
 usr/share/java/jsp-api-2.2.jar               usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
-usr/share/java/tomcat-jasper.jar             usr/share/jetty8/lib/jsp/org.apache.jasper.jar
+usr/share/tomcat7/lib/jasper.jar             usr/share/jetty8/lib/jsp/org.apache.jasper.jar
 usr/share/java/jstl1.1.jar                   usr/share/jetty8/lib/jsp/javax.servlet.jsp.jstl.jar
 usr/share/java/el-api-2.2.jar                usr/share/jetty8/lib/jsp/javax.el.jar
 usr/share/java/standard.jar                  usr/share/jetty8/lib/jsp/org.apache.taglibs.standard.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git