[openjdk-8] 01/01: Do not recommend JamVM on architectures supporting Hotspot

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 89c7a72f082a603df0e187d7f4297bda2cdc1822
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 2 22:43:57 2014 +0200

    Do not recommend JamVM on architectures supporting Hotspot
---
 debian/control              | 2 +-
 debian/rules                | 5 -----
 debian/templates/control.in | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 7919dae..f1c7178 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel powerpc p
 Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
 Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
+Recommends: ${dlopenhl:Recommends}
 Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, java8-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Breaks: icedtea-netx (<< 1.4-2)
diff --git a/debian/rules b/debian/rules
index dc60151..d2770ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -677,14 +677,9 @@ ifneq (,$(DEB_HOST_MULTIARCH))
 	'-Vmultiarch:Depends=multiarch-support'
 endif
 
-ifneq (,$(filter-out $(hotspot_archs), $(cacao_archs)))
-  control_vars += '-Vcacao:Recommends=$(p_jrec) (= $${binary:Version})'
-endif
 ifneq (,$(filter-out $(hotspot_archs), $(jamvm_archs)))
   ifneq (,$(filter $(DEB_HOST_ARCH),$(jamvm_defaults)))
     control_vars += '-Vjredefault:Depends=$(p_jrej) (= $${binary:Version})'
-  else
-    control_vars += '-Vjamvm:Recommends=$(p_jrej) (= $${binary:Version})'
   endif
 endif
 
diff --git a/debian/templates/control.in b/debian/templates/control.in
index f3ff012..424a071 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -29,8 +29,8 @@ Architecture: @any_archs@
 Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
 Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
-Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
+Recommends: ${dlopenhl:Recommends}
+Suggests: libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, java8-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Breaks: icedtea-netx (<< 1.4-2)
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)

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