[antelope] 02/02: Imported Debian patch 3.5.1-2

[Emmanuel Bourg]

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

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

commit 2ac1a6f42ce22e5b9101a2b605703d2eafa84570
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon Aug 16 18:49:39 2010 +0200

    Imported Debian patch 3.5.1-2
---
 debian/changelog                          | 10 ++++++++++
 debian/control                            |  2 +-
 debian/patches/01_also_build_javadoc.diff | 20 ++++++++++++++++++++
 debian/patches/02_xsltproc_opts.diff      | 19 +++++++++++++++++++
 debian/patches/series                     |  2 ++
 debian/rules                              |  8 ++------
 6 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71d19f0..74af72f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index d54a986..a98d075 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 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/
 
diff --git a/debian/patches/01_also_build_javadoc.diff b/debian/patches/01_also_build_javadoc.diff
new file mode 100644
index 0000000..d022769
--- /dev/null
+++ b/debian/patches/01_also_build_javadoc.diff
@@ -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>
+ 
+    <!-- ========================================================================
diff --git a/debian/patches/02_xsltproc_opts.diff b/debian/patches/02_xsltproc_opts.diff
new file mode 100644
index 0000000..da619f5
--- /dev/null
+++ b/debian/patches/02_xsltproc_opts.diff
@@ -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" />
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2044124
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_also_build_javadoc.diff
+02_xsltproc_opts.diff
diff --git a/debian/rules b/debian/rules
index 2ddad2e..8bfa9f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@ PACKAGE              := antelope
 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 @@ binary-post-install/lib$(PACKAGE)-java::
 	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

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