diff -u openjdk-6-6b35-1.13.7/debian/changelog openjdk-6-6b35-1.13.7/debian/changelog --- openjdk-6-6b35-1.13.7/debian/changelog +++ openjdk-6-6b35-1.13.7/debian/changelog @@ -1,20 +1,14 @@ -openjdk-6 (6b35-1.13.7-1ubuntu0.14.04.1~ppa2) trusty; urgency=medium +openjdk-6 (6b35-1.13.7-1ubuntu0.14.04.1~ppa3) trusty; urgency=medium - * Try disabling system lcms. + * Try building a different backport for our PPA :) - -- Ryan Graham Tue, 25 Sep 2015 00:36:21 +0000 + -- Ryan Graham Tue, 25 Sep 2015 02:44:33 +0000 -openjdk-6 (6b35-1.13.7-1ubuntu0.14.04.1~ppa1) trusty; urgency=medium +openjdk-6 (6b35-1.13.7-1ubuntu0.14.04.1) trusty-security; urgency=medium - * Forwardport to trusty. + * Backport to 14.04 LTS. - -- Ryan Graham Tue, 25 Sep 2015 00:17:08 +0000 - -openjdk-6 (6b35-1.13.7-1ubuntu0.10.04.2) lucid-security; urgency=medium - - * Backport to 10.04 LTS. - - -- Steve Beattie Wed, 15 Apr 2015 18:59:31 -0700 + -- Steve Beattie Wed, 15 Apr 2015 23:22:00 -0700 openjdk-6 (6b35-1.13.7-1ubuntu1) vivid; urgency=medium diff -u openjdk-6-6b35-1.13.7/debian/control openjdk-6-6b35-1.13.7/debian/control --- openjdk-6-6b35-1.13.7/debian/control +++ openjdk-6-6b35-1.13.7/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: OpenJDK Team Uploaders: Torsten Werner , Matthias Klose , Damien Raude-Morvan -Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake1.11, autotools-dev, ant, ant-optional, libtool [alpha amd64 armel armhf i386 lpia m68k mips mipsel powerpc s390], g++-4.4 (>= 4.4.1), ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], openjdk-6-jdk (>= 6b27) [alpha], libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms1-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, xsltproc, libkrb5-dev, rhino, libffi-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, metacity | twm, dbus-x11, dbus-x11, x11-xkb-utils, +Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake1.11, autotools-dev, ant, ant-optional, libtool [alpha amd64 armel armhf i386 lpia m68k mips mipsel powerpc s390], g++-4.8, ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390 s390x], openjdk-6-jdk (>= 6b27) [alpha], libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, xsltproc, libkrb5-dev, rhino, fonts-ipafont-mincho, libffi-dev, zlib1g-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 2:3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, twm, dbus-x11, x11-xkb-utils, Standards-Version: 3.9.6 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk6 @@ -12,6 +12,7 @@ Package: openjdk-6-jdk Architecture: any +Multi-Arch: same Pre-Depends: ${dpkg:Depends} Depends: openjdk-6-jre (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: libxt-dev @@ -27,10 +28,11 @@ Package: openjdk-6-jre-headless Architecture: any +Multi-Arch: same Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends} Depends: openjdk-6-jre-lib (>= ${source:Version}), ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends} Recommends: ${dlopenjl:Recommends}, ${cacao:Recommends}, ${jamvm:Recommends} -Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-extra, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-sazanami-gothic | ttf-kochi-gothic, ttf-sazanami-mincho | ttf-kochi-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, +Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides} Replaces: openjdk-6-jre-lib (<< 6b23~pre10), 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) @@ -43,6 +45,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} Recommends: ${dlopenjre:Recommends}, ttf-dejavu-extra, icedtea-netx @@ -59,11 +62,13 @@ Package: openjdk-6-jre-lib Architecture: all +Multi-Arch: foreign Pre-Depends: ${dpkg:Depends} Depends: openjdk-6-jre-headless (>= ${base:Version}), ${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~) +Built-Using: ${rhino:Source} Description: OpenJDK Java runtime (architecture independent libraries) OpenJDK Java runtime, using ${vm:Name}. . @@ -117,6 +122,7 @@ Package: openjdk-6-dbg Architecture: any +Multi-Arch: same Priority: extra Section: debug Pre-Depends: ${dpkg:Depends} @@ -135,6 +141,7 @@ Package: icedtea-6-jre-cacao Architecture: alpha amd64 armel armhf i386 lpia powerpc m68k mips mipsel s390 +Multi-Arch: same Priority: extra Pre-Depends: ${dpkg:Depends} Depends: openjdk-6-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -147,8 +154,22 @@ . The VM is started with the option `-cacao'. See the README.Debian for details. +Package: icedtea-6-jre-jamvm +Architecture: amd64 armel armhf i386 lpia mips mipsel powerpc +Multi-Arch: same +Priority: extra +Pre-Depends: ${dpkg:Depends} +Depends: openjdk-6-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Alternative JVM for OpenJDK, using JamVM + The package provides an alternative runtime using the JamVM. This is a + somewhat faster alternative than the Zero port on architectures like armel, + mips, mipsel, powerpc. + . + The VM is started with the option `-jamvm'. See the README.Debian for details. + Package: openjdk-6-jre-zero Architecture: amd64 i386 lpia +Multi-Arch: same Priority: extra Pre-Depends: ${dpkg:Depends} Depends: openjdk-6-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} diff -u openjdk-6-6b35-1.13.7/debian/rules openjdk-6-6b35-1.13.7/debian/rules --- openjdk-6-6b35-1.13.7/debian/rules +++ openjdk-6-6b35-1.13.7/debian/rules @@ -557,14 +557,13 @@ # IcedTea 1.13 now needs lcms2 >= 2.5. Disable on releases which have # an unpatched earlier lcms2 without the security fixes included in 2.5. -#ifneq ($(lcms_version),2) -# CONFIGURE_ARGS += --disable-system-lcms -#else ifneq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid karmic jaunty intrepid hardy)) -# CONFIGURE_ARGS += --disable-system-lcms -#else -# CONFIGURE_ARGS += --enable-system-lcms -#endif -CONFIGURE_ARGS += --disable-system-lcms +ifneq ($(lcms_version),2) + CONFIGURE_ARGS += --disable-system-lcms +else ifneq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid karmic jaunty intrepid hardy)) + CONFIGURE_ARGS += --disable-system-lcms +else + CONFIGURE_ARGS += --enable-system-lcms +endif CONFIGURE_ARGS += --enable-system-kerberos