This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-policy.
commit ec5d3125a84b995c01b2be81d15ae6f94e5c466b Author: Matthias Klose <[email protected]> Date: Sun Jun 30 16:58:31 2013 +0000 * Don't blindly update to OpenJDK7 on architectures where it is not supported or not even built. --- debian/changelog | 6 +++++- debian/rules | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ef9bce..6e34132 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,11 @@ java-common (0.49) UNRELEASED; urgency=low - Minor improvements - State the license of the policy (Closes: #687841) - -- Sylvestre Ledru <[email protected]> Wed, 05 Jun 2013 14:11:41 +0200 + [ Matthias Klose ] + * Don't blindly update to OpenJDK7 on architectures where it is not + supported or not even built. + + -- Matthias Klose <[email protected]> Sun, 30 Jun 2013 18:54:53 +0200 java-common (0.48) experimental; urgency=low diff --git a/debian/rules b/debian/rules index 81efa64..bf25a31 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,9 @@ provides = java java2 java5 dversion = 1:1.5-$(jrel) jvmdir = java-gcj -ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel armhf i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc sh4)) +p_doc = openjdk-7-doc + +ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel armhf i386 ia64 lpia powerpc ppc64 s390x sparc sh4)) p_jre = openjdk-7-jre p_jhl = openjdk-7-jre-headless p_jdk = openjdk-7-jdk @@ -36,10 +38,19 @@ ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel armhf i386 ia64 lpia mips m provides = java java2 java5 java6 java7 dversion = 1:1.7-$(jrel) jvmdir = java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) +else ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel powerpcspe s390)) + p_jre = openjdk-6-jre + p_jhl = openjdk-6-jre-headless + p_jdk = openjdk-6-jdk + jdk_build_dep = gcj-jdk + v_jre = $(S)(>= 6b23~pre8-2~) + v_jdk = $(v_jre) + provides = java java2 java5 java6 + dversion = 1:1.6-$(jrel) + jvmdir = java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) + p_doc = openjdk-6-doc endif -p_doc = openjdk-7-doc - jre_provides = $(call mk_cslist,$(provides),runtime) jhl_provides = $(call mk_cslist,$(provides),runtime-headless) jdk_provides = $(call mk_cslist,$(provides),sdk) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
