[Pkg-octave-commit] [SCM] Debian packaging for octave-java branch, master, updated. debian/1.2.8-5-3-g02d75db

[Thomas Weber]

The following commit has been merged in the master branch:
commit 401bd399aa005488f2152681a533ad0a15b426ea
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Jul 22 23:12:37 2012 +0200

    Set and use JAVA_ARCH correctly on all platforms
    
    We use the javahelper package and change upstream's configure script
    such that it uses the given value.
    New patch: enable_preset_java_arch_value
    
    Closes: #681355

diff --git a/debian/control b/debian/control
index 6172e89..640bd93 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Sébastien Villemot <sebastien.villemot at ens.fr>,
            Thomas Weber <tweber at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.1),
- openjdk-7-jdk
+ openjdk-7-jdk, javahelper
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
 Homepage: http://octave.sourceforge.net/java
diff --git a/debian/patches/enable_preset_java_arch_value b/debian/patches/enable_preset_java_arch_value
new file mode 100644
index 0000000..aaf10fa
--- /dev/null
+++ b/debian/patches/enable_preset_java_arch_value
@@ -0,0 +1,42 @@
+Description: Use a previously set value of JAVA_ARCH
+ The patch looks larger than it is due to indenting. It just closes an "if" earlier.
+Author: Thomas Weber <tweber at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/681355
+Forwarded: http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/extra/java/src/configure.base?revision=10762&view=markup
+Applied-Upstream: rev 10762
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/configure
++++ b/src/configure
+@@ -3302,18 +3302,18 @@
+           elif test -d "${JAVA_HOME}/jre/lib/solarisv9"; then
+             JAVA_ARCH="solarisv9"
+           fi
+-          if test -n "$JAVA_ARCH"; then
+-            HAVE_JAVA=yes
+-            case "$canonical_host_type" in
+-              *-mingw* | *-cygwin*)
+-                JAVA_LIBS=-ladvapi32
+-                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
+-                ;;
+-              *)
+-                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
+-                ;;
+-            esac
+-          fi
++        fi
++	if test -n "$JAVA_ARCH"; then
++          HAVE_JAVA=yes
++          case "$canonical_host_type" in
++            *-mingw* | *-cygwin*)
++              JAVA_LIBS=-ladvapi32
++              JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
++              ;;
++            *)
++              JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
++              ;;
++          esac
+         fi
+         ;;
+     esac
diff --git a/debian/patches/series b/debian/patches/series
index 2657c7b..0b37f54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+enable_preset_java_arch_value
 libjvm.patch
 restore-locale.patch
diff --git a/debian/rules b/debian/rules
index 2aa1c76..1ca28c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@ export JAVA_HOME = /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
+# take value for JAVA_ARCH from javahelper and export it
+include /usr/share/javahelper/java-vars.mk
+export JAVA_ARCH
+
 # Hack to workaround wrong permissions in upstream tarball
 binary-fixup/octave-java::
 	find debian/octave-java/usr/share/octave/packages/ -type f -exec chmod -x '{}' ';'

-- 
Debian packaging for octave-java