[scannotation] 01/01: Build depend on libservlet3.1-java instead of 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 scannotation.

commit 6b58bbe797d6a16172025d1d7086f4a95f442b10
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 8 15:19:52 2014 +0200

    Build depend on libservlet3.1-java instead of libservlet2.5-java
---
 debian/changelog   | 7 +++++++
 debian/control     | 4 ++--
 debian/maven.rules | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64ae19d..15adcca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scannotation (1.0.2+svn20110812-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build depend on libservlet3.1-java instead of libservlet2.5-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Sep 2014 15:19:39 +0200
+
 scannotation (1.0.2+svn20110812-1) unstable; urgency=low
 
   * Initial release (Closes: #734659)
diff --git a/debian/control b/debian/control
index 060dab0..0d3a471 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Build-Depends: cdbs,
                default-jdk,
                javahelper,
                maven-debian-helper (>= 1.5)
-Build-Depends-Indep: libjavassist-java, libservlet2.5-java
+Build-Depends-Indep: libjavassist-java, libservlet3.1-java
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/scannotation.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/scannotation.git
-Homepage: http://scannotation.sourceforge.net/
+Homepage: http://scannotation.sourceforge.net
 
 Package: libscannotation-java
 Architecture: all
diff --git a/debian/maven.rules b/debian/maven.rules
index 3efa742..832f20b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 
 s/jboss/javassist/ javassist * s/.*/debian/ * *
-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/el-api/javax.el-api/ jar s/.*/3.0/ * *
+s/org.apache.tomcat/javax.servlet/ s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/ * *
+s/org.apache.tomcat/javax.servlet/ s/servlet-api/javax.servlet.servlet-api/ jar s/.*/3.1/ * *

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