[Pkg-octave-devel] unblock: octave-odepkg/0.8.2-2

[Rafael Laboissiere]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package octave-odepkg

This version fixes the RC Bug#664797 by adding a thin patch to the
upstream Makefile, that fixes the setting of a gfortran option. This was
causing one the the unit testings to crash.

The patch has been accepted upstream. [1] [2]

The debdiff is attached below.

Thanks,

Rafael

unblock octave-odepkg/0.8.2-2

[1] http://permalink.gmane.org/gmane.comp.gnu.octave.devel/8053
[2] http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/odepkg/src/Makefile?r1=10624&r2=10830&pathrev=10830

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (650, 'testing'), (600, 'unstable'), (550, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
diff -Nru octave-odepkg-0.8.2/debian/changelog octave-odepkg-0.8.2/debian/changelog
--- octave-odepkg-0.8.2/debian/changelog	2012-04-20 20:50:08.000000000 +0200
+++ octave-odepkg-0.8.2/debian/changelog	2012-08-05 23:36:13.000000000 +0200
@@ -1,3 +1,10 @@
+octave-odepkg (0.8.2-2) unstable; urgency=low
+
+  * Ensure that the "-fno-automatic" flag is passed to gfortran
+    (Closes: #664797)
+
+ -- Thomas Weber <tweber at debian.org>  Sun, 05 Aug 2012 21:39:05 +0200
+
 octave-odepkg (0.8.2-1) unstable; urgency=low
 
   [ Rafael Laboissiere ]
diff -Nru octave-odepkg-0.8.2/debian/patches/pass_options_to_gfortran octave-odepkg-0.8.2/debian/patches/pass_options_to_gfortran
--- octave-odepkg-0.8.2/debian/patches/pass_options_to_gfortran	1970-01-01 01:00:00.000000000 +0100
+++ octave-odepkg-0.8.2/debian/patches/pass_options_to_gfortran	2012-08-05 23:36:13.000000000 +0200
@@ -0,0 +1,27 @@
+Description: Ensure that gfortran is called with the '-fno-automatic' option
+Author: Thomas Weber <tweber at debian.org>
+Last-Update: 2012-08-05
+Bug-Debian: http://bugs.debian.org/664797
+Forwarded: http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/odepkg/src/Makefile?r1=10624&r2=10830&pathrev=10830
+Applied-Upstream: rev 10830
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -11,14 +11,12 @@
+ # MKMEXFILE = $(MKOCTFILE) --mex
+ MKOCTFILE = mkoctfile
+ ifeq (gfortran,$(findstring gfortran,$(F77)))
+-  MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
++  FFLAGS := "-fno-automatic $(FFLAGS)"
+ endif
+ ifeq (g95,$(findstring g95,$(F77)))
+-  MKF77FILE = FFLAGS="-fstatic $(FFLAGS)" $(MKOCTFILE)
+-else
+-  # eg. the combination f2c with fort77
+-  MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
++  FFLAGS := "-fstatic $(FFLAGS)"
+ endif
++MKF77FILE = FFLAGS=$(FFLAGS) $(MKOCTFILE)
+ 
+ LAPACK_LIBS := $(shell mkoctfile -p BLAS_LIBS LAPACK_LIBS)
+ FLIBS := $(shell mkoctfile -p FLIBS)
diff -Nru octave-odepkg-0.8.2/debian/patches/series octave-odepkg-0.8.2/debian/patches/series
--- octave-odepkg-0.8.2/debian/patches/series	2012-04-20 20:30:43.000000000 +0200
+++ octave-odepkg-0.8.2/debian/patches/series	2012-08-05 23:36:13.000000000 +0200
@@ -1 +1,2 @@
+pass_options_to_gfortran
 info-dir-section.diff