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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-23 13:36:19 +0000 (Sun, 23 Mar 2008)
New Revision: 1493

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
octave*-headers depends on g++ 4.1 on arm

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-03-23 12:53:17 UTC (rev 1492)
+++ octave/trunk/debian/changelog	2008-03-23 13:36:19 UTC (rev 1493)
@@ -4,6 +4,9 @@
   * debian/in/control, debian/in/octave2.1-NEWS: Add notice in the package
     descriptions and in the NEWS file telling that the octave2.1* packages
     will be dropped post-lenny
+  * debian/in/control: octave*-headers depends on g++ 4.1 on arm.  This is
+    necessary because mkoctfile on arm has the CXX variable hardcoded to
+    g++-4.1.
 
   [ Thomas Weber ]
   * debian/rules: Call dh_md5sums, such that md5sums control files are

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-03-23 12:53:17 UTC (rev 1492)
+++ octave/trunk/debian/in/control	2008-03-23 13:36:19 UTC (rev 1493)
@@ -91,7 +91,8 @@
 
 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++, gfortran,
+Depends: octave[V_2_1:2.1:][V_3_0:3.0:] (= ${binary:Version}), gfortran,
+ g++ [!arm], g++-4.1 [arm],
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
  libblas-dev, liblapack-dev, libfftw3-dev,