diff -Nru java-package-0.50ppa1/.git/COMMIT_EDITMSG java-package-0.52ppa1/.git/COMMIT_EDITMSG --- java-package-0.50ppa1/.git/COMMIT_EDITMSG 1970-01-01 00:00:00.000000000 +0000 +++ java-package-0.52ppa1/.git/COMMIT_EDITMSG 2012-08-30 23:55:06.000000000 +0000 @@ -0,0 +1,23 @@ +ppa +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Changes to be committed: +# (use "git reset HEAD ..." to unstage) +# +# modified: debian/changelog +# +diff --git a/debian/changelog b/debian/changelog +index 1cd4cc3..7b0ba10 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,9 @@ ++java-package (0.52ppa1) precise; urgency=low ++ ++ * PPA build ++ ++ -- Pierre Carrier Thu, 30 Aug 2012 17:37:35 +0200 ++ + java-package (0.52) UNRELEASED; urgency=low + + * Add {mozilla,firefox}-javaplugin.so for update-java-alternatives. diff -Nru java-package-0.50ppa1/.git/FETCH_HEAD java-package-0.52ppa1/.git/FETCH_HEAD --- java-package-0.50ppa1/.git/FETCH_HEAD 1970-01-01 00:00:00.000000000 +0000 +++ java-package-0.52ppa1/.git/FETCH_HEAD 2012-08-30 23:55:07.000000000 +0000 @@ -0,0 +1 @@ +6f3337a85a01f4aa6900df2509d5b37f6be9d254 branch 'master' of git://git.debian.org/git/pkg-java/java-package diff -Nru java-package-0.50ppa1/.git/ORIG_HEAD java-package-0.52ppa1/.git/ORIG_HEAD --- java-package-0.50ppa1/.git/ORIG_HEAD 1970-01-01 00:00:00.000000000 +0000 +++ java-package-0.52ppa1/.git/ORIG_HEAD 2012-08-30 15:36:35.000000000 +0000 @@ -0,0 +1 @@ +ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/index and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/index differ diff -Nru java-package-0.50ppa1/.git/logs/HEAD java-package-0.52ppa1/.git/logs/HEAD --- java-package-0.50ppa1/.git/logs/HEAD 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/.git/logs/HEAD 2012-08-30 23:55:06.000000000 +0000 @@ -1 +1,6 @@ 0000000000000000000000000000000000000000 edb00d27b912c4864f573451c3eb36921e327c77 Pierre Carrier 1344136855 +0100 clone: from git://git.debian.org/git/pkg-java/java-package.git +edb00d27b912c4864f573451c3eb36921e327c77 ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 Pierre Carrier 1346340991 +0200 commit: ppa build +ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 6f3337a85a01f4aa6900df2509d5b37f6be9d254 Pierre Carrier 1346340995 +0200 checkout: moving from master to 6f3337a85a01f4aa6900df2509d5b37f6be9d254^0 +6f3337a85a01f4aa6900df2509d5b37f6be9d254 ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 Pierre Carrier 1346341002 +0200 rebase: aborting +ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 6f3337a85a01f4aa6900df2509d5b37f6be9d254 Pierre Carrier 1346341007 +0200 reset: moving to origin/master +6f3337a85a01f4aa6900df2509d5b37f6be9d254 11ed8b97b2ff11975e0297b86ed15e9e4c27109c Pierre Carrier 1346370903 +0200 commit: ppa diff -Nru java-package-0.50ppa1/.git/logs/refs/heads/master java-package-0.52ppa1/.git/logs/refs/heads/master --- java-package-0.50ppa1/.git/logs/refs/heads/master 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/.git/logs/refs/heads/master 2012-08-30 23:55:06.000000000 +0000 @@ -1 +1,4 @@ 0000000000000000000000000000000000000000 edb00d27b912c4864f573451c3eb36921e327c77 Pierre Carrier 1344136855 +0100 clone: from git://git.debian.org/git/pkg-java/java-package.git +edb00d27b912c4864f573451c3eb36921e327c77 ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 Pierre Carrier 1346340991 +0200 commit: ppa build +ab6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 6f3337a85a01f4aa6900df2509d5b37f6be9d254 Pierre Carrier 1346341007 +0200 reset: moving to origin/master +6f3337a85a01f4aa6900df2509d5b37f6be9d254 11ed8b97b2ff11975e0297b86ed15e9e4c27109c Pierre Carrier 1346370903 +0200 commit: ppa diff -Nru java-package-0.50ppa1/.git/logs/refs/remotes/origin/master java-package-0.52ppa1/.git/logs/refs/remotes/origin/master --- java-package-0.50ppa1/.git/logs/refs/remotes/origin/master 1970-01-01 00:00:00.000000000 +0000 +++ java-package-0.52ppa1/.git/logs/refs/remotes/origin/master 2012-08-30 15:36:35.000000000 +0000 @@ -0,0 +1 @@ +edb00d27b912c4864f573451c3eb36921e327c77 6f3337a85a01f4aa6900df2509d5b37f6be9d254 Pierre Carrier 1346340995 +0200 pull: fast-forward Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/01/a06777716c6efe00e760bb3dc0f4daf01e6126 and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/01/a06777716c6efe00e760bb3dc0f4daf01e6126 differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/09/ffaa95bdf9848e9eacc2e837b9e2e449ab198c and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/09/ffaa95bdf9848e9eacc2e837b9e2e449ab198c differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/0c/40e48f1b0a84b5a7d28b591f61ce83c85886d2 and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/0c/40e48f1b0a84b5a7d28b591f61ce83c85886d2 differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/11/ed8b97b2ff11975e0297b86ed15e9e4c27109c and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/11/ed8b97b2ff11975e0297b86ed15e9e4c27109c differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/43/2925898ab103401738d06f57171c934a440727 and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/43/2925898ab103401738d06f57171c934a440727 differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/57/9680f9ddc321b1b7d65dfdbf9af600769e5046 and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/57/9680f9ddc321b1b7d65dfdbf9af600769e5046 differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/65/f1f7ec9b99f30f6a7709a78abbd707bb87c39d and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/65/f1f7ec9b99f30f6a7709a78abbd707bb87c39d differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/6b/5e625c7ecb26853f8b1148d7a543c67b9a350d and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/6b/5e625c7ecb26853f8b1148d7a543c67b9a350d differ Binary files /tmp/W_teawqO2W/java-package-0.50ppa1/.git/objects/7b/0ba10ff746ec128c97b9ecf847e2967b5acca3 and /tmp/VEMvjvNy97/java-package-0.52ppa1/.git/objects/7b/0ba10ff746ec128c97b9ecf847e2967b5acca3 differ diff -Nru java-package-0.50ppa1/.git/objects/ab/6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 java-package-0.52ppa1/.git/objects/ab/6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 --- java-package-0.50ppa1/.git/objects/ab/6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 1970-01-01 00:00:00.000000000 +0000 +++ java-package-0.52ppa1/.git/objects/ab/6d4bbd6096b496ee3f4f5d6445f50b05beb0d9 2012-08-30 15:36:33.000000000 +0000 @@ -0,0 +1,3 @@ +xK +1D]$L& "xO8&= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) All other previously supported jvm (Blackdown, IBM, ..) have been removed and diff -Nru java-package-0.50ppa1/debian/changelog java-package-0.52ppa1/debian/changelog --- java-package-0.50ppa1/debian/changelog 2012-08-05 03:29:17.000000000 +0000 +++ java-package-0.52ppa1/debian/changelog 2012-08-30 15:37:35.000000000 +0000 @@ -1,8 +1,32 @@ -java-package (0.50ppa1) precise; urgency=low +java-package (0.52ppa1) precise; urgency=low * PPA build - -- Pierre Carrier Sun, 05 Aug 2012 04:29:17 +0100 + -- Pierre Carrier Thu, 30 Aug 2012 17:37:35 +0200 + +java-package (0.52) UNRELEASED; urgency=low + + * Add {mozilla,firefox}-javaplugin.so for update-java-alternatives. + + -- Gabriele Giacone <1o5g4r8o@gmail.com> Wed, 29 Aug 2012 20:02:25 +0200 + +java-package (0.51) unstable; urgency=low + + * Add firefox-javaplugin.so alternative Closes: #673670 and LP: #1024368 + * Add java5 and 6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993 and LP: #995655 + * Drop installation debconf note Closes: #685082 + * Correct handling of amd64 in oracle-jdk6.1->4 and improve error message when used with unknown archives + * Add support for earlier oracle-jdk6 version + + [Emmanuel Bourg] + * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates) Closes: #597294 + * Brand and naming cleanup + * Documentation directory changed to be /usr/share/doc/oracle-javaV-doc (for oracle) + + [Joerg Schirottke] + * Add mozilla-javaplugin.so alternative + + -- Cédric Pineau Sat, 18 Aug 2012 11:00:34 +0200 java-package (0.50) unstable; urgency=low diff -Nru java-package-0.50ppa1/debian/control java-package-0.52ppa1/debian/control --- java-package-0.50ppa1/debian/control 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/debian/control 2012-08-30 15:36:47.000000000 +0000 @@ -10,8 +10,7 @@ Package: java-package Architecture: all -Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2, - debconf (>= 0.5) | debconf-2.0 +Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2 Recommends: dpkg-dev, gcc Suggests: openjdk-6-jre, openjdk-7-jre Description: Utility for creating Java Debian packages @@ -21,9 +20,9 @@ . Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) . Please note that Debian recommends the use of openjdk-6-jdk/openjdk-6-jre diff -Nru java-package-0.50ppa1/debian/postinst java-package-0.52ppa1/debian/postinst --- java-package-0.50ppa1/debian/postinst 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] -then - . /usr/share/debconf/confmodule - db_input high java-package/postinst-note || true - db_go -fi - -#DEBHELPER# - -exit 0 diff -Nru java-package-0.50ppa1/debian/prerm java-package-0.52ppa1/debian/prerm --- java-package-0.50ppa1/debian/prerm 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ] -then - . /usr/share/debconf/confmodule - db_purge -fi - -#DEBHELPER# - -exit 0 diff -Nru java-package-0.50ppa1/debian/rules java-package-0.52ppa1/debian/rules --- java-package-0.50ppa1/debian/rules 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/debian/rules 2012-08-30 15:36:47.000000000 +0000 @@ -28,7 +28,6 @@ dh_testroot dh_clean -k dh_installdirs - dh_installdebconf install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg cp lib/*.sh $(B)/usr/share/java-package/ find $(B) -type d -name .svn | xargs -r rm -r diff -Nru java-package-0.50ppa1/debian/templates java-package-0.52ppa1/debian/templates --- java-package-0.50ppa1/debian/templates 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/debian/templates 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Template: java-package/postinst-note -Type: note -Description: Java-package is now installed - You can invoke make-jpkg to build Java Debian packages - To use it: - 1) download one of the java binary archive listed below - 2) invoke make-jpkg to build a Debian package from the downloaded archive- - 3) install the generated package using dpkg - . - Supported Java binary distributions currently include: - * Oracle : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 diff -Nru java-package-0.50ppa1/lib/common.sh java-package-0.52ppa1/lib/common.sh --- java-package-0.50ppa1/lib/common.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/common.sh 2012-08-30 15:36:47.000000000 +0000 @@ -2,15 +2,15 @@ read_yn() { local prompt="$1" while true; do - read -e -n 1 -p "$prompt" reply - case "$reply" in - "" | "y" | "Y") - return 0 - ;; - "N" | "n") - return 1 - ;; - esac + read -e -n 1 -p "$prompt" reply + case "$reply" in + "" | "y" | "Y") + return 0 + ;; + "N" | "n") + return 1 + ;; + esac done } @@ -27,12 +27,12 @@ diskfree() { local size="$1" echo -n "Checking free diskspace:" - (( free = `stat -f -c '%a / 2048 * ( %s / 512 )' $tmp ` )) + (( free = `stat -f -c '%a / 2048 * ( %s / 512 )' $tmp ` )) if [ "$free" -ge "$size" ]; then - echo " done." + echo " done." else - cat >&2 << EOF + cat >&2 << EOF WARNING: Possibly not enough free disk space in "$tmp". @@ -45,7 +45,7 @@ TMPDIR. EOF - read + read fi } @@ -69,23 +69,23 @@ mkdir "$extract_dir" cd "$extract_dir" echo - + local extract_cmd case "$archive_path" in - *.tar) - extract_cmd="tar xf";; - *.tar.bz2) - extract_cmd="tar --bzip2 -xf";; - *.tgz|*.tar.gz) - extract_cmd="tar xfz";; - *.zip) - extract_cmd="unzip -q";; - *) - extract_cmd=sh + *.tar) + extract_cmd="tar xf";; + *.tar.bz2) + extract_cmd="tar --bzip2 -xf";; + *.tgz|*.tar.gz) + extract_cmd="tar xfz";; + *.zip) + extract_cmd="unzip -q";; + *) + extract_cmd=sh esac - + if ! $extract_cmd "$archive_path"; then - cat << EOF + cat << EOF WARNING: The package installation script exited with an error value. Usually, this means, that the installation failed for some @@ -96,13 +96,13 @@ continue or Ctrl-C to abort. EOF - read + read fi echo echo -n "Testing extracted archive..." local size="$( diskusage "$extract_dir" )" if [ "$size" -lt "$expected_min_size" ]; then - cat << EOF + cat << EOF Invalid size ($size MB) of extracted archive. Probably you have not enough free disc space in the temporary directory. Note: You can @@ -110,73 +110,73 @@ TMPDIR. EOF - error_exit + error_exit else - cd "$extract_dir" - files=(*) - if [ "${#files[*]}" -ne 1 ]; then - cat << EOF + cd "$extract_dir" + files=(*) + if [ "${#files[*]}" -ne 1 ]; then + cat << EOF Expected one file, but found the following ${#files[*]} files: ${files[*]} EOF - error_exit - fi - mv "$files" "$dest" - echo -e " okay.\n" + error_exit + fi + mv "$files" "$dest" + echo -e " okay.\n" fi } read_maintainer_info() { if [ -z "$maintainer_name" ]; then - if [ -n "$DEBFULLNAME" ]; then - maintainer_name="$DEBFULLNAME" - elif [ -n "$DEBNAME" ]; then - maintainer_name="$DEBNAME" - else - default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)" - - cat << EOF + if [ -n "$DEBFULLNAME" ]; then + maintainer_name="$DEBFULLNAME" + elif [ -n "$DEBNAME" ]; then + maintainer_name="$DEBNAME" + else + default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)" + + cat << EOF Please enter your full name. This value will be used in the maintainer field of the created package. EOF - # gecos can be null - while [ -z "$maintainer_name" ]; do - read -e -p "Full name [$default_name]:" maintainer_name - if [ -z "$maintainer_name" ] && [ -n "$default_name" ]; then - maintainer_name="$default_name" - fi - done - fi + # gecos can be null + while [ -z "$maintainer_name" ]; do + read -e -p "Full name [$default_name]:" maintainer_name + if [ -z "$maintainer_name" ] && [ -n "$default_name" ]; then + maintainer_name="$default_name" + fi + done + fi fi - + if [ -z "$maintainer_email" ]; then - local default_email= - if [ -n "$DEBEMAIL" ]; then - maintainer_email="$DEBEMAIL" - else - if [ -r "/etc/mailname" ]; then - default_email="$( id -run )@$( cat /etc/mailname )" - else - default_email="$( id -run )@$( hostname --fqdn )" - fi - cat << EOF + local default_email= + if [ -n "$DEBEMAIL" ]; then + maintainer_email="$DEBEMAIL" + else + if [ -r "/etc/mailname" ]; then + default_email="$( id -run )@$( cat /etc/mailname )" + else + default_email="$( id -run )@$( hostname --fqdn )" + fi + cat << EOF Please enter a valid email address or press return to accept the default value. This address will be used in the maintainer field of the created package. EOF - read -e -p "Email [$default_email]: " maintainer_email - if [ -z "$maintainer_email" ]; then - maintainer_email="$default_email" - fi - fi + read -e -p "Email [$default_email]: " maintainer_email + if [ -z "$maintainer_email" ]; then + maintainer_email="$default_email" + fi + fi fi } diff -Nru java-package-0.50ppa1/lib/j2re.sh java-package-0.52ppa1/lib/j2re.sh --- java-package-0.50ppa1/lib/j2re.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/j2re.sh 2012-08-30 15:36:47.000000000 +0000 @@ -6,10 +6,10 @@ Architecture: any Depends: \${shlibs:Depends} 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} +Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-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,8 +26,8 @@ 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_version-$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 -Nru java-package-0.50ppa1/lib/j2sdk-doc.sh java-package-0.52ppa1/lib/j2sdk-doc.sh --- java-package-0.50ppa1/lib/j2sdk-doc.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/j2sdk-doc.sh 2012-08-30 15:36:47.000000000 +0000 @@ -8,12 +8,12 @@ Provides: Replaces: Description: $j2se_title - The Java(TM) 2 SDK is a development environment for building + The Java(TM) SE JDK is a development environment for building applications, applets, and components that can be deployed on the Java(TM) platform. . This package provides the official API documentation published - by Sun Microsystems. + by Oracle. . This package has been automatically created with java-package ($version). EOF @@ -28,8 +28,8 @@ Section: Programming Format: HTML -Index: /usr/share/doc/j2sdk$j2se_release-$j2se_vendor-doc/index.html -Files: /usr/share/doc/j2sdk$j2se_release-$j2se_vendor-doc/*.html +Index: /usr/share/doc/$j2se_vendor-java$j2se_release-doc/index.html +Files: /usr/share/doc/$j2se_vendor-java$j2se_release-doc/*.html EOF } @@ -39,8 +39,8 @@ echo diskfree "$j2se_required_space" read_maintainer_info - j2se_package="$j2se_vendor-j2sdk$j2se_release-doc" - j2se_name="j2sdk$j2se_release-$j2se_vendor-doc" + j2se_package="$j2se_vendor-java$j2se_release-doc" + j2se_name="jdk$j2se_release-$j2se_vendor-doc" local target="$install_dir$javadoc_base$j2se_name" install -d -m 755 "$( dirname "$target" )" extract_bin "$archive_path" "$j2se_expected_min_size" "$target" diff -Nru java-package-0.50ppa1/lib/j2sdk.sh java-package-0.52ppa1/lib/j2sdk.sh --- java-package-0.50ppa1/lib/j2sdk.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/j2sdk.sh 2012-08-30 15:36:47.000000000 +0000 @@ -6,14 +6,14 @@ Architecture: any Depends: \${shlibs:Depends} Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5 -Provides: java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release +Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java-sdk, java2-sdk, java5-sdk, java6-sdk, j2sdk$j2se_release, j2re$j2se_release Replaces: ${j2se_package}debian Description: $j2se_title - The Java(TM) 2 SDK is a development environment for building + The Java(TM) SE JDK is a development environment for building applications, applets, and components that can be deployed on the Java(TM) platform. . - The Java(TM) 2 SDK software includes tools useful for developing and + The Java(TM) SE JDK software includes tools useful for developing and testing programs written in the Java programming language and running on the Java platform. These tools are designed to be used from the command line. Except for appletviewer, these tools do not provide a @@ -28,8 +28,8 @@ echo diskfree "$j2se_required_space" read_maintainer_info - j2se_package="$j2se_vendor-j2sdk$j2se_release" - j2se_name="j2sdk$j2se_release-$j2se_vendor" + j2se_package="$j2se_vendor-java$j2se_release-jdk" + j2se_name="jdk-$j2se_version-$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 -Nru java-package-0.50ppa1/lib/j2se.sh java-package-0.52ppa1/lib/j2se.sh --- java-package-0.50ppa1/lib/j2se.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/j2se.sh 2012-08-30 15:36:47.000000000 +0000 @@ -80,9 +80,11 @@ program_base="\$1" shift for program in \$*; do - update-alternatives \\ - --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority \\ - --slave "/usr/share/man/man1/\$program.1.gz" "\$program.1.gz" "$jvm_base$j2se_name/man/man1/\$program.1.gz" + if [[ -f "\$program_base/\$program" ]]; then + update-alternatives \\ + --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority \\ + --slave "/usr/share/man/man1/\$program.1.gz" "\$program.1.gz" "$jvm_base$j2se_name/man/man1/\$program.1.gz" + fi done } @@ -91,7 +93,9 @@ program_base="\$1" shift for program in \$*; do - update-alternatives --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority + if [[ -f "\$program_base/\$program" ]]; then + update-alternatives --install "/usr/bin/\$program" "\$program" "\$program_base/\$program" $j2se_priority + fi done } @@ -102,7 +106,9 @@ local plugin_name="\$3" local plugin="\$4" [ -d "\$link_path" ] || install -d -m 755 "\$link_path" - update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" $j2se_priority + if [[ -f "\$plugin" ]]; then + update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" $j2se_priority + fi } EOF diff -Nru java-package-0.50ppa1/lib/oracle-j2re.sh java-package-0.52ppa1/lib/oracle-j2re.sh --- java-package-0.50ppa1/lib/oracle-j2re.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/oracle-j2re.sh 2012-08-30 15:36:47.000000000 +0000 @@ -1,71 +1,62 @@ # Detect product j2se_detect_oracle_j2re=oracle_j2re_detect oracle_j2re_detect() { - local found= + + if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] + then + j2se_release=${BASH_REMATCH[1]} + j2se_update=${BASH_REMATCH[2]} + j2se_arch=${BASH_REMATCH[3]} + j2se_version=$j2se_release.$j2se_update + j2se_priority=$((310 + $j2se_release - 1)) + j2se_expected_min_size=85 #Mb + + # check if the architecture matches + let compatible=1 - case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in - i386|i486-linux-gnu) - case "$archive_name" in - "jre-6u"[0-9][0-9]"-linux-i586.bin") # SUPPORTED - j2se_version=1.6.0+update${archive_name:6:2}${revision} - j2se_expected_min_size=16 #Mb - j2se_priority=314 - found=true - ;; - "jre-7u"[0-9]"-linux-i586.tar.gz") # SUPPORTED - j2se_version=1.7.0+update${archive_name:6:1}${revision} - j2se_expected_min_size=94 #Mb - j2se_priority=316 - found=true - ;; - esac - ;; - amd64|x86_64-linux-gnu) - case "$archive_name" in - "jre-6u"[0-9][0-9]"-linux-x64.bin") # SUPPORTED - j2se_version=1.6.0+update${archive_name:6:2}${revision} - j2se_expected_min_size=16 #Mb - j2se_priority=314 - found=true - ;; - "jre-7u"[0-9]"-linux-x64.tar.gz") # SUPPORTED - j2se_version=1.7.0+update${archive_name:6:1}${revision} - j2se_expected_min_size=88 #Mb - j2se_priority=316 - found=true - ;; - esac - ;; - esac - if [[ -n "$found" ]]; then - cat << EOF + case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in + i386|i486-linux-gnu) + if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi + ;; + amd64|x86_64-linux-gnu) + if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi + ;; + esac + + if [[ $compatible == 0 ]] + then + echo "The archive $archive_name is not supported on the ${DEB_BUILD_ARCH} architecture" + return + fi + + + cat << EOF Detected product: Java(TM) Runtime Environment (JRE) - Standard Edition, Version $j2se_version - Oracle Microsystems(TM), Inc. + Standard Edition, Version $j2se_release Update $j2se_update + Oracle(TM) EOF - if read_yn "Is this correct [Y/n]: "; then - j2se_found=true - j2se_release="${j2se_version:0:3}" - j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) - j2se_vendor="oracle" - j2se_title="Java(TM) JRE, Standard Edition, Oracle Microsystems(TM)" - - j2se_install=oracle_j2re_install - j2se_remove=oracle_j2re_remove - j2se_jinfo=oracle_j2re_jinfo - oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" - oracle_jre_bin_jre="javaws policytool" - oracle_no_man_jre_bin_jre="ControlPanel" - oracle_jre_lib_hl="jexec" - j2re_run - fi + if read_yn "Is this correct [Y/n]: "; then + j2se_found=true + j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) + j2se_vendor="oracle" + j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)" + + j2se_install=oracle_j2re_install + j2se_remove=oracle_j2re_remove + j2se_jinfo=oracle_j2re_jinfo + oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" + oracle_jre_bin_jre="javaws policytool" + oracle_no_man_jre_bin_jre="ControlPanel" + oracle_jre_lib_hl="jexec" + j2re_run fi + fi } oracle_j2re_install() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi @@ -78,11 +69,13 @@ plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH" install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so" install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so" +install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so" +install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so" EOF } oracle_j2re_remove() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi @@ -95,6 +88,8 @@ plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH" remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so" remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so" +remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so" +remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so" EOF } @@ -110,5 +105,7 @@ jinfos "hl" $jvm_base$j2se_name/lib/ $oracle_jre_lib_hl echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so" echo "plugin chromium-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so" + echo "plugin mozilla-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so" + echo "plugin firefox-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so" } diff -Nru java-package-0.50ppa1/lib/oracle-j2sdk-doc.sh java-package-0.52ppa1/lib/oracle-j2sdk-doc.sh --- java-package-0.50ppa1/lib/oracle-j2sdk-doc.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/oracle-j2sdk-doc.sh 2012-08-30 15:36:47.000000000 +0000 @@ -1,44 +1,45 @@ # Detect product oracle_j2sdk_doc_detect() { - local found= - case "$archive_name" in - "jdk-6u"[0-9][0-9]"-apidocs.zip") # SUPPORTED - j2se_version=1.6.0+update${archive_name:6:2}${revision} - j2se_expected_min_size=44 #Mb - found=true - ;; - "jdk-7u"[0-9]"-apidocs.zip") # SUPPORTED - j2se_version=1.7.0+update${archive_name:6:1}${revision} - j2se_expected_min_size=290 #Mb - found=true - ;; - esac - if [[ -n "$found" ]]; then - cat << EOF + + if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-apidocs\.zip ]] + then + j2se_release=${BASH_REMATCH[1]} + j2se_update=${BASH_REMATCH[2]} + j2se_version=$j2se_release.$j2se_update + + case "$j2se_release" in + 6) # JDK 6 + j2se_expected_min_size=44 #Mb + ;; + *) # JDK 7 and higher + j2se_expected_min_size=290 #Mb + ;; + esac + + cat << EOF Detected product: Java(TM) Development Kit (JDK) Documentation - Standard Edition, Version $j2se_version - Oracle(TM), Inc. + Standard Edition, Version $j2se_release Update $j2se_update + Oracle(TM) EOF - if read_yn "Is this correct [Y/n]: "; then - j2se_found=true - j2se_release="${j2se_version:0:3}" - j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) - j2se_vendor="oracle" - j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation" - - j2se_install=oracle_j2sdk_doc_install - j2se_remove=oracle_j2sdk_doc_remove - j2sdk_doc_run - fi + if read_yn "Is this correct [Y/n]: "; then + j2se_found=true + j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) + j2se_vendor="oracle" + j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation" + + j2se_install=oracle_j2sdk_doc_install + j2se_remove=oracle_j2sdk_doc_remove + j2sdk_doc_run fi + fi } j2se_detect_j2sdk_doc_oracle=oracle_j2sdk_doc_detect oracle_j2sdk_doc_install() { - cat << EOF + cat << EOF if [ ! -e "$javadoc_base$j2se_name" ]; then exit 0 fi @@ -53,7 +54,7 @@ } oracle_j2sdk_doc_remove() { - cat << EOF + cat << EOF if [ ! -e "$javadoc_base$j2se_name" ]; then exit 0 fi diff -Nru java-package-0.50ppa1/lib/oracle-j2sdk.sh java-package-0.52ppa1/lib/oracle-j2sdk.sh --- java-package-0.50ppa1/lib/oracle-j2sdk.sh 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/lib/oracle-j2sdk.sh 2012-08-30 15:36:47.000000000 +0000 @@ -1,72 +1,63 @@ # Detect product j2se_detect_oracle_j2sdk=oracle_j2sdk_detect oracle_j2sdk_detect() { - local found= + + if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] + then + j2se_release=${BASH_REMATCH[1]} + j2se_update=${BASH_REMATCH[2]} + j2se_arch=${BASH_REMATCH[3]} + j2se_version=$j2se_release.$j2se_update + j2se_priority=$((310 + $j2se_release)) + j2se_expected_min_size=130 #Mb + + # check if the architecture matches + let compatible=1 - case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in - i386|i486-linux-gnu) - case "$archive_name" in - "jdk-6u"[0-9][0-9]"-linux-i586.bin") # SUPPORTED - j2se_version=1.6.0+update${archive_name:6:2}${revision} - j2se_expected_min_size=130 #Mb - j2se_priority=315 - found=true - ;; - "jdk-7u"[0-9]"-linux-i586.tar.gz") # SUPPORTED - j2se_version=1.7.0+update${archive_name:6:1}${revision} - j2se_expected_min_size=190 #Mb - j2se_priority=317 - found=true - ;; - esac - ;; - amd64|x86_64-linux-gnu) - case "$archive_name" in - "jdk-6u"[0-9][0-9]"-linux-x64.bin") # SUPPORTED - j2se_version=1.6.0+update${archive_name:6:2}${revision} - j2se_expected_min_size=130 #Mb - j2se_priority=315 - found=true - ;; - "jdk-7u"[0-9]"-linux-x64.tar.gz") # SUPPORTED - j2se_version=1.7.0+update${archive_name:6:1}${revision} - j2se_expected_min_size=180 #Mb - j2se_priority=317 - found=true - ;; - esac - ;; - esac - if [[ -n "$found" ]]; then - cat << EOF + case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in + i386|i486-linux-gnu) + if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi + ;; + amd64|x86_64-linux-gnu) + if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi + ;; + esac + + if [[ $compatible == 0 ]] + then + echo "The archive $archive_name is not supported on the ${DEB_BUILD_ARCH} architecture" + return + fi + + + cat << EOF Detected product: Java(TM) Development Kit (JDK) - Standard Edition, Version $j2se_version - Oracle(TM), Inc. + Standard Edition, Version $j2se_release Update $j2se_update + Oracle(TM) EOF - if read_yn "Is this correct [Y/n]: "; then - j2se_found=true - j2se_release="${j2se_version:0:3}" - j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) - j2se_vendor="oracle" - j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM)" - - j2se_install=oracle_j2sdk_install - j2se_remove=oracle_j2sdk_remove - j2se_jinfo=oracle_j2sdk_jinfo - oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" - oracle_jre_bin_jre="javaws policytool" - oracle_no_man_jre_bin_jre="ControlPanel" - oracle_jre_lib_hl="jexec" - oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd native2ascii rmic serialver" - j2sdk_run - fi + if read_yn "Is this correct [Y/n]: "; then + j2se_found=true + j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) + j2se_vendor="oracle" + j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM)" + + j2se_install=oracle_j2sdk_install + j2se_remove=oracle_j2sdk_remove + j2se_jinfo=oracle_j2sdk_jinfo + oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" + oracle_jre_bin_jre="javaws policytool" + oracle_no_man_jre_bin_jre="ControlPanel" + oracle_jre_lib_hl="jexec" + oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd native2ascii rmic serialver" + j2sdk_run fi + fi } oracle_j2sdk_install() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi @@ -80,11 +71,13 @@ plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH" install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so" install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so" +install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so" +install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so" EOF } oracle_j2sdk_remove() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi @@ -98,6 +91,8 @@ plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH" remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so" remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so" +remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so" +remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so" EOF } @@ -114,4 +109,6 @@ jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so" echo "plugin chromium-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so" + echo "plugin mozilla-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so" + echo "plugin firefox-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so" } diff -Nru java-package-0.50ppa1/make-jpkg java-package-0.52ppa1/make-jpkg --- java-package-0.50ppa1/make-jpkg 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/make-jpkg 2012-08-30 15:36:47.000000000 +0000 @@ -40,40 +40,40 @@ echo "Internal error, fakeroot seems to fail faking root" >&2 exit 1 fi - exec fakeroot "$0" "$@" + exec fakeroot "$0" "$@" fi # check whether I'm real root, and bail out if so... ugly, but needed if touch /lib/.test 2>/dev/null; then - rm -f /lib/.test - echo "You are real root -- unfortunately, some Java distributions have" >&2 - echo "install scripts that directly manipulate /etc, and may cause some" >&2 - echo "inconsistencies on your system. Instead, you should become a" >&2 - echo "non-root user and run:" >&2 - echo >&2 - echo "fakeroot make-jpkg $@" >&2 - echo >&2 - echo "which will allow no damage to be done to your system files and" >&2 - echo "still permit the Java distribution to successfully extract." >&2 - echo >&2 - echo "Aborting." >&2 - exit 1 + rm -f /lib/.test + echo "You are real root -- unfortunately, some Java distributions have" >&2 + echo "install scripts that directly manipulate /etc, and may cause some" >&2 + echo "inconsistencies on your system. Instead, you should become a" >&2 + echo "non-root user and run:" >&2 + echo >&2 + echo "fakeroot make-jpkg $@" >&2 + echo >&2 + echo "which will allow no damage to be done to your system files and" >&2 + echo "still permit the Java distribution to successfully extract." >&2 + echo >&2 + echo "Aborting." >&2 + exit 1 fi ### Parse options print_usage() { - cat << EOF + cat << EOF Usage: $program_name [OPTION]... FILE $program_name builds a Debian package from the given Java binary distribution FILE Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE 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: @@ -108,27 +108,27 @@ # options while [[ $# -gt 0 && "x$1" == x--* ]]; do if [[ "x$1" == x--version ]]; then - echo "make-jpkg $version" - exit 0 + echo "make-jpkg $version" + exit 0 elif [[ "x$1" == x--help ]]; then - print_usage - exit 0 + print_usage + exit 0 elif [[ "x$1" == x--full-name ]]; then - [ $# -le 1 ] && missing_argument "$1" - shift - maintainer_name="$1" + [ $# -le 1 ] && missing_argument "$1" + shift + maintainer_name="$1" elif [[ "x$1" == x--email ]]; then - [ $# -le 1 ] && missing_argument "$1" - shift - maintainer_email="$1" + [ $# -le 1 ] && missing_argument "$1" + shift + maintainer_email="$1" elif [[ "x$1" == x--revision ]]; then - [ $# -le 1 ] && missing_argument "$1" - shift - revision="-${1}" + [ $# -le 1 ] && missing_argument "$1" + shift + revision="-${1}" elif [[ "x$1" == x--changes ]]; then - genchanges="true" + genchanges="true" else - unrecognized_option "$1" + unrecognized_option "$1" fi shift done @@ -166,7 +166,7 @@ on_exit() { lastcmd="$_" if [[ -z "$success" && -z "$failed" ]]; then - cat >&2 << EOF + cat >&2 << EOF Aborted ($lastcmd). @@ -174,9 +174,9 @@ fi # remove temporary directory if [ -n "$tmp" -a -d "$tmp" ]; then - echo -n "Removing temporary directory: " - rm -rf "$tmp" - echo "done" + echo -n "Removing temporary directory: " + rm -rf "$tmp" + echo "done" fi } trap on_exit EXIT @@ -226,13 +226,13 @@ for var in ${!j2se_detect_*}; do eval "\$$var" if [[ "$j2se_found" == "true" ]]; then - break; + break; fi done echo if [[ -z "$j2se_found" ]]; then - echo "No matching plugin was found." + echo "No matching packaging method was found for $archive_name. Please make sure you are using a tar.gz or self-extracting archive" fi diff -Nru java-package-0.50ppa1/make-jpkg.1 java-package-0.52ppa1/make-jpkg.1 --- java-package-0.50ppa1/make-jpkg.1 2012-08-05 03:20:55.000000000 +0000 +++ java-package-0.52ppa1/make-jpkg.1 2012-08-30 15:36:47.000000000 +0000 @@ -30,9 +30,9 @@ .PP Supported java binary distributions currently include: * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7 + - The J2SE Development Kit (JDK), version 6 and 7 + - The J2SE Runtime Environment (JRE), version 6 and 7 + - The J2SE API Javadoc, version 6 and 7 (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) .PP The following options are recognized: