From 8e310b0345eb38774e18c08db490286fdae63093 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Pineau?= Date: Fri, 17 Aug 2012 15:27:42 +0200 Subject: [PATCH] Remove restriction (update >= 10) on jre/jdk6 support --- debian/README.Debian | 6 +++--- debian/changelog | 1 + debian/control | 6 +++--- make-jpkg | 6 +++--- make-jpkg.1 | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index f1ce1f2..6ebff7b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -16,9 +16,9 @@ Typical usage consists in Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) All other previously supported jvm (Blackdown, IBM, ..) have been removed and diff --git a/debian/changelog b/debian/changelog index 527516c..a37b3af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ java-package (0.51) unstable; urgency=low * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993 * Drop installation debconf note Closes: #685082 * Correct handling of amd64 in roacle-jdk6.1->4 and improve error message when used with unknown archives + * Add support for earlier oracle-jdk6 version [Emmanuel Bourg] * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates) diff --git a/debian/control b/debian/control index f47c98e..065b918 100644 --- a/debian/control +++ b/debian/control @@ -21,9 +21,9 @@ Description: Utility for creating Java Debian packages . Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) . Please note that Debian recommends the use of openjdk-6-jdk/openjdk-6-jre diff --git a/make-jpkg b/make-jpkg index 4c542db..7173cb5 100755 --- a/make-jpkg +++ b/make-jpkg @@ -71,9 +71,9 @@ $program_name builds a Debian package from the given Java binary distribution FI Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The Java Development Kit (JDK), version 6 (update >= 10), 7 - - The Java Runtime Environment (JRE), version 6 (update >= 10), 7 - - The Java API Javadoc, version 6 (update >= 10), 7 + - The Java Development Kit (JDK), version 6 and 7 + - The Java Runtime Environment (JRE), version 6 and 7 + - The Java API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) The following options are recognized: diff --git a/make-jpkg.1 b/make-jpkg.1 index 88878fd..7d7a91f 100644 --- a/make-jpkg.1 +++ b/make-jpkg.1 @@ -30,9 +30,9 @@ distribution FILE. .PP Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) .PP The following options are recognized: -- 2.39.5