[axis] 17/60: * Merge changes from Ubuntu: - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead of libservlet2.4-java (LP: #534913) * Remove Stephan and Vladimír from Uploaders list. * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead of libservlet2.4-java (LP: #534913) * debian/rules: Drop extra JAVA_HOME entry, build with default-jdk

[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 009222f603b2942274fbbc7e2afd021fa4344389
Author: Torsten Werner <twerner at debian.org>
Date:   Sun May 9 01:00:32 2010 +0000

    * Merge changes from Ubuntu:
      - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
        instead of libservlet2.4-java (LP: #534913)
    * Remove Stephan and Vladimír from Uploaders list.
    * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead
      of libservlet2.4-java (LP: #534913)
    * debian/rules: Drop extra JAVA_HOME entry, build with default-jdk
---
 debian/changelog | 17 +++++++++++++++++
 debian/control   |  7 +++----
 debian/rules     |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae9bd0f..b02fef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+axis (1.4-11) unstable; urgency=low
+
+  * Merge changes from Ubuntu:
+    - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
+      instead of libservlet2.4-java (LP: #534913)
+  * Remove Stephan and Vladimír from Uploaders list.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 09 May 2010 02:53:34 +0200
+
 axis (1.4-10) unstable; urgency=low
 
   * Add symlinks for old JAR names to fix some FTBFS
@@ -47,6 +56,14 @@ axis (1.4-7) unstable; urgency=low
 
  -- Torsten Werner <twerner at debian.org>  Sat, 27 Feb 2010 18:52:14 +0100
 
+axis (1.4-6ubuntu1) lucid; urgency=low
+
+  * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead
+    of libservlet2.4-java (LP: #534913)
+  * debian/rules: Drop extra JAVA_HOME entry, build with default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 09 Mar 2010 09:39:09 +0100
+
 axis (1.4-6) unstable; urgency=low
 
   [ Matthias Klose ]
diff --git a/debian/control b/debian/control
index 5a67afe..00fbae7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,8 @@ Source: axis
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stephan Michels <stephan at apache.org>, Vladimír Lapáček <vladimir.lapacek at gmail.com>,
- Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ant1.7-optional, default-jdk-builddep, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java,
+Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, ant1.7-optional, default-jdk-builddep, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.5-java,
  maven-repo-helper
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/axis
@@ -15,7 +14,7 @@ Package: libaxis-java
 Architecture: all
 Recommends: ant, libaxis-java-gcj
 Suggests: libaxis-java-doc
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java, ${misc:Depends}
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.5-java, ${misc:Depends}
 Description: A SOAP implementation in Java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
  submission to W3C.
diff --git a/debian/rules b/debian/rules
index 1ecff88..b5b0b5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ endif
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery activation gnumail servlet-api xmlParserAPIs xercesImpl
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery activation gnumail servlet-api-2.5 xmlParserAPIs xercesImpl
 
 DEB_ANT_BUILD_TARGET := compile javadocs
 DEB_ANT_INSTALL_TARGET := 

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