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

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jan 12 17:30:42 UTC 2017 

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

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

commit 22be3e0a80db41a280618f8d0cbce02fa2b68802
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Mar 20 22:17:20 2010 +0000

    * 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
---
 debian/changelog                           | 18 +++++++++++
 debian/compat                              |  2 +-
 debian/control                             |  8 +++--
 debian/libaxis-java.install                |  4 ---
 debian/libaxis-java.links                  |  1 +
 debian/libaxis-java.poms                   |  5 +++
 debian/patches/01-libaxis-java-build.patch |  8 +++--
 debian/patches/02-gcj-4.4.patch            | 12 +++++--
 debian/patches/axis-bz152255.patch         | 34 ++++++++++---------
 debian/patches/series                      |  3 ++
 debian/poms/ant.xml                        | 13 ++++++++
 debian/poms/axis.xml                       | 52 ++++++++++++++++++++++++++++++
 debian/poms/jaxrpc.xml                     | 13 ++++++++
 debian/poms/saaj.xml                       | 13 ++++++++
 debian/rules                               | 18 ++++++++---
 debian/source/format                       |  1 +
 16 files changed, 172 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2432e02..e004ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <drazzib at debian.org>  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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index a71fa69..1dbc6a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ 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>
-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 <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,
+ 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/
diff --git a/debian/libaxis-java.install b/debian/libaxis-java.install
deleted file mode 100644
index 9025f7e..0000000
--- a/debian/libaxis-java.install
+++ /dev/null
@@ -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
diff --git a/debian/libaxis-java.links b/debian/libaxis-java.links
new file mode 100644
index 0000000..4be1a3a
--- /dev/null
+++ b/debian/libaxis-java.links
@@ -0,0 +1 @@
+/usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar
diff --git a/debian/libaxis-java.poms b/debian/libaxis-java.poms
new file mode 100644
index 0000000..2a76482
--- /dev/null
+++ b/debian/libaxis-java.poms
@@ -0,0 +1,5 @@
+debian/poms/ant.xml
+debian/poms/axis.xml
+debian/poms/jaxrpc.xml
+debian/poms/saaj.xml
+
diff --git a/debian/patches/01-libaxis-java-build.patch b/debian/patches/01-libaxis-java-build.patch
index 28d85cc..2473b0c 100644
--- a/debian/patches/01-libaxis-java-build.patch
+++ b/debian/patches/01-libaxis-java-build.patch
@@ -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: <vladimir.lapacek at gmail.com>
+Forwarded: not-needed
+Last-Update: 2010-03-20
+--- a/build.xml
++++ b/build.xml
 @@ -223,12 +223,12 @@
          </section>
        </manifest>
diff --git a/debian/patches/02-gcj-4.4.patch b/debian/patches/02-gcj-4.4.patch
index f57c325..760aea8 100644
--- a/debian/patches/02-gcj-4.4.patch
+++ b/debian/patches/02-gcj-4.4.patch
@@ -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 <twerner at debian.org>
+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
diff --git a/debian/patches/axis-bz152255.patch b/debian/patches/axis-bz152255.patch
index 2bc21f3..a44e598 100644
--- a/debian/patches/axis-bz152255.patch
+++ b/debian/patches/axis-bz152255.patch
@@ -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 );
      }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bb7cf8d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-libaxis-java-build.patch
+02-gcj-4.4.patch
+axis-bz152255.patch
diff --git a/debian/poms/ant.xml b/debian/poms/ant.xml
new file mode 100644
index 0000000..2c12f06
--- /dev/null
+++ b/debian/poms/ant.xml
@@ -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
diff --git a/debian/poms/axis.xml b/debian/poms/axis.xml
new file mode 100644
index 0000000..701acfc
--- /dev/null
+++ b/debian/poms/axis.xml
@@ -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>
diff --git a/debian/poms/jaxrpc.xml b/debian/poms/jaxrpc.xml
new file mode 100644
index 0000000..a1a8f5d
--- /dev/null
+++ b/debian/poms/jaxrpc.xml
@@ -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
diff --git a/debian/poms/saaj.xml b/debian/poms/saaj.xml
new file mode 100644
index 0000000..976254c
--- /dev/null
+++ b/debian/poms/saaj.xml
@@ -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
diff --git a/debian/rules b/debian/rules
index 75cbc81..87925ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

More information about the pkg-java-commits mailing list