[debian-edu-commits] debian-edu/ 14/26: Transition to the Servlet API 3.1 (Closes: #801032)

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit ea08e7a29f3eefeeaaae38c572bb79cade921d58
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 6 00:26:17 2016 +0100

    Transition to the Servlet API 3.1 (Closes: #801032)
---
 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 8d6d107..a1384d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ guacamole-client (0.8.3-1.2) UNRELEASED; urgency=medium
     - Removed the duplicate Section fields on the binary packages
     - Suggest jetty8 instead of jetty for the guacamole package
     - Removed the build dependency on java6-sdk
+  * Transition to the Servlet API 3.1 (Closes: #801032)
   * Switch to debhelper level 9
   * Build with the DH sequencer instead of CDBS
 
diff --git a/debian/control b/debian/control
index 3681753..10479be 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
                libmaven-install-plugin-java,
                libmaven-plugin-testing-java,
                libmaven-war-plugin-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libslf4j-java,
                maven-debian-helper,
                po-debconf
diff --git a/debian/maven.rules b/debian/maven.rules
index 5febfcd..1813da4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,7 @@ org.slf4j slf4j-api jar debian
 org.slf4j slf4j-jcl jar debian
 org.apache.maven maven-war-plugin plugin *
 org.apache.maven maven-assembly-plugin plugin debian
-javax.servlet servlet-api jar 2.5
+javax.servlet s/servlet-api/javax.servlet-api/ jar 3.1
 org.glyptodon.guacamole guacamole-common jar *
 org.glyptodon.guacamole guacamole-ext jar *
 org.glyptodon.guacamole guacamole-common-js zip *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-client.git