Jonathan Nieder wrote: > The patch below tightens dependencies a little to prevent some version > mismatches, such as the one that prompted the bug report: > > | > /tmp/buildd/openjdk-6-6b18-1.8.7/build/../plugin/icedteanp/IcedTeaNPPlugin.cc:1506: > thread 0x7fde0fd631c0: Error: Failed to spawn applet viewer: Failed to > execute child process > "/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/../../bin/java" (No such file or > directory) > > Thoughts of all kinds welcome. See the bug log for more context.
Ping. If it's just a matter of time being short, that's fine with me, but if there are changes the patch needs I'd prefer to hear them nowish while I still remember a little about it. Jonathan (patch left unsnipped for reference) >> --- >> debian/changelog | 9 +++++++++ >> debian/control | 15 ++++++++++----- >> 2 files changed, 19 insertions(+), 5 deletions(-) >> >> [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=136;bug=556015 >> >> diff --git a/debian/changelog b/debian/changelog >> index 7f24dc2b..fb80e1c8 100644 >> --- a/debian/changelog >> +++ b/debian/changelog >> @@ -1,3 +1,12 @@ >> +openjdk-6 (6b23~pre9-2.1) local; urgency=low >> + >> + * Tighten dependencies of packages with docdir symlinks so the >> + changelogs document the same source version. Closes: #641240. >> + * openjdk-6-jre-headless: Break openjdk-6-jre (<< 6b23~pre8-2). >> + Closes: #642972. >> + >> + -- Jonathan Nieder <[email protected]> Mon, 26 Sep 2011 01:06:31 -0500 >> + >> openjdk-6 (6b23~pre9-2) unstable; urgency=low >> >> [ Matthias Klose ] >> diff --git a/debian/control b/debian/control >> index 14010550..c21ac370 100644 >> --- a/debian/control >> +++ b/debian/control >> @@ -13,7 +13,7 @@ Package: openjdk-6-jdk >> Architecture: any >> Multi-Arch: same >> Pre-Depends: ${dpkg:Depends} >> -Depends: openjdk-6-jre (>= ${binary:Version}), ${shlibs:Depends}, >> ${misc:Depends} >> +Depends: openjdk-6-jre (= ${binary:Version}), ${shlibs:Depends}, >> ${misc:Depends} >> Recommends: libxt-dev >> Suggests: openjdk-6-demo, openjdk-6-source, visualvm >> Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java-compiler >> @@ -35,6 +35,7 @@ Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-extra, >> ttf-baekmuk | ttf-unfo >> Provides: java-runtime-headless, java2-runtime-headless, >> java5-runtime-headless, java6-runtime-headless, ${defaultvm:Provides}, >> ${jvm:Provides} >> Replaces: openjdk-6-jre-lib (<< 6b23~pre1), openjdk-6-jre (<< 6b23~pre1), >> openjdk-6-jdk (<< 6b20-1.9.1-0ubuntu2) >> Conflicts: ${multiarch:Conflicts}, openjdk-6-jre-lib (<< 6b17~pre3-1), >> openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jdk (<< 6b17~pre3-1), >> openjdk-6-demo (<< 6b17~pre3-1), openjdk-6-source (<< 6b17~pre3-1), >> openjdk-6-doc (<< 6b17~pre3-1), openjdk-6-dbg (<< 6b17~pre3-1), >> openjdk-6-jre-zero (<< 6b17~pre3-1) >> +Breaks: openjdk-6-jre (<< 6b23~pre8-2) >> Description: OpenJDK Java runtime, using ${vm:Name} (headless) >> Minimal Java runtime - needed for executing non GUI Java programs. >> Using ${vm:Name}. >> @@ -46,7 +47,7 @@ Package: openjdk-6-jre >> Architecture: any >> Multi-Arch: same >> Pre-Depends: ${dpkg:Depends} >> -Depends: openjdk-6-jre-headless (>= ${binary:Version}), >> ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, >> ${misc:Depends}, ${dep:bridge} >> +Depends: openjdk-6-jre-headless (= ${binary:Version}), >> ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, >> ${misc:Depends}, ${dep:bridge} >> Recommends: ${dlopenjre:Recommends}, ttf-dejavu-extra, icedtea-netx >> Suggests: icedtea-plugin, ${pkg:pulseaudio} >> Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), openjdk-6-jre-lib (<< >> 6b17~pre3-1), openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jdk (<< >> 6b17~pre3-1), openjdk-6-demo (<< 6b17~pre3-1), openjdk-6-source (<< >> 6b17~pre3-1), openjdk-6-doc (<< 6b17~pre3-1), openjdk-6-dbg (<< >> 6b17~pre3-1), openjdk-6-jre-zero (<< 6b17~pre3-1) >> @@ -62,7 +63,9 @@ Description: OpenJDK Java runtime, using ${vm:Name} >> Package: openjdk-6-jre-lib >> Architecture: all >> Pre-Depends: ${dpkg:Depends} >> -Depends: openjdk-6-jre-headless (>= ${base:Version}), ${misc:Depends} >> +Depends: openjdk-6-jre-headless (>= ${source:Version}), >> + openjdk-6-jre-headless (<< ${source:Version}+b99), >> + ${misc:Depends} >> Recommends: ${dlopen:Recommends} >> Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre (<< >> 6b17~pre3-1) >> Breaks: openjdk-6-jre-headless (<< 6b23~pre9-1~) >> @@ -77,7 +80,7 @@ Architecture: any >> Multi-Arch: same >> Priority: extra >> Pre-Depends: ${dpkg:Depends} >> -Depends: openjdk-6-jre (>= ${binary:Version}), ${shlibs:Depends}, >> ${misc:Depends} >> +Depends: openjdk-6-jre (= ${binary:Version}), ${shlibs:Depends}, >> ${misc:Depends} >> Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre (<< >> 6b17~pre3-1) >> Description: Java runtime based on OpenJDK (demos and examples) >> OpenJDK Java runtime >> @@ -89,7 +92,9 @@ Package: openjdk-6-source >> Architecture: all >> Priority: extra >> Pre-Depends: ${dpkg:Depends} >> -Depends: openjdk-6-jre (>= ${source:Version}), openjdk-6-jdk (>= >> ${binary:Version}), ${misc:Depends} >> +Depends: openjdk-6-jre (>= ${source:Version}), >> + openjdk-6-jre (<< $(source:Version}+b99), >> + openjdk-6-jdk (>= ${binary:Version}), ${misc:Depends} >> Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre (<< >> 6b17~pre3-1) >> Description: OpenJDK Development Kit (JDK) source files >> OpenJDK is a development environment for building applications, >> -- >> 1.7.7.rc1 >> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
