ensure older pattern only match up to version 8

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

diff --git a/lib/javase.sh b/lib/javase.sh
index ed0745c02bf8ef8228ce924f2ffce8ad7abb2d33..fd025ca4f1a4afb10fc3fa764f6fa5d57aed8bd4 100644 (file)
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -12,7 +12,7 @@ EOF
 
 j2se_changelog() {
     cat << EOF
-$j2se_package ($j2se_version) unstable; urgency=medium
+$j2se_package ($j2se_version) $target_distribution; urgency=medium
 
   * This package was created with java-package ($version).
 
@@ -30,7 +30,7 @@ Section: non-free/devel
 Priority: optional
 Maintainer: $maintainer_name <$maintainer_email>
 Build-Depends: debhelper (>= 9)${build_depends}
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 
 EOF
 }
@@ -126,7 +126,7 @@ if [ "\$1" = configure ]; then
         for program in \$*; do
           if [[ -f "\$program_base/\$program" ]]; then
             update-alternatives \\
-            --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority \\
+            --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" ${priority_override:-$j2se_priority} \\
             --slave "/usr/share/man/man1/\$program.1.gz" "\$program.1.gz" "$jvm_base$j2se_name/man/man1/\$program.1.gz"
           fi
         done
@@ -138,7 +138,7 @@ if [ "\$1" = configure ]; then
         shift
         for program in \$*; do
           if [[ -f "\$program_base/\$program" ]]; then
-            update-alternatives --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority
+            update-alternatives --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" ${priority_override:-$j2se_priority}
           fi
         done
     }
@@ -151,7 +151,7 @@ if [ "\$1" = configure ]; then
         local plugin="\$4"
         [ -d "\$link_path" ] || install -d -m 755 "\$link_path"
         if [[ -f "\$plugin" ]]; then
-          update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" $j2se_priority
+          update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" ${priority_override:-$j2se_priority}
         fi
     }
 EOF
@@ -281,6 +281,7 @@ j2se_run() {
     echo
     diskfree "$j2se_required_space"
     read_maintainer_info
+    get_distribution
     case "${j2se_arch}" in
       i586)
         j2se_debian_arch=i386
@@ -293,6 +294,9 @@ j2se_run() {
     local target="$package_dir/$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
+    if [[ -n "$jce_archive" ]]; then
+      extract_jce "$jce_path" "$target/jre/lib/security"
+    fi
     rm -rf "$target/.systemPrefs"
     echo "9" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"