[resteasy] 01/03: Removed the build dependencies on glassfish-activation and libservlet2.5-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository resteasy.

commit bf0ced3deef7b6dc6d7375baa54f93b3c0d47e81
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 31 16:02:18 2015 +0200

    Removed the build dependencies on glassfish-activation and libservlet2.5-java
---
 debian/changelog   | 8 ++++++++
 debian/control     | 2 --
 debian/maven.rules | 6 ------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70cabfc..1cd19e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+resteasy (3.0.6-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the build dependencies on glassfish-activation
+    and libservlet2.5-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 31 Jul 2015 15:50:27 +0200
+
 resteasy (3.0.6-2) unstable; urgency=high
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 66632f3..127b034 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep:
- glassfish-activation,
  glassfish-javaee,
  javahelper,
  junit4,
@@ -17,7 +16,6 @@ Build-Depends-Indep:
  liblog4j1.2-java (>= 1.2.17),
  libmaven-install-plugin-java,
  libscannotation-java,
- libservlet2.5-java,
  libslf4j-java,
  libtomcat7-java,
  libyaml-snake-java
diff --git a/debian/maven.rules b/debian/maven.rules
index 4327da8..bdcff82 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -11,10 +11,4 @@ com.sun.istack istack-commons-runtime * s/debian/2.17/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 org.yaml snakeyaml * s/.*/1.12/ * *
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
-s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/2.2/ * *
-s/org.apache.tomcat/javax.servlet/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.2/ * *
-s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.0/ * *
 s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/debian/ * *

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