[Pkg-octave-commit] rev 313 - trunk/packages/octave/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-05 09:31:17 +0000 (Sat, 05 Nov 2005)
New Revision: 313

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/rules
Log:
Cope with the new output of dpkg-architecture for arm and m68k


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-04 20:40:16 UTC (rev 312)
+++ trunk/packages/octave/debian/changelog	2005-11-05 09:31:17 UTC (rev 313)
@@ -1,3 +1,15 @@
+octave2.9 (2.1.71-8) unstable; urgency=low
+
+   NOT YET RELEASED!
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/rules: cope with the new output of dpkg-architecture for arm
+    and m68k, which changed recently (thanks to Christian T. Steigies
+    <cts at debian.org> for spotting the problem)
+
+ --
+
 octave2.9 (2.9.3-1) experimental; urgency=low
 
    +++ Changes by Colin Ingram

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-11-04 20:40:16 UTC (rev 312)
+++ trunk/packages/octave/debian/rules	2005-11-05 09:31:17 UTC (rev 313)
@@ -54,7 +54,7 @@
 arch 		:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ## edd 20 Jun 2002      no optimisation or debugging on baby systems
-ifneq "$(findstring $(arch), m68k-linux arm-linux)" ""
+ifneq "$(findstring $(arch), m68k-linux-gnu arm-linux-gnu)" ""
 compilerflags	= -O0 -g0
 endif
 
@@ -66,7 +66,7 @@
 ## edd 25 May 2003      actually, we need -O1 on m68k, as well as f2c
 ## edd 02 Jul 2003      use fort77 instead for its comman cmdline options
 #ifeq ($(arch),m68k-linux)
-ifneq "$(findstring $(arch), m68k-linux)" ""
+ifneq "$(findstring $(arch), m68k-linux-gnu)" ""
 f77_compiler	= /usr/bin/fort77
 fc_flag		= --with-f77=/usr/bin/fort77 --without-f2c
 fc_libs		= -lf2c