Improved the detection of the JRE/JDK version (supports 2 digits Java 7 updates)...

[sven/java-package.git] / lib / j2sdk.sh

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index 988cd6e599e76288edce0221b44e7f9c7b1c8183..dfb0e04ffdc774a5a01d0b6045e233c0c5216464 100644 (file)
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -9,11 +9,11 @@ Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
 Provides: java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release
 Replaces: ${j2se_package}debian
 Description: $j2se_title
- The Java(TM) 2 SDK is a development environment for building
+ The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the
  Java(TM) platform.
  .
- The Java(TM) 2 SDK software includes tools useful for developing and
+ The Java(TM) SE JDK software includes tools useful for developing and
  testing programs written in the Java programming language and running
  on the Java platform. These tools are designed to be used from the
  command line. Except for appletviewer, these tools do not provide a
@@ -28,8 +28,8 @@ j2sdk_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2sdk$j2se_release"
-    j2se_name="j2sdk$j2se_release-$j2se_vendor"
+    j2se_package="$j2se_vendor-java$j2se_release-jdk"
+    j2se_name="jdk$j2se_release-$j2se_vendor"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"