[Pkg-octave-commit] rev 357 - in trunk/packages/octave/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-26 01:07:30 +0000 (Sat, 26 Nov 2005)
New Revision: 357

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_2.1.72-6

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-24 21:41:39 UTC (rev 356)
+++ trunk/packages/octave/debian/changelog	2005-11-26 01:07:30 UTC (rev 357)
@@ -1,3 +1,15 @@
+octave2.1 (2.1.72-6) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/in/control: The package now build-depends on gfortran on all
+    architectures, incluing m68k, which used to build-depend on fort77.
+  * debian/rules: Removed all m68k-specific settings.  This should fix the
+    FTBFS on m68k.  Thanks to Stephen R Marenka <stephen at marenka.net>
+    for the patch (closes: #340773)
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Fri, 25 Nov 2005 23:05:29 +0100
+
 octave2.9 (2.9.4-7) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2005-11-24 21:41:39 UTC (rev 356)
+++ trunk/packages/octave/debian/in/control	2005-11-26 01:07:30 UTC (rev 357)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autoconf, texinfo, tetex-bin, gfortran [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.4-2) | libhdf5-lam-dev (>= 1.6.4-2) | libhdf5-mpich-dev (>= 1.6.4-2), refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, dpatch[V_2_9:, glpk, libglpk0, libumfpack4-dev (>= 4.4):]
+Build-Depends: debhelper (>= 4.0.0), autoconf, texinfo, tetex-bin, gfortran, libreadline5-dev, libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.4-2) | libhdf5-lam-dev (>= 1.6.4-2) | libhdf5-mpich-dev (>= 1.6.4-2), refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, dpatch[V_2_9:, glpk, libglpk0, libumfpack4-dev (>= 4.4):]
 Standards-Version: 3.6.2
 
 Package: octave[V_2_1:2.1:][V_2_9:2.9:]

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-11-24 21:41:39 UTC (rev 356)
+++ trunk/packages/octave/debian/rules	2005-11-26 01:07:30 UTC (rev 357)
@@ -64,7 +64,7 @@
 arch 		:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ## edd 20 Jun 2002      no optimisation or debugging on baby systems
-ifneq "$(findstring $(arch), m68k-linux-gnu arm-linux-gnu)" ""
+ifneq "$(findstring $(arch), arm-linux-gnu)" ""
 compilerflags	= -O0 -g0
 endif
 
@@ -73,16 +73,6 @@
 atlas		= --without-blas
 endif
 
-## edd 25 May 2003      actually, we need -O1 on m68k, as well as f2c
-## edd 02 Jul 2003      use fort77 instead for its comman cmdline options
-#ifeq ($(arch),m68k-linux)
-ifneq "$(findstring $(arch), m68k-linux-gnu)" ""
-f77_compiler	= /usr/bin/fort77
-fc_flag		= --with-f77=/usr/bin/fort77 --without-f2c
-fc_libs		= -lf2c
-compilerflags	= -O0 -g0
-endif
-
 #export DH_VERBOSE=1
 #export DH_COMPAT=3