[axis] 47/60: Updated the dependency on the Servlet API (3.0 -> 3.1)

[Emmanuel Bourg]

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

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

commit 0db839f966c78d7689aac534961a68328f788364
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 17 11:25:58 2014 +0000

    Updated the dependency on the Servlet API (3.0 -> 3.1)
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 709667d..ae458d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+axis (1.4-22) UNRELEASED; urgency=medium
+
+  * Updated the dependency on the Servlet API (3.0 -> 3.1)
+  * libaxis-java no longer depends on the Servlet API since its always
+    provided by the web container executing Axis.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 17 Oct 2014 13:23:45 +0200
+
 axis (1.4-21) unstable; urgency=high
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 009e364..e647d22 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Torsten Werner <twerner at debian.org>,
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9), cdbs, ant-optional, default-jdk, libwsdl4j-java,
  libcommons-logging-java, libcommons-httpclient-java, bnd,
- libcommons-discovery-java, libgnumail-java, libservlet3.0-java,
+ libcommons-discovery-java, libgnumail-java, libservlet3.1-java,
  maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/axis
@@ -20,7 +20,7 @@ Architecture: all
 Recommends: ant
 Suggests: libaxis-java-doc
 Depends: libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java,
- libcommons-httpclient-java, libgnumail-java, libservlet3.0-java,
+ libcommons-httpclient-java, libgnumail-java,
  ${misc:Depends}
 Description: SOAP implementation in Java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
diff --git a/debian/rules b/debian/rules
index 5aeb01d..a599df0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery commons-httpclient gnumail servlet-api-3.0 xmlParserAPIs xercesImpl
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery commons-httpclient gnumail servlet-api-3.1 xmlParserAPIs xercesImpl
 
 DEB_ANT_BUILD_TARGET := compile javadocs
 

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