[Pkg-octave-commit] rev 65 - trunk/packages/octave2.1/debian

Adam Conrad adconrad@costa.debian.org
Tue, 15 Feb 2005 05:58:43 +0100


Author: adconrad
Date: 2005-02-15 05:58:42 +0100 (Tue, 15 Feb 2005)
New Revision: 65

Modified:
   trunk/packages/octave2.1/debian/changelog
   trunk/packages/octave2.1/debian/control
   trunk/packages/octave2.1/debian/rules
Log:
f2c depends on m68k


Modified: trunk/packages/octave2.1/debian/changelog
===================================================================
--- trunk/packages/octave2.1/debian/changelog	2005-02-13 21:40:47 UTC (rev 64)
+++ trunk/packages/octave2.1/debian/changelog	2005-02-15 04:58:42 UTC (rev 65)
@@ -1,3 +1,12 @@
+octave2.1 (2.1.64-4) unstable; urgency=low
+
+UNRELEASED
+
+  +++ Changes by Adam Conrad:
+
+  * Add logic to debian/rules and debian/control to make sure that
+    octave2.1-headers depends on f2c on m68k (closes: #292917)
+
 octave2.1 (2.1.64-3) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere:

Modified: trunk/packages/octave2.1/debian/control
===================================================================
--- trunk/packages/octave2.1/debian/control	2005-02-13 21:40:47 UTC (rev 64)
+++ trunk/packages/octave2.1/debian/control	2005-02-15 04:58:42 UTC (rev 65)
@@ -57,7 +57,7 @@
 
 Package: octave2.1-headers
 Architecture: any
-Depends: octave2.1 (= ${Source-Version}), g++, g77 | fort77, libreadline5-dev, libncurses5-dev, libhdf5-serial-dev | libhdf5-lam-dev | libhdf5-mpich-dev, lapack3-dev | atlas3-base-dev | liblapack-3.so, refblas3-dev | atlas3-base-dev | libblas-3.so, fftw3-dev
+Depends: octave2.1 (= ${Source-Version}), g++, g77 | fort77, libreadline5-dev, libncurses5-dev, libhdf5-serial-dev | libhdf5-lam-dev | libhdf5-mpich-dev, lapack3-dev | atlas3-base-dev | liblapack-3.so, refblas3-dev | atlas3-base-dev | libblas-3.so, fftw3-dev, ${m68k:Depends}
 Conflicts: octave-headers
 Provides: octave-headers
 Replaces: octave-headers

Modified: trunk/packages/octave2.1/debian/rules
===================================================================
--- trunk/packages/octave2.1/debian/rules	2005-02-13 21:40:47 UTC (rev 64)
+++ trunk/packages/octave2.1/debian/rules	2005-02-15 04:58:42 UTC (rev 65)
@@ -268,6 +268,9 @@
 #	dh_suidregister -a
 	dh_installdeb -a
 	dh_shlibdeps -a
+	if [ `dpkg-architecture -qDEB_BUILD_ARCH` = "m68k" ];then \
+		echo "m68k:Depends=f2c" >> debian/octave2.1-headers.substvars; \
+	fi
 	dh_gencontrol -a
 #	dh_makeshlibs -a
 #	dh_md5sums -a