[pkg-java] r18552 - trunk/axis/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-10-17 11:25:58 +0000 (Fri, 17 Oct 2014)
New Revision: 18552

Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/control
   trunk/axis/debian/rules
Log:
Updated the dependency on the Servlet API (3.0 -> 3.1)



Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2014-10-17 11:16:57 UTC (rev 18551)
+++ trunk/axis/debian/changelog	2014-10-17 11:25:58 UTC (rev 18552)
@@ -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.

Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2014-10-17 11:16:57 UTC (rev 18551)
+++ trunk/axis/debian/control	2014-10-17 11:25:58 UTC (rev 18552)
@@ -8,7 +8,7 @@
  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 @@
 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")

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2014-10-17 11:16:57 UTC (rev 18551)
+++ trunk/axis/debian/rules	2014-10-17 11:25:58 UTC (rev 18552)
@@ -4,7 +4,7 @@
 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