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

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

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 94ce4a73977c5aea2d790e79c87bfb26587a74e5..774f2db75fa8e6dcd3d695357450d24c19265162 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -9,7 +9,7 @@ Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
 Provides: java-virtual-machine, java-runtime, java2-runtime, java-runtime-headless, java2-runtime-headless, java-browser-plugin, j2re${j2se_release}
 Replaces: ${j2se_package}debian
 Description: $j2se_title
- The Java(TM) 2 Runtime Environment contains the Java virtual machine,
+ The Java(TM) SE Runtime Environment contains the Java virtual machine,
  runtime class libraries, and Java application launcher that are
  necessary to run programs written in the Java progamming language
  (this includes the Java 2 Plug-In for Netscape and Mozilla
@@ -26,12 +26,13 @@ j2re_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
-    j2se_package="$j2se_vendor-j2re$j2se_release"
-    j2se_name="j2re$j2se_release-$j2se_vendor"
+    j2se_package="$j2se_vendor-java$j2se_release-jre"
+    j2se_name="jre$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"
     rm -rf "$target/.systemPrefs"
+    echo "7" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"