[med-svn] [Git][med-team/imagej][master] Make sure JDK has proper architecture

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / imagej


Commits:
dedaec7d by Andreas Tille at 2018-12-21T13:46:08Z
Make sure JDK has proper architecture

- - - - -


2 changed files:

- debian/changelog
- debian/extra/imagej


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+imagej (1.52i-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Make sure JDK has proper architecture
+    Closes: #881853
+
+ -- Andreas Tille <tille at 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
=====================================
@@ -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 at googlemail.com>; To: 740439 at bugs.debian.org



View it on GitLab: https://salsa.debian.org/med-team/imagej/commit/dedaec7d797844e4312b083e7de1f3600d581163

-- 
View it on GitLab: https://salsa.debian.org/med-team/imagej/commit/dedaec7d797844e4312b083e7de1f3600d581163
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181221/4437b7e9/attachment-0001.html>