[libjogl2-java] 19/58: Imported Debian patch 2.0-rc5-1~exp3

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit 7f753ab8b1e3535a1e08138ec86e2d973ce5e46b
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Dec 28 13:59:28 2011 +0100

    Imported Debian patch 2.0-rc5-1~exp3
---
 debian/changelog | 7 +++++++
 debian/rules     | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4a94a35..83fc2b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc5-1~exp3) experimental; urgency=low
+
+  * Some sbuild still want to build the doc package. Enable it only for amd64
+    and x86. See build log of ia64 & powerpc of version 2.0-rc5-1~exp2
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 28 Dec 2011 13:59:28 +0100
+
 libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low
 
   * Only build the doc once
diff --git a/debian/rules b/debian/rules
index 2e0509a..b48336e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,14 @@ DEB_ANT_ARGS         := -Dsetup.noCDC=true
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all
 DEB_ANT_BUILDFILE    := make/build.xml
+ENABLE_BUILD_HELP_ARCHS := amd64 i386
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 build-indep:
+# Disable the build of the help on slow archs. It takes forever (a few hours) 
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
 	$(DEB_ANT_INVOKE) javadoc.all
+endif
 
 common-install-prehook-indep::
 	mv build/jar/jogl.all.jar build/jar/jogl2.jar

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