[jasypt] 04/06: 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 jasypt.

commit 9681ce6c5850ff3f713bd4860878bc802298dabc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 9 00:49:26 2014 +0200

    Depend on libservlet3.1-java instead of libservlet2.5-java
---
 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 6ba15aa..1bab77d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jasypt (1.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * debian/control:
+    - Depend on libservlet3.1-java instead of libservlet2.5-java
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index f31d7ab..242204a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cdbs,
                libhibernate3-java-doc,
                libicu4j-java,
                libmaven-javadoc-plugin-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libspring-beans-java,
                libspring-core-java,
                libspring-transaction-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index e0f6965..cfbae88 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,4 +20,4 @@ org.jasypt jasypt jar s/.*/debian/ * *
 
 junit junit * s/.*/4.x/ * *
 org.springframework * * s/3\..*/3.x/ * *
-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/jasypt.git