OpenJDK

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

  1. openjdk7-suggestjamvm
  2. Merge into openjdk7
Proposed by Emmanuel Bourg
Status: Needs review
Proposed branch: lp:~ebourg/openjdk/openjdk7-suggestjamvm
Merge into: lp:~openjdk/openjdk/openjdk7
Diff against target: 41 lines (+6/-2)
3 files modified
control (+1/-1)
control.in (+1/-1)
rules (+4/-0)
To merge this branch: bzr merge lp:~ebourg/openjdk/openjdk7-suggestjamvm
Reviewer Review Type Date Requested Status
Matthias Klose Needs Fixing
Review via email: mp+228246@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Matthias Klose (doko) wrote :

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

review: Needs Fixing
Reply
lp:~ebourg/openjdk/openjdk7-suggestjamvm updated
566. By Emmanuel Bourg

Keep recommending JamVM on Zero architectures only

Revision history for this message
Emmanuel Bourg (ebourg) wrote :

I modified the patch to recommend JamVM on zero archs only

Reply

Unmerged revisions

566. By Emmanuel Bourg

Keep recommending JamVM on Zero architectures only

565. By Emmanuel Bourg

Suggest the dependency on JamVM instead of recommending it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2014-07-20 15:42:14 +0000
3+++ control 2014-07-28 23:16:33 +0000
4@@ -41,7 +41,7 @@
5 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
6 Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
7 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
8-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,
9+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,
10 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
11 Replaces: openjdk-7-jre-lib (<< 7u45-2.4.3-1)
12 Conflicts: ${multiarch:Conflicts}
13
14=== modified file 'control.in'
15--- control.in 2014-07-20 15:42:14 +0000
16+++ control.in 2014-07-28 23:16:33 +0000
17@@ -41,7 +41,7 @@
18 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
19 Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
20 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
21-Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
22+Suggests: ${jamvm:Suggests}, ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
23 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
24 Replaces: @basename@-jre-lib (<< 7u45-2.4.3-1)
25 Conflicts: ${multiarch:Conflicts}
26
27=== modified file 'rules'
28--- rules 2014-07-26 07:28:30 +0000
29+++ rules 2014-07-28 23:16:33 +0000
30@@ -957,7 +957,11 @@
31 ifneq (,$(filter-out $(hotspot_archs), $(jamvm_archs)))
32 ifneq (,$(filter $(DEB_HOST_ARCH),$(jamvm_defaults)))
33 control_vars += '-Vjredefault:Depends=$(p_jrej) (= $${binary:Version})'
34+ else ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
35+ # Suggest JamVM on Hotspot architectures
36+ control_vars += '-Vjamvm:Suggests=$(p_jrej) (= $${binary:Version})'
37 else
38+ # Recommend JamVM on Zero architectures
39 control_vars += '-Vjamvm:Recommends=$(p_jrej) (= $${binary:Version})'
40 endif
41 endif

Subscribers

People subscribed via source and target branches