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

[Rafael Laboissiere]

Author: rafael
Date: 2009-04-06 16:50:04 +0000 (Mon, 06 Apr 2009)
New Revision: 2782

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Use versioned dependencies on gcc, gfortran, and g++

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-04-05 21:26:23 UTC (rev 2781)
+++ octave/trunk/debian/changelog	2009-04-06 16:50:04 UTC (rev 2782)
@@ -3,6 +3,11 @@
   * New upstream release
   * debian/patches/idx-not-volatile-in-eig.dpatch: Remove patch (applied
     upstream)
+  * debian/in/control, debian/rules: For the octaveX.Y-headers package,
+    use versioned dependencies on gcc, gfortran, and g++.  This is needed
+    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.
 
  -- 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-05 21:26:23 UTC (rev 2781)
+++ octave/trunk/debian/in/control	2009-04-06 16:50:04 UTC (rev 2782)
@@ -90,8 +90,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 [!arm], gcc-4.1 [arm], g++ [!arm], g++-4.1 [arm],
+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],
  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,

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-04-05 21:26:23 UTC (rev 2781)
+++ octave/trunk/debian/rules	2009-04-06 16:50:04 UTC (rev 2782)
@@ -21,6 +21,7 @@
 			'm/(\d\.\d)\.\d+/ and print $$1')
 PACKAGEVER	:= $(shell echo $(PACKAGE) | \
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
+GCCVERSION	:= $(shell gcc --version | perl -ne '/Debian (.*)-/; print "$$1"; last')
 
 hack:
 	@echo $(api_version)
@@ -458,6 +459,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a -l/usr/lib/octave-$(version)
+	echo 'gcc:Depends=(>= $(GCCVERSION))' >> $(debbase)/$(PACKAGE)-headers.substvars
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a