[axis] 44/60: 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]

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

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

commit dd45534b46ae69547dfece488554d8efe637bff4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 14 23:43:13 2013 +0000

    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
---
 debian/changelog | 9 +++++++++
 debian/control   | 4 ++--
 debian/rules     | 5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e88da23..7303e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 7a9aa89..c881402 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 (>= 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 @@ Architecture: all
 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")
diff --git a/debian/rules b/debian/rules
index ec44276..5aeb01d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,12 @@ 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 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 @@ install/libaxis-java-doc::
 clean::
 	-rm -rf debian/tmp
 	-rm -rf build/api
+	mh_clean
 
 get-orig-source::
 	uscan --force-download --rename

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