[java-common] 01/01: Build default-java-plugin for the architectures supporting icedtea-web only

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-common.

commit 48ea8ec831eb4dfcec91bb0a21e1d3e69753da5c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 10 15:58:59 2016 +0100

    Build default-java-plugin for the architectures supporting icedtea-web only
---
 debian/changelog        | 7 +++++++
 debian/java_defaults.mk | 6 ++++++
 debian/rules            | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 90ac766..fc31eef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-common (0.56) unstable; urgency=medium
+
+  * Team upload.
+  * Build default-java-plugin for the architectures supporting icedtea-web only
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Feb 2016 15:47:24 +0100
+
 java-common (0.55) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index f84ccbf..3cb94ba 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -16,6 +16,12 @@ java5_architectures = $(java6_architectures) \
 		hurd-i386
 java_architectures = $(java5_architectures)
 
+java_plugin_architectures = \
+		amd64 arm64 armel armhf i386 \
+		powerpc ppc64 ppc64el s390x \
+		kfreebsd-amd64 kfreebsd-i386 \
+		x32
+
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
 ifneq (,$(filter $(_java_host_arch),$(java9_architectures)))
   java_default_version = 9
diff --git a/debian/rules b/debian/rules
index 3f12603..a77b2a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,11 @@ ifeq (5, $(java_default_version))
   jvmdir	= java-gcj
 endif
 
+# Build default-java-plugin for the architectures supporting icedtea-web only
+ifeq (,$(filter $(_java_host_arch),$(java_plugin_architectures)))
+  p_plugin      =
+endif
+
 jre_provides	= java-runtime, java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version))
 jhl_provides	= java-runtime-headless, java2-runtime-headless, $(shell seq --format java%.f-runtime-headless --separator ', ' 5 $(java_default_version))
 jdk_provides	= java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version))

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