[pkg-java] r11904 - trunk/axis/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-20 22:56:28 +0000 (Sat, 20 Mar 2010)
New Revision: 11904

Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/rules
Log:
* debian/rules: Fix FTBFS when doing arch build:
  - overrive install/libaxis-java for mh_installjar calls
  (instead of binary-post-install)

Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2010-03-20 22:23:10 UTC (rev 11903)
+++ trunk/axis/debian/changelog	2010-03-20 22:56:28 UTC (rev 11904)
@@ -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:

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2010-03-20 22:23:10 UTC (rev 11903)
+++ trunk/axis/debian/rules	2010-03-20 22:56:28 UTC (rev 11904)
@@ -15,7 +15,7 @@
 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 @@
 
 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