openjdk team mailing list archive

[Ondřej Surý <ondrej@xxxxxxxxxx>]

Hi,

this is fixed patch for openjdk-7. 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 <openjdk@xxxxxxxxxxxxxxxxxxx>
> 
> If you wish to submit further information on this problem, please
> send it to 763489@xxxxxxxxxxxxxxx.
> 
> Please do not send mail to owner@xxxxxxxxxxxxxxx unless you wish
> to report a problem with the Bug-tracking system.
> 
> -- 
> 763489: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763489
> Debian Bug Tracking System
> Contact owner@xxxxxxxxxxxxxxx with problems


-- 
Ondřej Surý <ondrej@xxxxxxxx>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server

diff --git a/debian/changelog b/debian/changelog
index a917022..c6bce67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjdk-7 (7u65-2.5.2-4.1) unstable; urgency=medium
+
+  * Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo
+
+ -- Ondřej Surý <ondrej@xxxxxxxxxx>  Tue, 30 Sep 2014 14:01:38 +0200
+
 openjdk-7 (7u65-2.5.2-4) unstable; urgency=medium
 
   * Update the hotspot for AArch64, rev 9580ebccfdc3.
diff --git a/debian/control b/debian/control
index 2248773..146b6d8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5),
    ecj-gcj [amd64 armel arm64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel arm64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], openjdk-7-jdk (>= 6b18) [alpha mips64 mips64el],
   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, libkrb5-dev, xsltproc, librhino-java (>= 1.7R3~), libpcsclite-dev, fonts-ipafont-mincho,
   libffi-dev, 
-  zlib1g-dev, libattr1-dev, libpng-dev, libjpeg8-dev, libgif-dev,
+  zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,
   libpulse-dev (>= 0.9.12),
   libnss3-dev (>= 2:3.13.5), systemtap-sdt-dev,
   mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
diff --git a/debian/rules b/debian/rules
index 9c59edd..090c1d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -763,7 +763,11 @@ bd_syslibs = zlib1g-dev, libattr1-dev,
 ifneq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid karmic jaunty intrepid hardy))
   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), | libungif4-dev),