[ha-jdbc] 09/11: Transition to the Servlet API 3.1 (Closes: #801010)

[Emmanuel Bourg]

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

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

commit a18ec41340d18981640594e93d1bd8ef2536a0e8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 21 14:07:19 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801010)
---
 debian/changelog                      | 1 +
 debian/control                        | 2 +-
 debian/patches/modify-build-file.diff | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fe4d08..ada484b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ha-jdbc (2.0.16+rc1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Transition to the Servlet API 3.1 (Closes: #801010)
   * debian/control:
     - Standards-Version updated to 3.9.8
     - Updated the Homepage field
diff --git a/debian/control b/debian/control
index 390564b..8d41138 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: ant,
                libjgroups-java,
                libjibx1.2-java,
                libquartz-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libslf4j-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/ha-jdbc.git
diff --git a/debian/patches/modify-build-file.diff b/debian/patches/modify-build-file.diff
index 4a675b5..8de6dd9 100644
--- a/debian/patches/modify-build-file.diff
+++ b/debian/patches/modify-build-file.diff
@@ -44,7 +44,7 @@ Author: Brian Thomason <brian.thomason at eucalyptus.com>
  		<fileset dir="${lib.compile.dir}" includes="*.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jibx-run-1.2.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jibx-bind-1.2.jar"></fileset>
-+		<fileset dir="/usr/share/java" includes="servlet-api-2.5.jar"></fileset>
++		<fileset dir="/usr/share/java" includes="servlet-api-3.1.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="bcel.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jgroups.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="quartz.jar"></fileset>

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