Your message dated Sun, 29 Jul 2012 18:18:40 +0200
with message-id <[email protected]>
and subject line Re: Bug#682572: unblock: octave-java/1.2.8-6
has caused the Debian Bug report #682572,
regarding unblock: octave-java/1.2.8-6
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
682572: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682572
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: freeze-exception
Please unblock package octave-java
unblock octave-java/1.2.8-6
Critical bug fixed: #681355
Additionally fixed: #664776 (this just runs some test code at build time)
Debdiff attached (please note the comment in the patch, though: most of
the patch is just indenting adapted to a changed "if" line)
Thanks
Thomas
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru octave-java-1.2.8/debian/changelog octave-java-1.2.8/debian/changelog
--- octave-java-1.2.8/debian/changelog 2012-07-08 14:35:10.000000000 +0200
+++ octave-java-1.2.8/debian/changelog 2012-07-22 23:26:50.000000000 +0200
@@ -1,3 +1,13 @@
+octave-java (1.2.8-6) unstable; urgency=low
+
+ * Set and use JAVA_ARCH correctly on all platforms.
+ New patch: enable_preset_java_arch_value (Closes: #681355)
+ * Re-enable test suite.
+ The fix for #681355 should fix the bug with the test suite as well.
+ (Closes: #664776)
+
+ -- Thomas Weber <[email protected]> Sun, 22 Jul 2012 23:19:39 +0200
+
octave-java (1.2.8-5) unstable; urgency=low
* restore-locale.patch: new patch, restores locale after initializing the JVM
diff -Nru octave-java-1.2.8/debian/check.m octave-java-1.2.8/debian/check.m
--- octave-java-1.2.8/debian/check.m 2012-06-01 18:09:18.000000000 +0200
+++ octave-java-1.2.8/debian/check.m 2012-07-22 23:26:50.000000000 +0200
@@ -1,20 +1,18 @@
-%disp('Run a few examples from the package manual...')
+disp('Run a few examples from the package manual...')
-%javaclasspath
+javaclasspath
-%javamem
+javamem
-%a = javaArray('java.lang.String', 2, 2);
-%a(1,1) = 'Hello';
+a = javaArray('java.lang.String', 2, 2);
+a(1,1) = 'Hello';
-%o = javaObject('java.lang.StringBuffer');
-%o = javaObject('java.lang.StringBuffer', 'Initial');
-%o.toString;
+o = javaObject('java.lang.StringBuffer');
+o = javaObject('java.lang.StringBuffer', 'Initial');
+o.toString;
-%o = java_new('java.lang.StringBuffer', 'Initial');
-%o.toString;
+o = java_new('java.lang.StringBuffer', 'Initial');
+o.toString;
-%javamethods('java.lang.Double');
-
-disp('Running of checks disabled for the time being');
+javamethods('java.lang.Double');
diff -Nru octave-java-1.2.8/debian/control octave-java-1.2.8/debian/control
--- octave-java-1.2.8/debian/control 2012-06-01 18:10:03.000000000 +0200
+++ octave-java-1.2.8/debian/control 2012-07-22 23:26:50.000000000 +0200
@@ -5,7 +5,7 @@
Uploaders: Sébastien Villemot <[email protected]>,
Thomas Weber <[email protected]>
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 -Nru octave-java-1.2.8/debian/patches/enable_preset_java_arch_value octave-java-1.2.8/debian/patches/enable_preset_java_arch_value
--- octave-java-1.2.8/debian/patches/enable_preset_java_arch_value 1970-01-01 01:00:00.000000000 +0100
+++ octave-java-1.2.8/debian/patches/enable_preset_java_arch_value 2012-07-22 23:26:50.000000000 +0200
@@ -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 <[email protected]>
+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 -Nru octave-java-1.2.8/debian/patches/series octave-java-1.2.8/debian/patches/series
--- octave-java-1.2.8/debian/patches/series 2012-07-08 14:00:13.000000000 +0200
+++ octave-java-1.2.8/debian/patches/series 2012-07-22 23:26:50.000000000 +0200
@@ -1,2 +1,3 @@
+enable_preset_java_arch_value
libjvm.patch
restore-locale.patch
diff -Nru octave-java-1.2.8/debian/rules octave-java-1.2.8/debian/rules
--- octave-java-1.2.8/debian/rules 2012-07-08 12:01:53.000000000 +0200
+++ octave-java-1.2.8/debian/rules 2012-07-22 23:26:50.000000000 +0200
@@ -5,6 +5,10 @@
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 '{}' ';'
--- End Message ---
--- Begin Message ---
On 2012-07-23 21:36, Thomas Weber wrote:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: freeze-exception
>
> Please unblock package octave-java
> unblock octave-java/1.2.8-6
>
> Critical bug fixed: #681355
> Additionally fixed: #664776 (this just runs some test code at build time)
>
> Debdiff attached (please note the comment in the patch, though: most of
> the patch is just indenting adapted to a changed "if" line)
>
> Thanks
> Thomas
>
> [...]
>
Unblocked, thanks.
~Niels
--- End Message ---
