Bug#743919: java-package: Does not honor --revision argument

[Alberto Caso Palomino]

Package: java-package
Version: 0.54
Severity: normal
Tags: patch

Version 0.35 added --revision argument and current versions
still accept it but don't use it (except for some ARM versions
of JDK 7).

Patch with a fix is attached.

Best regards,
--
Alberto Caso Palomino <alberto.c...@gobex.es>
Dir. Gral. de Admon. Electronica y Tecnologias de la Informacion.
Consejeria de Admon. Publica.
Gobierno de Extremadura.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages java-package depends on:
ii  debhelper   9.20140228
ii  fakeroot    1.20-3
ii  libasound2  1.0.27.2-3
ii  libx11-6    2:1.6.2-1
ii  unzip       6.0-11

Versions of packages java-package recommends:
ii  dpkg-dev  1.17.6
ii  gcc       4:4.8.2-3

Versions of packages java-package suggests:
pn  openjdk-7-jre  <none>

-- no debconf information

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index ee635d0..6d45ce5 100644
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -12,10 +12,10 @@ oracle_j2sdk_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update"
-      j2se_version=${j2se_release}u${j2se_update}
+      j2se_version=${j2se_release}u${j2se_update}${revision}
     else
       j2se_version_name="$j2se_release GA"
-      j2se_version=${j2se_release}
+      j2se_version=${j2se_release}${revision}
     fi
   fi
 
@@ -29,10 +29,10 @@ oracle_j2sdk_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision}
     else
       j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
     fi
   fi
 
diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index b558835..2e1ab8c 100644
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -12,10 +12,10 @@ oracle_j2re_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update"
-      j2se_version=${j2se_release}u${j2se_update}
+      j2se_version=${j2se_release}u${j2se_update}${revision}
     else
       j2se_version_name="$j2se_release GA"
-      j2se_version=${j2se_release}
+      j2se_version=${j2se_release}${revision}
     fi
   fi
 
@@ -29,10 +29,10 @@ oracle_j2re_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision}
     else
       j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
     fi
   fi