Bug#719980: libidn: disable java and check when cross build

[Christian Svensson]

Package: libidn
Version: 1.28-1
Followup-For: Bug #719980

Dear Maintainer,

A smaller patch to fix these issues for or1k, if by some reason the above
patches are too intrusive.

*** patches/libidn-1.28.patch
diff -Nru libidn-1.28/debian/control libidn-1.28/debian/control
--- libidn-1.28/debian/control  2013-07-10 13:31:48.000000000 +0000
+++ libidn-1.28/debian/control  2014-01-26 14:18:45.000000000 +0000
@@ -4,7 +4,8 @@
 Maintainer: Debian Libidn Team <address@hidden>
 Uploaders: Anibal Monsalve Salazar <address@hidden>, Simon Josefsson 
<address@hidden>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 8.1.3), gcj-jdk [!arm !hppa !hurd-i386], fastjar 
[!arm !hppa !hurd-i386]
+Build-Depends: debhelper (>= 8.1.3), gcj-jdk [!arm !hppa !hurd-i386 !or1k],
+ fastjar [!arm !hppa !hurd-i386 !or1k]
 Vcs-Cvs: :pserver:address@hidden:/sources/libidn
 Vcs-Browser: http://cvs.savannah.gnu.org/viewvc/debian-libidn/?root=libidn
 Homepage: https://www.gnu.org/software/libidn/
diff -Nru libidn-1.28/debian/rules libidn-1.28/debian/rules
--- libidn-1.28/debian/rules    2013-07-10 13:31:48.000000000 +0000
+++ libidn-1.28/debian/rules    2014-01-26 14:17:48.000000000 +0000
@@ -4,7 +4,7 @@
 export DH_VERBOSE=1
 
 # Don't build libidn11-java on platforms that doesn't have gcj.
-NO_JAVA_ARCHES := arm hppa hurd-i386
+NO_JAVA_ARCHES := arm hppa hurd-i386 or1k
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_JAVA_ARCHES)))
   ENABLE_JAVA := --enable-java
@@ -43,7 +43,10 @@
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE) all check
+       $(MAKE) all
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+       $(MAKE) check
+endif
 
        touch $@
 


-- System Information:
Debian Release: 7.2
Architecture: amd64 (x86_64)
Foreign Architectures: or1k

Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash