[Pkg-octave-commit] rev 359 - trunk/packages/octave-forge/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-26 13:57:38 +0000 (Sat, 26 Nov 2005)
New Revision: 359

Modified:
   trunk/packages/octave-forge/debian/changelog
   trunk/packages/octave-forge/debian/control
   trunk/packages/octave-forge/debian/rules
Log:
Debian release octave-forge_2005.06.13-3

Modified: trunk/packages/octave-forge/debian/changelog
===================================================================
--- trunk/packages/octave-forge/debian/changelog	2005-11-26 01:10:56 UTC (rev 358)
+++ trunk/packages/octave-forge/debian/changelog	2005-11-26 13:57:38 UTC (rev 359)
@@ -1,3 +1,21 @@
+octave-forge (2005.06.13-3) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/control:
+    - Build-depends on gfortran for all achitectures, instead of g77 and
+      the special exception of fort77 on m68k.  I am glad we did this
+      move.
+    - Tight build-dependency on libginac-dev >= 1.3.3-2+b1, since this
+      library underwnet another ABI transition
+    - Bumped build-dependency octave2.1-headers >= 2.1.72-6
+    - Bumped build-dependency debhelper >= 4
+  * debian/rules:
+    - Removed special settign for the m68k architecture (fort77)
+    - Use /usr/bin/gfortran as the Fortran compiler
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Sat, 26 Nov 2005 11:31:12 +0100
+
 octave-forge (2005.06.13-2) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave-forge/debian/control
===================================================================
--- trunk/packages/octave-forge/debian/control	2005-11-26 01:10:56 UTC (rev 358)
+++ trunk/packages/octave-forge/debian/control	2005-11-26 13:57:38 UTC (rev 359)
@@ -4,7 +4,7 @@
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 3.0.0), octave2.1-headers (>= 2.1.65), xlibs-dev, g77 [!m68k], fort77 [m68k], libqhull-dev, libginac-dev (>= 1.3.2-2) [!m68k !mipsel], libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, dpatch
+Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-6), xlibs-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, dpatch
 Build-Conflicts: octave2.0-headers, octave2.0
 
 Package: octave-forge

Modified: trunk/packages/octave-forge/debian/rules
===================================================================
--- trunk/packages/octave-forge/debian/rules	2005-11-26 01:10:56 UTC (rev 358)
+++ trunk/packages/octave-forge/debian/rules	2005-11-26 13:57:38 UTC (rev 359)
@@ -33,20 +33,10 @@
 #fcpath		= /usr/bin/g77-3.2
 compilerpath	= /usr/bin/gcc
 cpppath		= /usr/bin/g++
-fcpath		= /usr/bin/g77
+fcpath		= /usr/bin/gfortran
 compilerflags	= "-O2"
 linkerflags	= "-s"
 
-## m68k barks when using g77; the m68k-buildd crew suggests this:
-## edd 28 Nov 2002  no longer needed
-## edd 02 Jun 2003  switched back, we need it after all
-## edd 02 Jul 2003  use fort77 which is wired in from mkoctfile
-#ifeq ($(arch),m68k-linux)
-ifneq "$(findstring $(arch), m68k-linux)" ""
-fcpath		= /usr/bin/fort77
-compilerflags	= "-O2 -ffloat-store"
-endif
-
 ## hppa needs g++-3.3
 ## edd 27 Jun 2003  now that gcc 3.3 is in unstable and testing, relax this
 #ifeq ($(arch),hppa-linux)