[SCM] UNNAMED PROJECT branch, master, updated. 0.40-11-g8797a4e

[Niels Thykier]

The following commit has been merged in the master branch:
commit 8797a4e54d5d25d9ae69d7ab1ecfa15030aa63ab
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Mar 12 22:22:26 2012 +0100

    jh_depends: Use java5-runtime as minimum alt dependency
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 3d85271..1c657c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ javatools (0.41) UNRELEASED; urgency=low
     jh_depends, as Debian is no longer ships the Sun/Oracle Java.
   * Bump libarchive-zip-perl depends as 1.30.5 was still affected
     by #654899.
+  * jh_depends no longer emits dependencies with java-runtime or
+    java2-runtime.  The minimum generated dependency is now
+    java5-runtime.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 24 Feb 2012 16:22:58 +0100
 
diff --git a/jh_depends b/jh_depends
index 9b86991..ed8ff36 100755
--- a/jh_depends
+++ b/jh_depends
@@ -46,11 +46,7 @@ getclassversion()
 # getalternatedepends <version>
 getalternatedepends()
 {
-	if (( $1 < 48 )); then
-		echo "| java-runtime$2 | java2-runtime$2 | java5-runtime$2 | java6-runtime$2"
-	elif [ "$1" == "48" ]; then
-		echo "| java2-runtime$2 | java5-runtime$2 | java6-runtime$2"
-	elif [ "$1" == "49" ]; then
+	if (( $1 < 50 )); then
 		echo "| java5-runtime$2 | java6-runtime$2"
 	elif [ "$1" == "50" ]; then
 		echo "| java6-runtime$2"

-- 
UNNAMED PROJECT