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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-14 23:43:13 +0000 (Tue, 14 May 2013)
New Revision: 16643

Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/control
   trunk/axis/debian/rules
Log:
Updated the dependency on the Servlet API (2.5 -> 3.0)
Removed the obsolete dependency on the Activation Framework (libgnujaf-java)
Added the upstream changelog
debian/rules: Improved the clean target to allow rebuilds



Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2013-05-14 23:32:53 UTC (rev 16642)
+++ trunk/axis/debian/changelog	2013-05-14 23:43:13 UTC (rev 16643)
@@ -1,3 +1,12 @@
+axis (1.4-20) unstable; urgency=low
+
+  * Updated the dependency on the Servlet API (2.5 -> 3.0)
+  * Removed the obsolete dependency on the Activation Framework (libgnujaf-java)
+  * Added the upstream changelog
+  * debian/rules: Improved the clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 15 May 2013 00:56:15 +0200
+
 axis (1.4-19) unstable; urgency=low
 
   * Team upload.

Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2013-05-14 23:32:53 UTC (rev 16642)
+++ trunk/axis/debian/control	2013-05-14 23:43:13 UTC (rev 16643)
@@ -8,7 +8,7 @@
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, ant-optional, default-jdk, libwsdl4j-java,
  libcommons-logging-java, libcommons-httpclient-java, bnd,
- libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.5-java,
+ libcommons-discovery-java, libgnumail-java, libservlet3.0-java,
  maven-repo-helper
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/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, libgnujaf-java, libgnumail-java, libservlet2.5-java,
+ libcommons-httpclient-java, libgnumail-java, libservlet3.0-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	2013-05-14 23:32:53 UTC (rev 16642)
+++ trunk/axis/debian/rules	2013-05-14 23:43:13 UTC (rev 16643)
@@ -4,10 +4,12 @@
 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 activation gnumail servlet-api-2.5 xmlParserAPIs xercesImpl
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery commons-httpclient gnumail servlet-api-3.0 xmlParserAPIs xercesImpl
 
 DEB_ANT_BUILD_TARGET := compile javadocs
 
+DEB_INSTALL_CHANGELOGS_ALL := changelog.html
+
 common-post-build-indep::
 	for BNDFILE in debian/*.bnd; do \
 		JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \
@@ -28,6 +30,7 @@
 clean::
 	-rm -rf debian/tmp
 	-rm -rf build/api
+	mh_clean
 
 get-orig-source::
 	uscan --force-download --rename