Author: drazzib Date: 2010-03-20 22:17:20 +0000 (Sat, 20 Mar 2010) New Revision: 11902
Added: trunk/axis/debian/libaxis-java.links trunk/axis/debian/libaxis-java.poms trunk/axis/debian/patches/series trunk/axis/debian/poms/ trunk/axis/debian/poms/ant.xml trunk/axis/debian/poms/axis.xml trunk/axis/debian/poms/jaxrpc.xml trunk/axis/debian/poms/saaj.xml trunk/axis/debian/source/ trunk/axis/debian/source/format Removed: trunk/axis/debian/libaxis-java.install Modified: trunk/axis/debian/changelog trunk/axis/debian/compat trunk/axis/debian/control trunk/axis/debian/patches/01-libaxis-java-build.patch trunk/axis/debian/patches/02-gcj-4.4.patch trunk/axis/debian/patches/axis-bz152255.patch trunk/axis/debian/rules Log: * Add Maven support: - debian/control: Build-Depends on maven-repo-helper - Add pom's files to debian/poms/ - debian/rules: Use mh_installpoms and mh_installjar * Update Standards-Version: 3.8.4 - debian/rules: Add recommended get-orig-source target * Bump to debhelper >= 7 * Use 3.0 (quilt) source format: - debian/source/format: Set 3.0 (quilt) - debian/control: Remove quilt - debian/rules: Remove simpl-patchsys.mk - Refresh all debian/patches/* * Add DEP-3 headers to all patches Modified: trunk/axis/debian/changelog =================================================================== --- trunk/axis/debian/changelog 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/changelog 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,3 +1,21 @@ +axis (1.4-8) unstable; urgency=low + + * Add Maven support: + - debian/control: Build-Depends on maven-repo-helper + - Add pom's files to debian/poms/ + - debian/rules: Use mh_installpoms and mh_installjar + * Update Standards-Version: 3.8.4 + - debian/rules: Add recommended get-orig-source target + * Bump to debhelper >= 7 + * Use 3.0 (quilt) source format: + - debian/source/format: Set 3.0 (quilt) + - debian/control: Remove quilt + - debian/rules: Remove simpl-patchsys.mk + - Refresh all debian/patches/* + * Add DEP-3 headers to all patches + + -- Damien Raude-Morvan <[email protected]> Sat, 20 Mar 2010 23:00:50 +0100 + axis (1.4-7) unstable; urgency=low * Change Build-Depends: ant1.7-optional because gij is failing with ant 1.8. Modified: trunk/axis/debian/compat =================================================================== --- trunk/axis/debian/compat 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/compat 2010-03-20 22:17:20 UTC (rev 11902) @@ -1 +1 @@ -5 +7 Modified: trunk/axis/debian/control =================================================================== --- trunk/axis/debian/control 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/control 2010-03-20 22:17:20 UTC (rev 11902) @@ -2,9 +2,11 @@ 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]> -Build-Depends: debhelper (>= 5), cdbs, ant1.7-optional, default-jdk-builddep, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java -Standards-Version: 3.8.2 +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, + maven-repo-helper +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/axis Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/axis Homepage: http://ws.apache.org/axis/ Deleted: trunk/axis/debian/libaxis-java.install =================================================================== --- trunk/axis/debian/libaxis-java.install 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/libaxis-java.install 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,4 +0,0 @@ -build/lib/axis.jar usr/share/java -build/lib/jaxrpc.jar usr/share/java -build/lib/saaj.jar usr/share/java -build/lib/axis-ant.jar usr/share/ant/lib Added: trunk/axis/debian/libaxis-java.links =================================================================== --- trunk/axis/debian/libaxis-java.links (rev 0) +++ trunk/axis/debian/libaxis-java.links 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1 @@ +/usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar Added: trunk/axis/debian/libaxis-java.poms =================================================================== --- trunk/axis/debian/libaxis-java.poms (rev 0) +++ trunk/axis/debian/libaxis-java.poms 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,5 @@ +debian/poms/ant.xml +debian/poms/axis.xml +debian/poms/jaxrpc.xml +debian/poms/saaj.xml + Modified: trunk/axis/debian/patches/01-libaxis-java-build.patch =================================================================== --- trunk/axis/debian/patches/01-libaxis-java-build.patch 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/patches/01-libaxis-java-build.patch 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,5 +1,9 @@ ---- build.xml.orig 2006-09-07 20:35:59.000000000 +0000 -+++ build.xml 2006-09-07 20:36:24.000000000 +0000 +Description: build.xml: Don't copy jars during build +Author: <[email protected]> +Forwarded: not-needed +Last-Update: 2010-03-20 +--- a/build.xml ++++ b/build.xml @@ -223,12 +223,12 @@ </section> </manifest> Modified: trunk/axis/debian/patches/02-gcj-4.4.patch =================================================================== --- trunk/axis/debian/patches/02-gcj-4.4.patch 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/patches/02-gcj-4.4.patch 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,6 +1,12 @@ -diff -Nur -x '*.orig' -x '*~' axis-1.4/src/org/apache/axis/i18n/ProjectResourceBundle.java axis-1.4.new/src/org/apache/axis/i18n/ProjectResourceBundle.java ---- axis-1.4/src/org/apache/axis/i18n/ProjectResourceBundle.java 2006-04-23 03:57:27.000000000 +0200 -+++ axis-1.4.new/src/org/apache/axis/i18n/ProjectResourceBundle.java 2009-07-24 18:24:32.000000000 +0200 +Description: Fix FTBFS with GCJ-4.4: + "Cannot override the final method from ResourceBundle" + Disable function clearCache() which is not used anyway. +Bug-Debian: http://bugs.debian.org/531995 +Author: Torsten Werner <[email protected]> +Forwarded: no +Last-Update: 2010-03-20 +--- a/src/org/apache/axis/i18n/ProjectResourceBundle.java ++++ b/src/org/apache/axis/i18n/ProjectResourceBundle.java @@ -360,10 +360,12 @@ /** * Clears the internal cache Modified: trunk/axis/debian/patches/axis-bz152255.patch =================================================================== --- trunk/axis/debian/patches/axis-bz152255.patch 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/patches/axis-bz152255.patch 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,6 +1,10 @@ ---- axis-1_2/src/org/apache/axis/SOAPPart.java~ 2005-05-03 20:29:14.000000000 +0100 -+++ axis-1_2/src/org/apache/axis/SOAPPart.java 2005-06-07 11:28:33.000000000 +0100 -@@ -33,6 +33,7 @@ +Description: Fix build with Java 1.5 +Author: some Fedora packagers +Forwarded: no +Last-Update: 2010-03-20 +--- a/src/org/apache/axis/SOAPPart.java ++++ b/src/org/apache/axis/SOAPPart.java +@@ -34,6 +34,7 @@ import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; @@ -8,7 +12,7 @@ import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; -@@ -45,6 +46,7 @@ +@@ -46,6 +47,7 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; @@ -16,7 +20,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -@@ -1273,5 +1275,102 @@ +@@ -1280,5 +1282,102 @@ public boolean isBodyStream() { return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM); } @@ -119,8 +123,8 @@ + } } ---- axis-1_2/src/org/apache/axis/message/NodeImpl.java~ 2005-05-03 20:28:58.000000000 +0100 -+++ axis-1_2/src/org/apache/axis/message/NodeImpl.java 2005-06-07 12:22:15.000000000 +0100 +--- a/src/org/apache/axis/message/NodeImpl.java ++++ b/src/org/apache/axis/message/NodeImpl.java @@ -30,6 +30,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -130,9 +134,9 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; -@@ -834,4 +836,74 @@ - ((NodeImpl) parent).setDirty(true); - } +@@ -857,4 +859,74 @@ + } + this._isDirty = false; } + + /** @@ -205,8 +209,8 @@ + throw new RuntimeException("not implemented"); + } } ---- axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java~ 2005-05-03 20:29:08.000000000 +0100 -+++ axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java 2005-06-07 12:31:30.000000000 +0100 +--- a/src/org/apache/axis/message/SOAPDocumentImpl.java ++++ b/src/org/apache/axis/message/SOAPDocumentImpl.java @@ -25,6 +25,7 @@ import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; @@ -223,7 +227,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.soap.SOAPException; -@@ -680,4 +682,113 @@ +@@ -681,4 +683,113 @@ public boolean hasAttributes() { throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); } @@ -337,8 +341,8 @@ + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); + } } ---- axis-1_2/src/org/apache/axis/message/Text.java~ 2005-05-03 20:29:21.000000000 +0100 -+++ axis-1_2/src/org/apache/axis/message/Text.java 2005-06-07 12:34:19.000000000 +0100 +--- a/src/org/apache/axis/message/Text.java ++++ b/src/org/apache/axis/message/Text.java @@ -213,4 +213,19 @@ return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 ); } Added: trunk/axis/debian/patches/series =================================================================== --- trunk/axis/debian/patches/series (rev 0) +++ trunk/axis/debian/patches/series 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,3 @@ +01-libaxis-java-build.patch +02-gcj-4.4.patch +axis-bz152255.patch Added: trunk/axis/debian/poms/ant.xml =================================================================== --- trunk/axis/debian/poms/ant.xml (rev 0) +++ trunk/axis/debian/poms/ant.xml 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,13 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>axis</groupId> + <artifactId>axis-ant</artifactId> + <version>1.4</version> + + <distributionManagement> + <relocation> + <groupId>org.apache.axis</groupId> + </relocation> + </distributionManagement> + +</project> \ No newline at end of file Added: trunk/axis/debian/poms/axis.xml =================================================================== --- trunk/axis/debian/poms/axis.xml (rev 0) +++ trunk/axis/debian/poms/axis.xml 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.4</version> + <packaging>jar</packaging> + <name>Axis Web Services</name> + <description> + An implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. + </description> + <url>http://ws.apache.org/axis</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <url>http://svn.apache.org/viewcvs/webservices/axis/trunk/java/</url> + </scm> + <dependencies> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.4</version> + </dependency> + </dependencies> +</project> Added: trunk/axis/debian/poms/jaxrpc.xml =================================================================== --- trunk/axis/debian/poms/jaxrpc.xml (rev 0) +++ trunk/axis/debian/poms/jaxrpc.xml 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,13 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.4</version> + + <distributionManagement> + <relocation> + <groupId>org.apache.axis</groupId> + </relocation> + </distributionManagement> + +</project> \ No newline at end of file Added: trunk/axis/debian/poms/saaj.xml =================================================================== --- trunk/axis/debian/poms/saaj.xml (rev 0) +++ trunk/axis/debian/poms/saaj.xml 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1,13 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.4</version> + + <distributionManagement> + <relocation> + <groupId>org.apache.axis</groupId> + </relocation> + </distributionManagement> + +</project> \ No newline at end of file Modified: trunk/axis/debian/rules =================================================================== --- trunk/axis/debian/rules 2010-03-20 16:18:54 UTC (rev 11901) +++ trunk/axis/debian/rules 2010-03-20 22:17:20 UTC (rev 11902) @@ -1,27 +1,35 @@ #!/usr/bin/make -f -export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) with_gcj_native := yes endif -JAVA_HOME := /usr/lib/jvm/default-java JAVA_HOME := /usr/lib/jvm/java-gcj 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_ANT_BUILD_TARGET := compile javadocs DEB_ANT_INSTALL_TARGET := +binary-post-install/libaxis-java:: + mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION) + mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar + mh_installjar -plibaxis-java -l debian/poms/saaj.xml build/lib/saaj.jar + mh_installjar -plibaxis-java -l debian/poms/jaxrpc.xml build/lib/jaxrpc.jar + mh_installjar -plibaxis-java -l debian/poms/ant.xml build/lib/axis-ant.jar + ifeq ($(with_gcj_native),yes) install/libaxis-java-gcj:: install/libaxis-java [ -d debian/libaxis-ava/usr/share/java ] || dh_install -plibaxis-java dh_nativejava -plibaxis-java-gcj endif + +clean:: + -rm -rf debian/tmp + +get-orig-source:: + uscan --force-download --rename Added: trunk/axis/debian/source/format =================================================================== --- trunk/axis/debian/source/format (rev 0) +++ trunk/axis/debian/source/format 2010-03-20 22:17:20 UTC (rev 11902) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
