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

[Rafael Laboissiere]

Author: rafael
Date: 2009-04-06 16:53:49 +0000 (Mon, 06 Apr 2009)
New Revision: 2783

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
Drop special dependencies for the arm architecture

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-04-06 16:50:04 UTC (rev 2782)
+++ octave/trunk/debian/changelog	2009-04-06 16:53:49 UTC (rev 2783)
@@ -8,6 +8,9 @@
     because mkoctfiles hardcodes the directories in OCTAVE_CONF_FLIBS with
     the gcc upstream version number.  This should partially fix issue
     LP#348472 reported against the Ubuntu package.
+  * debian/in/control: The arm port has been dropped from Debian
+    post-lenny.  Drop the special dependencies on the GCC suite packages
+    for the arm architecture.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 05 Apr 2009 15:36:41 +0200
 

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2009-04-06 16:50:04 UTC (rev 2782)
+++ octave/trunk/debian/in/control	2009-04-06 16:53:49 UTC (rev 2783)
@@ -67,7 +67,6 @@
  The recommended branch of Octave is 3.0.  The 3.1 branch is
  experimental and is considered to be unstable.:]
 
-
 Package: octave[V_3_0:3.0:][V_3_1:3.1:]-htmldoc
 Architecture: all
 Section: doc
@@ -90,8 +89,8 @@
 
 Package: octave[V_3_0:3.0:][V_3_1:3.1:]-headers
 Architecture: any
-Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), gfortran ${gcc:Depends},
- gcc ${gcc:Depends} [!arm], gcc-4.1 ${gcc:Depends} [arm], g++ ${gcc:Depends} [!arm], g++-4.1 ${gcc:Depends} [arm],
+Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}),
+ gfortran ${gcc:Depends}, gcc ${gcc:Depends}, g++ ${gcc:Depends},
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5) | libhdf5-openmpi-dev (>= 1.6.5),
  libblas-dev, liblapack-dev, libfftw3-dev,