[libjogl2-java] 40/58: Imported Debian patch 2.0-rc11-1~exp5

[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 dd82c05654ed157ef20ca7572f1f67a3df0e74b6
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun Mar 3 13:54:53 2013 +0100

    Imported Debian patch 2.0-rc11-1~exp5
---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c1e899..dc5540d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc11-1~exp5) experimental; urgency=low
+
+  [ Colin Watson ]
+  * Define isAbiEabiGnuArmhf=true when building for armhf.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 03 Mar 2013 13:54:53 +0100
+
 libjogl2-java (2.0-rc11-1~exp4.3) experimental; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index a71b1c8..21501e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ DEB_ANT_BUILDFILE    := make/build.xml
 ENABLE_BUILD_HELP_ARCHS := amd64 i386
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_ANT_ARGS         += -DisAbiEabiGnuArmhf=true
+endif
+
 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)))

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