[Pkg-octave-commit] r1184 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-03 21:39:24 +0000 (Sun, 03 Feb 2008)
New Revision: 1184

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Preparation for the g77 -> gfortran switch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-03 17:17:22 UTC (rev 1183)
+++ octave/trunk/debian/changelog	2008-02-03 21:39:24 UTC (rev 1184)
@@ -4,10 +4,15 @@
   * debian/in/control:
     + Put the -htmldoc package in section "doc", agreeing with the
       override set by the Debian Installer
-  
+  * debian/in/control, debian/rules: Switched from g77 to gfortran.
+    + Changed the build-dependencies on refblas3-dev and lapack3-dev to
+      libblas-dev and liblapack-dev, respectively
+    + Changed the recommendation on atlas3-base to libatlas3gf-base
+    + Thanks to Pascal Dupuis for the original patch
+
   [ Thomas Weber ]
   * debian/compat: switch to level 6
-  * debian/in/control: 
+  * debian/in/control:
     + depend on debhelper >= 6
     + Don't depend on a specific g++ version (closes: #463302).
   * change slice term for 3.0 from 2.9:

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-02-03 17:17:22 UTC (rev 1183)
+++ octave/trunk/debian/in/control	2008-02-03 21:39:24 UTC (rev 1184)
@@ -6,13 +6,13 @@
 Uploaders: Rafael Laboissiere <rafael at debian.org>,
  Thomas Weber <thomas.weber.mail at gmail.com>
 Build-Depends: debhelper (>= 6.0.0), autoconf, texinfo,
- texlive-latex-base, texlive-generic-recommended, g77, libreadline5-dev,
+ texlive-latex-base, texlive-generic-recommended, gfortran, libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.5) |
  libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
- refblas3-dev, lapack3-dev,
+ libblas-dev, liblapack-dev,
  gnuplot-nox, libfftw3-dev, texi2html, less, dpatch,
  slice[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
+ libsuitesparse-dev (>= 3.1.0-1), gawk, gs-gpl, libcurl4-dev, libqhull-dev,
  desktop-file-utils:][V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
  desktop-file-utils:]
@@ -24,7 +24,7 @@
 Package: octave[V_2_1:2.1:][V_3_0:3.0:]
 Architecture: any
 Depends: ${shlibs:Depends}, texinfo
-Recommends: gnuplot, atlas3-base
+Recommends: gnuplot, libatlas3gf-base
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:]-info,
  octave[V_2_1:2.1:][V_3_0:3.0:]-doc,
  octave[V_2_1:2.1:][V_3_0:3.0:]-htmldoc,
@@ -79,7 +79,7 @@
 
 Package: octave[V_2_1:2.1:][V_3_0:3.0:]-headers
 Architecture: any
-Depends: octave[V_2_1:2.1:][V_3_0:3.0:] (= ${binary:Version}), g++, g77,
+Depends: octave[V_2_1:2.1:][V_3_0:3.0:] (= ${binary:Version}), g++, gfortran,
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
  refblas3-dev, lapack3-dev, libfftw3-dev,

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-02-03 17:17:22 UTC (rev 1183)
+++ octave/trunk/debian/rules	2008-02-03 21:39:24 UTC (rev 1184)
@@ -63,8 +63,8 @@
 #f77_compiler	= /usr/bin/g77-3.3
 c_compiler	= /usr/bin/gcc
 cxx_compiler	= /usr/bin/g++
-f77_compiler	= /usr/bin/g77
-fc_flag		= --with-f77=$(f77_compiler)
+f77_compiler	= /usr/bin/gfortran
+fc_flag		=
 fc_libs		=
 compilerflags	= -O2
 # linkerflags	= -s