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

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-21 13:13:46 +0000 (Thu, 21 Feb 2008)
New Revision: 1205

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
* debian/control: Build-depend on g++-4.3 on arm.  This is a desperate
  attempt to see whether we can get rid of the segfault problem on arm
  (cf Bug#458852)
* debian/rules: Use g++ and gcc 4.3 on arm architecture

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-17 22:28:56 UTC (rev 1204)
+++ octave/trunk/debian/changelog	2008-02-21 13:13:46 UTC (rev 1205)
@@ -1,3 +1,13 @@
+octave3.0 (1:3.0.0-4) UNRELEASED; urgency=low
+
+  * Uploaded to unstable
+  * debian/control: Build-depend on g++-4.3 on arm.  This is a desperate
+    attempt to see whether we can get rid of the segfault problem on arm
+    (cf Bug#458852)
+  * debian/rules: Use g++ and gcc 4.3 on arm architecture
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 21 Feb 2008 11:24:13 +0100
+
 octave3.0 (1:3.0.0-3) experimental; urgency=low
 
   * Added dpatches:

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-02-17 22:28:56 UTC (rev 1204)
+++ octave/trunk/debian/in/control	2008-02-21 13:13:46 UTC (rev 1205)
@@ -5,7 +5,7 @@
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>,
  Thomas Weber <thomas.weber.mail at gmail.com>
-Build-Depends: debhelper (>= 6.0.0), autoconf, texinfo,
+Build-Depends: g++-4.3 [arm], debhelper (>= 6.0.0), autoconf, texinfo,
  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),

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-02-17 22:28:56 UTC (rev 1204)
+++ octave/trunk/debian/rules	2008-02-21 13:13:46 UTC (rev 1205)
@@ -61,8 +61,13 @@
 #c_compiler	= /usr/bin/gcc-3.3
 #cxx_compiler	= /usr/bin/g++-3.3
 #f77_compiler	= /usr/bin/g77-3.3
+ifneq "$(findstring $(arch), arm-linux-gnu)" ""
+c_compiler	= gcc-4.3
+cxx_compiler	= g++-4.3
+else
 c_compiler	= gcc
 cxx_compiler	= g++
+endif
 f77_compiler	= gfortran
 fc_flag		=
 fc_libs		=