This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-package.
commit 2394e8cfc24cce50c76948e6350d785ed9e76786 Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 12 12:25:35 2014 +0100 Added support for ARM VFP/hard-float JDK releases --- debian/changelog | 8 ++++++++ lib/jdk.sh | 2 +- lib/oracle-jdk.sh | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7dfc04..23c78da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +java-package (0.54) UNRELEASED; urgency=medium + + * Team upload. + * Added support for ARM VFP/hard-float JDK releases. + Thanks to Christopher Huhn <[email protected]> (Closes: #724455) + + -- Emmanuel Bourg <[email protected]> Wed, 12 Feb 2014 12:14:36 +0100 + java-package (0.53) unstable; urgency=low * Team upload. diff --git a/lib/jdk.sh b/lib/jdk.sh index 7ae61f0..ae8d96f 100644 --- a/lib/jdk.sh +++ b/lib/jdk.sh @@ -3,7 +3,7 @@ j2sdk_control() { j2se_control java_browser_plugin="java-browser-plugin, " depends="\${shlibs:Depends}" - if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then + if [ "${DEB_BUILD_ARCH:0:3}" = "arm" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then # ARM is only softfloat ATM so if building on armhf # force the dependencies to pickup cross platform fu if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index 18a84ed..32e85cd 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -4,7 +4,7 @@ oracle_j2sdk_detect() { j2se_release=0 # Update or GA release (jdk-7u15-linux-i586.tar.gz) - if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] + if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} @@ -20,12 +20,12 @@ oracle_j2sdk_detect() { fi # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz) - if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] + if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)(-bin)?-(b[0-9]+)-linux-(i586|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} - j2se_build=${BASH_REMATCH[5]} - j2se_arch=${BASH_REMATCH[6]} + j2se_build=${BASH_REMATCH[6]} + j2se_arch=${BASH_REMATCH[7]} if [[ $j2se_update != "" ]] then j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-package.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
