[easyconf] 10/28: 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 easyconf.

commit e0c739d45bad5748fff447992933b486ed1dbd40
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 8 06:43:29 2014 +0000

    Depend on libservlet3.1-java instead of libservlet2.5-java
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b51e3f..e23759f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 easyconf (0.9.5-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * debian/control:
+    - Depend on libservlet3.1-java instead of libservlet2.5-java
   * Fixed the watch file
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Sep 2014 08:39:02 +0200
diff --git a/debian/control b/debian/control
index 20d1e7f..bbd8a56 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: ant,
                libcommons-digester-java,
                libcommons-lang-java,
                libcommons-logging-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libstruts1.2-java,
                libxstream-java,
                maven-repo-helper
@@ -33,7 +33,7 @@ Depends: libcommons-beanutils-java,
          libcommons-lang-java,
          libcommons-logging-java,
          ${misc:Depends}
-Suggests: libservlet2.5-java, libstruts1.2-java, libxstream-java
+Suggests: libstruts1.2-java, libxstream-java
 Description: library to access configuration of software components
  EasyConf is a library to access configuration of software components
  and applications.
diff --git a/debian/rules b/debian/rules
index e568cb6..3972eee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ MAVEN_REPO           := http://repository.sonatype.org/service/local/repositorie
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS  := commons-collections3 commons-logging commons-lang commons-digester commons-configuration commons-beanutils \
-             struts-1.2 servlet-api-2.5 jsp-api-2.1 xstream junit ant-junit
+             struts-1.2 servlet-api-3.1 jsp-api-2.3 xstream junit ant-junit
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CHECK_TARGET := internal-test
 

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