Hi, this is fixed patch for openjdk-6. The first one was just a snapshot of current work.
The openjdk-* rules are a little bit more difficult, so please double check before applying. Cheers, Ondrej On Tue, Sep 30, 2014, at 15:26, Debian Bug Tracking System wrote: > Thank you for filing a new Bug report with Debian. > > This is an automatically generated reply to let you know your message > has been received. > > Your message is being forwarded to the package maintainers and other > interested parties for their attention; they will reply in due course. > > Your message has been sent to the package maintainer(s): > OpenJDK Team <open...@lists.launchpad.net> > > If you wish to submit further information on this problem, please > send it to 763...@bugs.debian.org. > > Please do not send mail to ow...@bugs.debian.org unless you wish > to report a problem with the Bug-tracking system. > > -- > 763488: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763488 > Debian Bug Tracking System > Contact ow...@bugs.debian.org with problems -- Ondřej Surý <ond...@sury.org> Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server
diff --git a/debian/changelog b/debian/changelog index c341f41..f02e3f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openjdk-6 (6b32-1.13.4-4.1) unstable; urgency=medium + + * Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo + + -- OndÅej Surý <ond...@debian.org> Tue, 30 Sep 2014 15:01:07 +0200 + openjdk-6 (6b32-1.13.4-4) unstable; urgency=medium * Adjust patches for upstream renaming build flags. Adds the jni diff --git a/debian/control b/debian/control index e1d3bec..9518872 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: OpenJDK Team <open...@lists.launchpad.net> Uploaders: Torsten Werner <twer...@debian.org>, Matthias Klose <d...@ubuntu.com>, Damien Raude-Morvan <draz...@debian.org> -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.9, 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, libjpeg8-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, twm | metacity, twm | 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.9, 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 (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, twm | metacity, twm | dbus-x11, x11-xkb-utils, Build-Conflicts: automake Standards-Version: 3.9.5 Homepage: http://openjdk.java.net/ diff --git a/debian/rules b/debian/rules index 492634d..4cfedce 100755 --- a/debian/rules +++ b/debian/rules @@ -668,7 +668,11 @@ bd_syslibs = zlib1g-dev, ifneq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid karmic jaunty intrepid hardy gutsy feisty edgy dapper)) bd_syslibs += libpng12-dev, libjpeg62-dev, else - bd_syslibs += libpng-dev, libjpeg8-dev, + ifneq (,$(filter $(distrel),wheezy trusty precise saucy utopic)) + bd_syslibs += libpng-dev, libjpeg8-dev, + else + bd_syslibs += libpng-dev, libjpeg-dev + fi endif bd_syslibs += \ libgif-dev$(if $(filter $(distrel),etch dapper edgy feisty gutsy), | libungif4-dev),
