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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-23 19:34:06 +0000 (Sun, 23 Mar 2008)
New Revision: 1497

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Use the architecture tag "[m68k]" for the octave*-headers dependency on f2c

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-03-23 17:33:20 UTC (rev 1496)
+++ octave/trunk/debian/changelog	2008-03-23 19:34:06 UTC (rev 1497)
@@ -1,3 +1,12 @@
+octave3.0 (1:3.0.0-1) UNRELEASED; urgency=low
+
+  * Synched with the octave2.1 branch
+  * debian/rules, debian/in/control: Use the architecture tag "[m68k]" for
+    the octave*-headers dependency on f2c.  This eliminates the need for
+    using the substitution variable ${m68k:Depends}.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 23 Mar 2008 16:04:13 +0100
+
 octave2.1 (1:2.1.73-18) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-03-23 17:33:20 UTC (rev 1496)
+++ octave/trunk/debian/in/control	2008-03-23 19:34:06 UTC (rev 1497)
@@ -96,7 +96,7 @@
  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,
- ${m68k:Depends}
+ f2c [m68k]
 Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 3):]
 Provides: octave-headers
 Replaces: octave-headers

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-03-23 17:33:20 UTC (rev 1496)
+++ octave/trunk/debian/rules	2008-03-23 19:34:06 UTC (rev 1497)
@@ -431,9 +431,6 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a -l/usr/lib/octave-$(version)
-	if [ `dpkg-architecture -qDEB_BUILD_ARCH` = "m68k" ];then \
-		echo "m68k:Depends=f2c" >> debian/$(PACKAGE)-headers.substvars; \
-	fi
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a