Commit dedaec7d authored by Andreas Tille's avatar Andreas Tille
Browse files

Make sure JDK has proper architecture

parent 20cef33b

debian/changelog

+8 −0
Original line number Diff line number Diff line 
imagej (1.52i-2) UNRELEASED; urgency=medium



  * Team upload.

  * Make sure JDK has proper architecture

    Closes: #881853



 -- Andreas Tille <tille@debian.org>  Fri, 21 Dec 2018 14:45:26 +0100



imagej (1.52i-1) unstable; urgency=medium



  * New upstream version 1.52i

debian/extra/imagej

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ shopt -s extglob # allow extended pattern matching 


if [ -z "$JAVA_HOME" ] ; then

    # This does not work see #505315

    JAVA_HOME=$(/usr/sbin/update-java-alternatives -l | grep openjdk | sort | tail -1 | tr -s ' ' | cut -d' ' -f 3)

    JAVA_HOME=`/usr/sbin/update-java-alternatives -l | grep openjdk | grep $(dpkg-architecture -q DEB_TARGET_ARCH) | sort | tail -1 | tr -s ' ' | cut -d' ' -f 3`

    # Reverted to old version - see #558222 (Andreas Tille)

    # JAVA_HOME=$(dirname $(dirname $(dirname $(readlink /etc/alternatives/java))))

    # Also suggested by From: JR Coding <jr.coding@googlemail.com>; To: 740439@bugs.debian.org