[jetty9] 27/99: Team upload

[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 032f7c1127f7ccb441800f70f23268fbaaeb77dd
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jun 25 14:48:26 2012 +0100

    Team upload
    
    * Team upload
    * Switch to use of javax.* and standard jar names for Servlet, JSP and
      EL API's (Closes: #678766):
      - d/maven.rules: Fix mapping to javax.* artifacts as published by the
        latest version of the tomcat7 package.
      - d/{libjetty8-java,libjetty8-extra-java}.links: Switch use from
        deprecated tomcat-* jar files for Servlet, JSP and EL API's.
      - d/control: Bump minimum version of libtomcat7-java to ensure that
        the correct API jars/artifacts are provided.
---
 debian/changelog                  | 14 ++++++++++++++
 debian/control                    |  4 ++--
 debian/libjetty8-extra-java.links |  6 ++----
 debian/libjetty8-java.links       |  2 +-
 debian/maven.rules                | 10 +++++-----
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3521e7d..11ba476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+jetty8 (8.1.3-4) UNRELEASED; urgency=low
+
+  * Team upload
+  * Switch to use of javax.* and standard jar names for Servlet, JSP and
+    EL API's (Closes: #678766):
+    - d/maven.rules: Fix mapping to javax.* artifacts as published by the 
+      latest version of the tomcat7 package. 
+    - d/{libjetty8-java,libjetty8-extra-java}.links: Switch use from
+      deprecated tomcat-* jar files for Servlet, JSP and EL API's.
+    - d/control: Bump minimum version of libtomcat7-java to ensure that
+      the correct API jars/artifacts are provided.
+
+ -- James Page <james.page at ubuntu.com>  Mon, 25 Jun 2012 13:55:45 +0100
+
 jetty8 (8.1.3-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e407348..be35d54 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
  javahelper, maven-debian-helper, libbuild-helper-maven-plugin-java, libgnumail-java (>= 1.1.2-7),
- libgnujaf-java, junit, libtomcat7-java (>= 7.0.26), default-jdk-doc, libmaven-bundle-plugin-java,
+ libgnujaf-java, junit, libtomcat7-java (>= 7.0.28), default-jdk-doc, libmaven-bundle-plugin-java,
  libmockito-java, glassfish-jmac-api (>= 1:2.1.1-b31g-2), libgeronimo-jta-1.1-spec-java,
  libjstl1.1-java, libservlet3.0-java, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.3
@@ -40,7 +40,7 @@ Description: Javadoc for the Jetty API
 Package: libjetty8-extra-java
 Architecture: all
 Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
- libtomcat7-java (>= 7.0.26), libasm3-java, libgnujaf-java,
+ libtomcat7-java (>= 7.0.28), libasm3-java, libgnujaf-java,
  libgnumail-java, libjakarta-taglibs-standard-java, libservlet3.0-java,
  libjstl1.1-java
 Suggests: jetty8
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
index 771ba66..e1d65a0 100644
--- a/debian/libjetty8-extra-java.links
+++ b/debian/libjetty8-extra-java.links
@@ -1,12 +1,10 @@
 usr/share/java/tomcat-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/activation.jar                usr/share/jetty8/lib/jndi/javax.activation.jar
 usr/share/java/gnumail.jar                   usr/share/jetty8/lib/jndi/javax.mail.jar
-
-usr/share/java/tomcat-jsp-api-2.2.jar        usr/share/jetty8/lib/jsp/javax.servlet.jsp.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/java/jstl1.1.jar                   usr/share/jetty8/lib/jsp/javax.servlet.jsp.jstl.jar
-usr/share/java/tomcat-el-api-2.2.jar         usr/share/jetty8/lib/jsp/javax.el.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
diff --git a/debian/libjetty8-java.links b/debian/libjetty8-java.links
index ec47b97..5fc22b9 100644
--- a/debian/libjetty8-java.links
+++ b/debian/libjetty8-java.links
@@ -1 +1 @@
-usr/share/java/tomcat-servlet-api-3.0.jar usr/share/jetty8/lib/servlet-api-3.0.jar
+usr/share/java/servlet-api-3.0.jar usr/share/jetty8/lib/servlet-api-3.0.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 15767d4..7b2d639 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,6 @@
 asm asm-commons * 3.x * *
 javax.servlet jstl jar s/.*/1.1/ * *
-s/javax.servlet.jsp/org.apache.tomcat/ s/jsp-api/tomcat-jsp-api/ jar s/.*/debian/ * *
+javax.servlet.jsp jsp-api jar s/.*/2.2/ * *
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
 s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * *
@@ -9,10 +9,10 @@ s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.mes
 s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/javax.activation/ s/javax.activation/gnujaf/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.annotation/tomcat-annotations-api/ jar s/.*/debian/ * *
-s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.el/tomcat-el-api/ jar s/.*/debian/ * *
-s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.servlet/tomcat-servlet-api/ jar s/.*/debian/ * *
-s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.servlet.jsp/tomcat-jsp-api/ jar s/.*/debian/ * *
+s/org.eclipse.jetty.orbit/javax.el/ s/javax.el/el-api/ jar s/.*/2.2/ * *
+s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet/servlet-api/ jar s/.*/3.0/ * *
+s/org.eclipse.jetty.orbit/javax.servlet.jsp/ s/javax.servlet.jsp/jsp-api/ jar s/.*/2.2/ * *
 s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet.jsp.jstl/jstl/ jar s/.*/1.1/ * *
 s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * *
-s/org.mortbay.jetty/org.apache.tomcat/ s/servlet-api/tomcat-servlet-api/ jar  s/.*/debian/ * *
+s/org.mortbay.jetty/javax.servlet/ servlet-api jar  s/.*/3.0/ * *
 org.mortbay.jetty jetty-util * s/6\..*/6.x/ * *

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