[axis] 15/60: * debian/rules: Fix FTBFS when doing arch build: - overrive install/libaxis-java for mh_installjar calls (instead of binary-post-install)

[Emmanuel Bourg]

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

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

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

    * debian/rules: Fix FTBFS when doing arch build:
      - overrive install/libaxis-java for mh_installjar calls
      (instead of binary-post-install)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e004ef3..3c85ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+axis (1.4-9) unstable; urgency=low
+
+  * debian/rules: Fix FTBFS when doing arch build:
+    - overrive install/libaxis-java for mh_installjar calls
+    (instead of binary-post-install)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 20 Mar 2010 23:46:28 +0100
+
 axis (1.4-8) unstable; urgency=low
 
   * Add Maven support:
diff --git a/debian/rules b/debian/rules
index 87925ba..7629333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discov
 DEB_ANT_BUILD_TARGET := compile javadocs
 DEB_ANT_INSTALL_TARGET := 
 
-binary-post-install/libaxis-java::
+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
@@ -24,7 +24,6 @@ binary-post-install/libaxis-java::
 
 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
 

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