From ab5553e5e6e9cc7359e3ce97ab38bd89b8ea4995 Mon Sep 17 00:00:00 2001
From: Damien Raude-Morvan <drazzib@debian.org>
Date: Sat, 3 Sep 2011 14:47:09 +0000
Subject: Merge changes from unstable (uploads by doko)

---
 scripts/update-java-alternatives | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'scripts')

diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives
index aadbb5e..5e31a68 100755
--- a/scripts/update-java-alternatives
+++ b/scripts/update-java-alternatives
@@ -79,6 +79,11 @@ fi
 top=/usr/lib/jvm
 
 if [ -n "$jname" ]; then
+    arch=$(dpkg --print-architecture)
+    if [ ! -x $top/$jname/bin/java ] && [ -x $top/$jname-$arch/bin/java ]; then
+	echo >&2 "$prog: obsolete <jname>, please use $jname-$arch instead"
+	jname=$jname-$arch
+    fi
     case "$jname" in
 	/*) jdir=$jname; jname=$(basename $jdir);;
 	*)  jdir=$top/$jname
-- 
cgit v1.2.3