[Pkg-octave-commit] [SCM] Debian packaging for octave-odepkg branch, master, updated. debian/0.8.2-1-2-gfe5505b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 87b565a8939fbab1e0c151172049c50cff50c8e7
Author: Thomas Weber <tweber at debian.org>
Date:   Thu Aug 2 19:10:37 2012 +0200

    Ensure that the "-fno-automatic" flag is passed to gfortran
    
    Closes: #664797

diff --git a/debian/patches/pass_options_to_gfortran b/debian/patches/pass_options_to_gfortran
new file mode 100644
index 0000000..7ee93fe
--- /dev/null
+++ b/debian/patches/pass_options_to_gfortran
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 9262944..466a96a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+pass_options_to_gfortran
 info-dir-section.diff

-- 
Debian packaging for octave-odepkg