Merge lp:~ebourg/openjdk/openjdk7-suggestjamvm into lp:~openjdk/openjdk/openjdk7

[Emmanuel Bourg]

This patch modifies the dependency on icedtea-7-jre-jamvm from Recommends to Suggests. This will prevent JamVM from being installed automatically along openjdk-7-jre.

[Matthias Klose (doko)]

please can you keep the recommends for zero archs, and only make it a suggests for hotspot archs?

review: Needs Fixing

[lp:~ebourg/openjdk/openjdk7-suggestjamvm]

566. By Emmanuel Bourg on 2014-07-28

Keep recommending JamVM on Zero architectures only

[Emmanuel Bourg (ebourg)]

I modified the patch to recommend JamVM on zero archs only

Unmerged revisions

566. By Emmanuel Bourg on 2014-07-28

Keep recommending JamVM on Zero architectures only

565. By Emmanuel Bourg on 2014-07-25

Suggest the dependency on JamVM instead of recommending it

=== modified file 'control'
--- control	2014-07-20 15:42:14 +0000
+++ control	2014-07-28 23:16:33 +0000
@@ -41,7 +41,7 @@
 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, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, fonts-indic,
+Suggests: ${jamvm:Suggests}, ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, fonts-indic,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Replaces: openjdk-7-jre-lib (<< 7u45-2.4.3-1)
 Conflicts: ${multiarch:Conflicts}
 
=== modified file 'control.in'
--- control.in	2014-07-20 15:42:14 +0000
+++ control.in	2014-07-28 23:16:33 +0000
@@ -41,7 +41,7 @@
 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@
+Suggests: ${jamvm:Suggests}, ${cacao:Recommends}, 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, ${defaultvm:Provides}, ${jvm:Provides}
 Replaces: @basename@-jre-lib (<< 7u45-2.4.3-1)
 Conflicts: ${multiarch:Conflicts}
 
=== modified file 'rules'
--- rules	2014-07-26 07:28:30 +0000
+++ rules	2014-07-28 23:16:33 +0000
@@ -957,7 +957,11 @@
 ifneq (,$(filter-out $(hotspot_archs), $(jamvm_archs)))
   ifneq (,$(filter $(DEB_HOST_ARCH),$(jamvm_defaults)))
     control_vars += '-Vjredefault:Depends=$(p_jrej) (= $${binary:Version})'
+  else ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
+    # Suggest JamVM on Hotspot architectures
+    control_vars += '-Vjamvm:Suggests=$(p_jrej) (= $${binary:Version})'
   else
+    # Recommend JamVM on Zero architectures
     control_vars += '-Vjamvm:Recommends=$(p_jrej) (= $${binary:Version})'
   endif
 endif