Use debhelper level 9 in the generated package

[sven/java-package.git] / make-jpkg

diff --git a/make-jpkg b/make-jpkg
index 41899db7a342d44f64d24cee99846b602abceae0..758bcf8db075deae3b15dd00b3c6d970f9fecddf 100755 (executable)
--- a/make-jpkg
+++ b/make-jpkg
@@ -15,8 +15,8 @@ lib_dir="/usr/share/java-package"
 [ "$J2SE_PACKAGE_LIBDIR" ] && lib_dir="$J2SE_PACKAGE_LIBDIR"
 
 # If a default has been set for either of the
-# environment variables, use it; otherwise, 
-# default to the name and email used by the 
+# environment variables, use it; otherwise,
+# default to the name and email used by the
 # Debian Java Maintainers project.
 if [ -z "$J2SE_PACKAGE_FULL_NAME" ]; then
     maintainer_name="Debian Java Maintainers"
@@ -71,9 +71,9 @@ $program_name builds a Debian package from the given Java binary distribution FI
 
 Supported java binary distributions currently include:
   * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-    - The Java Development Kit (JDK), version 6 (update >= 10), 7
-    - The Java Runtime Environment (JRE), version 6 (update >= 10), 7
-    - The Java API Javadoc, version 6 (update >= 10), 7
+    - The Java Development Kit (JDK), version 6 and 7
+    - The Java Runtime Environment (JRE), version 6 and 7
+    - The Java API Javadoc, version 6 and 7
   (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
 
 The following options are recognized:
@@ -219,11 +219,14 @@ echo
 # get architecture information
 get_architecture
 
+# get browser plugin directories
+get_browser_plugin_dirs
+
 jvm_base="/usr/lib/jvm/"
 javadoc_base="/usr/share/doc/"
 
 j2se_found=
-for var in ${!j2se_detect_*}; do 
+for var in ${!j2se_detect_*}; do
     eval "\$$var"
     if [[ "$j2se_found" == "true" ]]; then
     break;
@@ -232,7 +235,8 @@ done
 echo
 
 if [[ -z "$j2se_found" ]]; then
-    echo "No matching plugin was found."
+    echo "No matching packaging method was found for $archive_name."
+    echo "Please make sure you are using a tar.gz or a self-extracting archive"
 fi