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

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 87e34da4c5c56d2e70eca19e8b6a18c267fc0109
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 3 09:10:49 2013 +0100

    debian/patches/pass_options_to_gfortran: Drop patch (applied upstream)

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

-- 
Debian packaging for octave-odepkg