Author: doko
Date: 2013-06-30 16:58:31 +0000 (Sun, 30 Jun 2013)
New Revision: 16947
Modified:
trunk/java-common/debian/changelog
trunk/java-common/debian/rules
Log:
* Don't blindly update to OpenJDK7 on architectures where it is not
supported or not even built.
Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog 2013-06-28 20:33:53 UTC (rev 16946)
+++ trunk/java-common/debian/changelog 2013-06-30 16:58:31 UTC (rev 16947)
@@ -20,8 +20,12 @@
- 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
* Upload to experimental.
Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules 2013-06-28 20:33:53 UTC (rev 16946)
+++ trunk/java-common/debian/rules 2013-06-30 16:58:31 UTC (rev 16947)
@@ -26,7 +26,9 @@
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 @@
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)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
