Author: twerner
Date: 2010-05-09 01:00:32 +0000 (Sun, 09 May 2010)
New Revision: 12372
Modified:
trunk/axis/debian/changelog
trunk/axis/debian/control
trunk/axis/debian/rules
Log:
* 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?\195?\173r 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
Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog 2010-05-09 00:45:46 UTC (rev 12371)
+++ trunk/axis/debian/changelog 2010-05-09 01:00:32 UTC (rev 12372)
@@ -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 <[email protected]> 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 @@
-- Torsten Werner <[email protected]> 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 <[email protected]> Tue, 09 Mar 2010 09:39:09 +0100
+
axis (1.4-6) unstable; urgency=low
[ Matthias Klose ]
Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control 2010-05-09 00:45:46 UTC (rev 12371)
+++ trunk/axis/debian/control 2010-05-09 01:00:32 UTC (rev 12372)
@@ -2,9 +2,8 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Stephan Michels <[email protected]>, Vladimír Lapáček
<[email protected]>,
- Michael Koch <[email protected]>, Torsten Werner <[email protected]>, Damien
Raude-Morvan <[email protected]>
-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 <[email protected]>, Torsten Werner
<[email protected]>, Damien Raude-Morvan <[email protected]>
+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 @@
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.
Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules 2010-05-09 00:45:46 UTC (rev 12371)
+++ trunk/axis/debian/rules 2010-05-09 01:00:32 UTC (rev 12372)
@@ -10,7 +10,7 @@
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 :=
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
