[pkg-java] r11934 - in trunk/axis/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Thu Mar 25 22:51:21 UTC 2010 

Author: drazzib
Date: 2010-03-25 22:51:21 +0000 (Thu, 25 Mar 2010)
New Revision: 11934

Added:
   trunk/axis/debian/libaxis-java-doc.doc-base
   trunk/axis/debian/patches/javadoc.diff
Removed:
   trunk/axis/debian/libaxis-java-doc.docs
Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/control
   trunk/axis/debian/copyright
   trunk/axis/debian/libaxis-java.links
   trunk/axis/debian/patches/series
   trunk/axis/debian/rules
Log:
* Add symlinks for old JAR names to fix some FTBFS
  (Closes: #575041):
  - saaj.jar -> axis-saaj.jar
  - jaxrpc.jar -> axis-jaxrpc.jar
* Javadoc:
  - Install Javadoc to /usr/share/doc/libaxis-java/api/
  - Register Javadoc with doc-base
  - d/patches/javadoc.diff and d/rules: Fix javadoc call
    to only use javadoc and no gjdoc (which fail with
    UnmappableCharacterException) and force 1.3 source format.
* Fix short description of libaxis-java-doc to contains "documentation"
* Rework d/copyright to use DEP5 format

Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/changelog	2010-03-25 22:51:21 UTC (rev 11934)
@@ -1,3 +1,20 @@
+axis (1.4-10) unstable; urgency=low
+
+  * Add symlinks for old JAR names to fix some FTBFS
+    (Closes: #575041):
+    - saaj.jar -> axis-saaj.jar
+    - jaxrpc.jar -> axis-jaxrpc.jar
+  * Javadoc:
+    - Install Javadoc to /usr/share/doc/libaxis-java/api/
+    - Register Javadoc with doc-base
+    - d/patches/javadoc.diff and d/rules: Fix javadoc call
+      to only use javadoc and no gjdoc (which fail with
+      UnmappableCharacterException) and force 1.3 source format.
+  * Fix short description of libaxis-java-doc to contains "documentation"
+  * Rework d/copyright to use DEP5 format
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 25 Mar 2010 23:45:41 +0100
+
 axis (1.4-9) unstable; urgency=low
 
   * debian/rules: Fix FTBFS when doing arch build:

Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/control	2010-03-25 22:51:21 UTC (rev 11934)
@@ -45,7 +45,7 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libaxis-java
-Description: A SOAP implementation in Java
+Description: A SOAP implementation in Java (documentation)
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
  submission to W3C.
  .

Modified: trunk/axis/debian/copyright
===================================================================
--- trunk/axis/debian/copyright	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/copyright	2010-03-25 22:51:21 UTC (rev 11934)
@@ -1,14 +1,21 @@
-This package was debianized by Vladimír Lapáček <vladimir.lapacek at gmail.com> on
-Wed,  6 Sep 2006 22:31:39 +0200.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Apache Axis
+Maintainer: <http://ws.apache.org/axis/>
+Source: http://www.apache.org/dist/ws/axis/1_4/
 
-It was downloaded from http://ws.apache.org/axis/
 
-Upstream Author: Apache Foundation
-
+Files: *
 Copyright: (c) 2006-2008 Apache Foundation
+Licence: Apache-2.0
 
-License:
+Files: debian/*
+Copyright: 2006, Vladimír Lapáček <vladimir.lapacek at gmail.com>
+Copyright: 2006-2010, various Debian Contributors
+Copyright: 2010 Damien Raude-Morvan <drazzib at debian.org>
+Licence: Apache-2.0
 
+
+Licence: Apache-2.0
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
@@ -21,9 +28,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-The full text of the license can be found in
-`/usr/share/common-licenses/Apache-2.0'.
+ The full text of the license can be found in
+ `/usr/share/common-licenses/Apache-2.0'.
 
-
-The Debian packaging is (C) 2006, Vladimír Lapáček <vladimir.lapacek at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Added: trunk/axis/debian/libaxis-java-doc.doc-base
===================================================================
--- trunk/axis/debian/libaxis-java-doc.doc-base	                        (rev 0)
+++ trunk/axis/debian/libaxis-java-doc.doc-base	2010-03-25 22:51:21 UTC (rev 11934)
@@ -0,0 +1,10 @@
+Document: libaxis-java-doc
+Title: API Javadoc for Axis
+Author: Apache Axis
+Abstract: This is the API Javadoc provided by the Apache Axis library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libaxis-java/api/index.html
+Files: /usr/share/doc/libaxis-java/api/*
+

Deleted: trunk/axis/debian/libaxis-java-doc.docs
===================================================================
--- trunk/axis/debian/libaxis-java-doc.docs	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/libaxis-java-doc.docs	2010-03-25 22:51:21 UTC (rev 11934)
@@ -1 +0,0 @@
-build/javadocs

Modified: trunk/axis/debian/libaxis-java.links
===================================================================
--- trunk/axis/debian/libaxis-java.links	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/libaxis-java.links	2010-03-25 22:51:21 UTC (rev 11934)
@@ -1 +1,3 @@
 /usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar
+/usr/share/java/axis-jaxrpc.jar /usr/share/java/jaxrpc.jar
+/usr/share/java/axis-saaj.jar /usr/share/java/saaj.jar

Added: trunk/axis/debian/patches/javadoc.diff
===================================================================
--- trunk/axis/debian/patches/javadoc.diff	                        (rev 0)
+++ trunk/axis/debian/patches/javadoc.diff	2010-03-25 22:51:21 UTC (rev 11934)
@@ -0,0 +1,14 @@
+Description: Ensure Javadoc call get correct source version (1.3)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-25
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -369,6 +369,7 @@
+              use="true"
+              windowtitle="${Name} API"
+              doctitle="${Name}"
++             source="${source}"
+              bottom="Copyright &#169; ${year} Apache Web Services Project. All Rights Reserved."
+     />
+   </target>

Modified: trunk/axis/debian/patches/series
===================================================================
--- trunk/axis/debian/patches/series	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/patches/series	2010-03-25 22:51:21 UTC (rev 11934)
@@ -1,3 +1,4 @@
 01-libaxis-java-build.patch
 02-gcj-4.4.patch
 axis-bz152255.patch
+javadoc.diff

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2010-03-25 22:45:46 UTC (rev 11933)
+++ trunk/axis/debian/rules	2010-03-25 22:51:21 UTC (rev 11934)
@@ -8,7 +8,7 @@
   with_gcj_native := yes
 endif
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+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
 
@@ -22,6 +22,10 @@
 	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
 
+install/libaxis-java-doc::
+	mv build/javadocs build/api
+	dh_install -plibaxis-java-doc build/api/ /usr/share/doc/libaxis-java/
+
 ifeq ($(with_gcj_native),yes)
 install/libaxis-java-gcj:: install/libaxis-java
 	dh_nativejava -plibaxis-java-gcj
@@ -29,6 +33,7 @@
 
 clean::
 	-rm -rf debian/tmp
+	-rm -rf build/api
 
 get-orig-source::
 	uscan --force-download --rename

More information about the pkg-java-commits mailing list