[Pkg-octave-commit] [octave] 03/08: Use default version of gcc (v6 in unstable since 2016-08-05)

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch experimental
in repository octave.

commit 40c833ac16ce0d8c4a78881514e6e5f52d6020e0
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Aug 7 06:41:26 2016 -0300

    Use default version of gcc (v6 in unstable since 2016-08-05)
---
 debian/control | 6 ++----
 debian/rules   | 5 -----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 00e5e4f..c002ed7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,8 @@ Build-Depends: automake,
   dpkg-dev (>= 1.16.1),
   epstool,
   flex,
-  g++-6,
   gawk,
-  gcc-6,
-  gfortran-6,
+  gfortran,
   ghostscript,
   gnuplot-nox,
   javahelper,
@@ -219,7 +217,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich-dev (>= 1.8.8),
  libgl1-mesa-dev | libgl-dev,
  libblas-dev (>=1.2-7) | libblas.so, liblapack-dev (>=3.2.1-7) | liblapack.so,
- libfftw3-dev, gfortran-6, gcc-6, g++-6
+ libfftw3-dev, gfortran, gcc, g++
 Section: libdevel
 Description: Development files for the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
diff --git a/debian/rules b/debian/rules
index 88935b5..441b33b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,11 +42,6 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
 	--with-hdf5-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 endif
 
-# Force gcc-6
-export CC=gcc-6
-export CXX=g++-6
-export F77=gfortran-6
-
 %:
 	dh $@ --with autoreconf --parallel
 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git