[pkg-java] r12916 - in trunk/antelope/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-08-16 16:57:57 +0000 (Mon, 16 Aug 2010)
New Revision: 12916

Added:
   trunk/antelope/debian/patches/
   trunk/antelope/debian/patches/01_also_build_javadoc.diff
   trunk/antelope/debian/patches/02_xsltproc_opts.diff
   trunk/antelope/debian/patches/series
Modified:
   trunk/antelope/debian/changelog
   trunk/antelope/debian/control
   trunk/antelope/debian/rules
Log:
* Fix FTBFS during docs XSL transformation:
  - d/rules: Use build.xml instead of build-tasks.xml (to use xsltproc).
  - d/control: Drop B-D on ant-optional and xalan2-java, add B-D on xsltproc.
  - d/patches/01_also_build_javadoc.diff: Build JAR and Javadoc.
  - d/patches/02_xsltproc_opts.diff: Pass --nonet to xsltproc.

Modified: trunk/antelope/debian/changelog
===================================================================
--- trunk/antelope/debian/changelog	2010-08-16 10:06:51 UTC (rev 12915)
+++ trunk/antelope/debian/changelog	2010-08-16 16:57:57 UTC (rev 12916)
@@ -1,3 +1,13 @@
+antelope (3.5.1-2) unstable; urgency=low
+
+  * Fix FTBFS during docs XSL transformation:
+    - d/rules: Use build.xml instead of build-tasks.xml (to use xsltproc).
+    - d/control: Drop B-D on ant-optional and xalan2-java, add B-D on xsltproc.
+    - d/patches/01_also_build_javadoc.diff: Build JAR and Javadoc.
+    - d/patches/02_xsltproc_opts.diff: Pass --nonet to xsltproc.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 16 Aug 2010 18:49:39 +0200
+
 antelope (3.5.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #589758)

Modified: trunk/antelope/debian/control
===================================================================
--- trunk/antelope/debian/control	2010-08-16 10:06:51 UTC (rev 12915)
+++ trunk/antelope/debian/control	2010-08-16 16:57:57 UTC (rev 12916)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-repo-helper,
- ant, ant-optional, docbook-xsl, libxalan2-java
+ ant, docbook-xsl, xsltproc
 Standards-Version: 3.9.1
 Homepage: http://antelope.tigris.org/
 

Added: trunk/antelope/debian/patches/01_also_build_javadoc.diff
===================================================================
--- trunk/antelope/debian/patches/01_also_build_javadoc.diff	                        (rev 0)
+++ trunk/antelope/debian/patches/01_also_build_javadoc.diff	2010-08-16 16:57:57 UTC (rev 12916)
@@ -0,0 +1,20 @@
+Description: Build JAR and Javadoc by tweaking
+ sub-ant call to build-tasks.xml
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-08-16
+Forwarded: no
+
+--- a/build.xml
++++ b/build.xml
+@@ -109,7 +109,10 @@
+    ========================================================================= -->
+     <target name="tasks"
+             description="Build distribution file for Antelope tasks.">
+-        <ant antfile="build-tasks.xml"/>
++        <ant antfile="build-tasks.xml">
++	<target name="jar"/>
++	<target name="javadoc"/>
++	</ant>
+     </target>
+ 
+    <!-- ========================================================================

Added: trunk/antelope/debian/patches/02_xsltproc_opts.diff
===================================================================
--- trunk/antelope/debian/patches/02_xsltproc_opts.diff	                        (rev 0)
+++ trunk/antelope/debian/patches/02_xsltproc_opts.diff	2010-08-16 16:57:57 UTC (rev 12916)
@@ -0,0 +1,19 @@
+Description: Pass --nonet option to xsltproc and use XML catalogs
+ from /etc/xml/catalog.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-08-16
+Forwarded: no
+
+--- a/build.xml
++++ b/build.xml
+@@ -142,8 +142,9 @@
+         <property name="user-doc.out" location="${doc.dir}/manual"/>
+         <property name="user-doc.xml" value="${src.dir}/docs/manual/userguide.xml"/>
+         <property name="user-doc.xsl" value="${src.dir}/docs/users-guide.xsl"/>
+-        <property name="docbook.catalog" value="/usr/share/sgml/docbook/dtd/catalog"/>
++        <property name="docbook.catalog" value="/etc/xml/catalog"/>
+         <exec executable="${xsltproc.executable}" dir="${user-doc.out}" failonerror="true">
++            <arg value="--nonet" />
+             <arg value="--output" />
+             <arg value="${user-doc.out}/manual" />
+             <arg value="--catalogs" />

Added: trunk/antelope/debian/patches/series
===================================================================
--- trunk/antelope/debian/patches/series	                        (rev 0)
+++ trunk/antelope/debian/patches/series	2010-08-16 16:57:57 UTC (rev 12916)
@@ -0,0 +1,2 @@
+01_also_build_javadoc.diff
+02_xsltproc_opts.diff

Modified: trunk/antelope/debian/rules
===================================================================
--- trunk/antelope/debian/rules	2010-08-16 10:06:51 UTC (rev 12915)
+++ trunk/antelope/debian/rules	2010-08-16 16:57:57 UTC (rev 12916)
@@ -7,9 +7,8 @@
 VERSION              := 3.2.5
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE    := build-tasks.xml
-DEB_ANT_BUILD_TARGET := jar javadoc docs-xalan
-DEB_JARS             := ant-trax xalan2
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_BUILD_TARGET := tasks transform-docs
 
 clean::
 	mh_clean
@@ -19,8 +18,5 @@
 	mh_installpoms -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION)
 	mh_installjar -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION) -l debian/antelopetasks-pom.xml prep/AntelopeTasks_$(VERSION).jar
 
-binary-post-install/lib$(PACKAGE)-java-doc::
-	rm debian/lib$(PACKAGE)-java-doc/usr/share/doc/libantelope-java/manual/userguide.html
-
 get-orig-source::
 	uscan --force-download --repack --rename