[resteasy] 02/03: Build depend on libtomcat8-java instead of libtomcat7-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 74c861fb5b0b4855034a32f0a2659895825edd6d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 31 16:03:33 2015 +0200

    Build depend on libtomcat8-java instead of libtomcat7-java
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cd19e4..9a3c5b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ resteasy (3.0.6-3) UNRELEASED; urgency=medium
   * Team upload.
   * Removed the build dependencies on glassfish-activation
     and libservlet2.5-java
+  * Build depend on libtomcat8-java instead of libtomcat7-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 31 Jul 2015 15:50:27 +0200
 
diff --git a/debian/control b/debian/control
index 127b034..8c8fc56 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
  libmaven-install-plugin-java,
  libscannotation-java,
  libslf4j-java,
- libtomcat7-java,
+ libtomcat8-java,
  libyaml-snake-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/resteasy.git
diff --git a/debian/maven.rules b/debian/maven.rules
index bdcff82..8153c27 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -11,4 +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/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/debian/ * *
+s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * *

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