[pkg-java] r11304 - trunk/libjogl-java/debian

[Sylvestre Ledru]

Author: sylvestre
Date: 2009-12-21 14:41:21 +0000 (Mon, 21 Dec 2009)
New Revision: 11304

Modified:
   trunk/libjogl-java/debian/changelog
   trunk/libjogl-java/debian/rules
Log:
  * libjogl-java-doc is not built on arch dep compilation. Avoid the hack.
    Thanks to Denis Barbier for the fix


Modified: trunk/libjogl-java/debian/changelog
===================================================================
--- trunk/libjogl-java/debian/changelog	2009-12-21 08:33:24 UTC (rev 11303)
+++ trunk/libjogl-java/debian/changelog	2009-12-21 14:41:21 UTC (rev 11304)
@@ -1,9 +1,12 @@
-libjogl-java (1.1.1+dak1-8) UNRELEASED; urgency=low
+libjogl-java (1.1.1+dak1-8) unstable; urgency=low
 
+  * libjogl-java-doc is not built on arch dep compilation. Avoid the hack.
+    Thanks to Denis Barbier for the fix
+
   [ Onkar Shinde ]
   * Fix watch file to only look for stable releases.
 
- -- Onkar Shinde <onkarshinde at ubuntu.com>  Wed, 02 Sep 2009 14:05:16 +0530
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 21 Dec 2009 15:35:52 +0100
 
 libjogl-java (1.1.1+dak1-7) unstable; urgency=low
 

Modified: trunk/libjogl-java/debian/rules
===================================================================
--- trunk/libjogl-java/debian/rules	2009-12-21 08:33:24 UTC (rev 11303)
+++ trunk/libjogl-java/debian/rules	2009-12-21 14:41:21 UTC (rev 11304)
@@ -8,16 +8,8 @@
 DEB_JARS             := ant-launcher antlrall ant-antlr
 DEB_ANT_CLEAN_TARGET := clean
 DEB_BUILDDIR         := jogl/make
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_ANT_BUILD_TARGET := all
 
-DISABLE_BUILD_HELP_ARCHS := arm mipsel mips armel
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(DISABLE_BUILD_HELP_ARCHS)))
-# Disable the javadoc on this arch. it timeouts for the archs
-DEB_ANT_BUILD_TARGET := all 
-else
-DEB_ANT_BUILD_TARGET := all javadoc
-endif
-
 install/libjogl-java::
 	install -m 644 -D jogl/build/jogl.jar debian/libjogl-java/usr/share/java/jogl-$(DEB_UPSTREAM_VERSION).jar
 	ln -s jogl-$(DEB_UPSTREAM_VERSION).jar debian/libjogl-java/usr/share/java/jogl.jar
@@ -32,7 +24,7 @@
 	install -m 644 -D gluegen/build/obj/libgluegen-rt.so debian/libjogl-jni/usr/lib/jni/libgluegen-rt.so
 
 install/libjogl-java-doc::
-	if test ! -d jogl/javadoc_public; then mkdir jogl/javadoc_public; fi
+	$(DEB_ANT_INVOKE) javadoc
 
 clean::
 	$(RM) -r gluegen/build