[portlet-api-2.0-spec] 05/07: Transition to the Servlet API 3.1 (Closes: #801028)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository portlet-api-2.0-spec.

commit b6c7efff11231a444fe1015994f413fbfdc3567a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 30 17:17:55 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801028)
---
 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 c81d2c4..55dcae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 portlet-api-2.0-spec (1.0-2.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Transition to the Servlet API 3.1 (Closes: #801028)
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8 (no changes)
diff --git a/debian/control b/debian/control
index cb48e34..f1571d8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
-Build-Depends-Indep: libservlet2.5-java, default-jdk-doc, libservlet2.5-java-doc, libmaven-javadoc-plugin-java 
+Build-Depends-Indep: libservlet3.1-java, default-jdk-doc, libservlet3.1-java-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/portlet-api-2.0-spec.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/portlet-api-2.0-spec.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 05ea418..9cab75d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 # Force the version of the javax apis
-javax.servlet servlet-api jar s/.*/2.5/
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 javax.portlet portlet-api jar s/.*/2.0/
 # Convert portals version of the standard apis to the javax apis
 s/org.apache.portals/javax.portlet/ s/portlet-api_2.0_spec/portlet-api/ jar s/.*/2.0/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/portlet-api-2.0-spec.git