[velocity] 07/08: Transition to the Servlet API 3.1 (Closes: #801042)

[Emmanuel Bourg]

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

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

commit 399c1845eed7c977ac54487cd581ec08c451a84c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 21 16:13:57 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801042)
---
 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 6fae843..ed7b671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 velocity (1.7-4.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Transition to the Servlet API 3.1 (Closes: #801042)
   * Build with the DH sequencer instead of CDBS
   * debian/control:
     - Removed the deprecated DM-Upload-Allowed field
diff --git a/debian/control b/debian/control
index e4d83e5..bc6a4d8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends-Indep: ant,
                      liblog4j1.2-java-doc,
                      libmaven-javadoc-plugin-java,
                      liboro-java,
-                     libservlet2.5-java,
+                     libservlet3.1-java,
                      libwerken.xpath-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/velocity.git
diff --git a/debian/maven.rules b/debian/maven.rules
index a8ecc30..0a43d3b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -25,4 +25,4 @@ commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-javax.servlet servlet-api * s/.*/2.5/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *

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