diff -u openjdk-6-6b11/debian/changelog openjdk-6-6b11/debian/changelog --- openjdk-6-6b11/debian/changelog +++ openjdk-6-6b11/debian/changelog @@ -1,3 +1,10 @@ +openjdk-6 (6b11-6ubuntu2) intrepid; urgency=low + + * Suggest rather than recommend libnss-mdns for -jre-headless (LP: #261847) + * Recommend libnss-mdns in -jre to preserve behavior for all other runtimes + + -- Thierry Carrez Wed, 27 Aug 2008 16:52:53 +0200 + openjdk-6 (6b11-6ubuntu1) intrepid; urgency=low * Upload to intrepid. diff -u openjdk-6-6b11/debian/control.in openjdk-6-6b11/debian/control.in --- openjdk-6-6b11/debian/control.in +++ openjdk-6-6b11/debian/control.in @@ -1,7 +1,8 @@ Source: @basename@ Section: devel Priority: extra -Maintainer: OpenJDK Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Michael Koch , Torsten Werner , Matthias Klose Build-Depends: debhelper (>= 5), autotools-dev, @bd_compress@, m4, lsb-release, wget, zip, unzip, sharutils, gawk, pkg-config, procps, automake, autoconf, ant, @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_syslibs@ @bd_plugin@ @bd_netx@ @bd_mauve@ Standards-Version: 3.8.0 @@ -28,8 +29,8 @@ Pre-Depends: ${dpkg:Depends} Section: interpreters Depends: @basename@-jre-lib (>= @pkg_version@), rhino, libaccess-bridge-java (>= 1.22), java-common (>= 0.28), ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends} -Recommends: ${dlopenjl:Recommends}, libnss-mdns, tzdata-java, ca-certificates-java -Suggests: sun-java6-fonts, @core_fonts@, @cjk_fonts@ +Recommends: ${dlopenjl:Recommends}, tzdata-java, ca-certificates-java +Suggests: libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@ Provides: java-virtual-machine, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless Replaces: @basename@-jre-lib (<< 6b06-0ubuntu11), @basename@-jre (<< 6b09dfsg-0ubuntu2) Description: OpenJDK Java runtime, using ${vm:Name} (headless) @@ -44,7 +45,7 @@ Pre-Depends: ${dpkg:Depends} Section: interpreters Depends: @basename@-jre-headless (>= @pkg_version@), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends} -Recommends: ${dlopenjre:Recommends}, @cjk_fonts@ +Recommends: ${dlopenjre:Recommends}, libnss-mdns, @cjk_fonts@ Suggests: icedtea-gcjwebplugin Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime Description: OpenJDK Java runtime, using ${vm:Name} diff -u openjdk-6-6b11/debian/control openjdk-6-6b11/debian/control --- openjdk-6-6b11/debian/control +++ openjdk-6-6b11/debian/control @@ -1,7 +1,8 @@ Source: openjdk-6 Section: devel Priority: extra -Maintainer: OpenJDK Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Michael Koch , Torsten Werner , Matthias Klose Build-Depends: debhelper (>= 5), autotools-dev, lzma, m4, lsb-release, wget, zip, unzip, sharutils, gawk, pkg-config, procps, automake, autoconf, ant, g++-4.3, gcj (>= 4:4.2.1) [amd64 armel i386 ia64 lpia powerpc m68k mips mipsel sparc s390], ecj [amd64 armel i386 ia64 lpia powerpc m68k mips mipsel sparc s390], java-gcj-compat-dev (>= 1.0.76-2ubuntu3) [amd64 armel i386 ia64 lpia powerpc m68k mips mipsel sparc s390], openjdk-6-jdk (>= 6b11) [alpha], libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, libcups2-dev, libasound2-dev, libfreetype6-dev, libxalan2-java, rhino, liblcms1-dev, libxinerama-dev, libffi-dev [!amd64 !i386 !lpia !sparc], libjpeg62-dev, libpng12-dev, libgif-dev, zlib1g-dev, libgtk2.0-dev, xulrunner-1.9-dev, fastjar (>= 2:0.95-2), mauve, xvfb, autoconf, automake, xauth, xfonts-base Standards-Version: 3.8.0 @@ -28,8 +29,8 @@ Pre-Depends: ${dpkg:Depends} Section: interpreters Depends: openjdk-6-jre-lib (>= ${binary:Version}), rhino, libaccess-bridge-java (>= 1.22), java-common (>= 0.28), ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends} -Recommends: ${dlopenjl:Recommends}, libnss-mdns, tzdata-java, ca-certificates-java -Suggests: sun-java6-fonts, ttf-dejavu-core, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, +Recommends: ${dlopenjl:Recommends}, tzdata-java, ca-certificates-java +Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-core, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, Provides: java-virtual-machine, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless Replaces: openjdk-6-jre-lib (<< 6b06-0ubuntu11), openjdk-6-jre (<< 6b09dfsg-0ubuntu2) Description: OpenJDK Java runtime, using ${vm:Name} (headless) @@ -44,7 +45,7 @@ Pre-Depends: ${dpkg:Depends} Section: interpreters Depends: openjdk-6-jre-headless (>= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends} -Recommends: ${dlopenjre:Recommends}, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, +Recommends: ${dlopenjre:Recommends}, libnss-mdns, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, Suggests: icedtea-gcjwebplugin Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime Description: OpenJDK Java runtime, using ${vm:Name}