Change the installation path from /usr/lib/jvm/jdk-6.38-oracle-x64 or /usr/lib/jvm...

diff --git a/debian/changelog b/debian/changelog
index 3295b1b7dba020ee2eada424f4d04f9e17bb2132..858ba8634f8363906614b64d6fe336f692a44017 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ java-package (0.52) unstable; urgency=low
   * Remove obsolete variable from the changelog
   * Add support of ARM upstream binary by James Page and Matthias Vill.
     Thanks guys! (Closes: #687375)
+  * Change the installation path from
+    /usr/lib/jvm/jdk-6.38-oracle-x64 or /usr/lib/jvm/jdk-7.10-oracle-x64
+    to
+    /usr/lib/jvm/jdk-6-oracle-x64 and /usr/lib/jvm/jdk-7-oracle-x64
+    Thanks to Constantin Makshin for the patch (Closes: #696227)
 
   [ Cédric Pineau ]
   * Fix lintian errors and warnings

diff --git a/lib/j2re.sh b/lib/j2re.sh
index 608d1bdabd97828d802c4bc321369bcf0fdd13ec..864f14106f968579358fe2adc9d4b2580090d24e 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -27,7 +27,7 @@ j2re_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-jre"
-    j2se_name="jre-$j2se_version-$j2se_vendor-$j2se_arch"
+    j2se_name="jre-$j2se_release-$j2se_vendor-$j2se_arch"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index 21031c9818f33a495b698970c2aeb8a4c9f00513..778b3703866f67da00d6f54e8a4aeff6091c7947 100644 (file)
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -40,7 +40,7 @@ j2sdk_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-jdk"
-    j2se_name="jdk-$j2se_version-$j2se_vendor-$j2se_arch"
+    j2se_name="jdk-$j2se_release-$j2se_vendor-$j2se_arch"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"