From: Sylvestre Ledru Date: Wed, 5 Jun 2013 12:06:04 +0000 (+0200) Subject: Change the installation path from /usr/lib/jvm/jdk-6.38-oracle-x64 or /usr/lib/jvm... X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=d8cde9ed501f030194a66a7993523d43ab926084;p=sven%2Fjava-package.git 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) --- diff --git a/debian/changelog b/debian/changelog index 3295b1b..858ba86 100644 --- 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 608d1bd..864f141 100644 --- 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 21031c9..778b370 100644 --- 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"