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

[Rafael Laboissiere]

Author: rafael
Date: 2009-04-06 19:24:08 +0000 (Mon, 06 Apr 2009)
New Revision: 2784

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Tighten the dependency to be exactly on the version of the current GCC suite

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-04-06 16:53:49 UTC (rev 2783)
+++ octave/trunk/debian/changelog	2009-04-06 19:24:08 UTC (rev 2784)
@@ -4,10 +4,11 @@
   * 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.
+    use versioned dependencies on gcc, gfortran, and g++.  Tighten the
+    dependency to be exactly on the version of the GCC suite which was used
+    to build the package.  This is needed because mkoctfiles hardcodes the
+    directories in OCTAVE_CONF_FLIBS with the gcc upstream version number.
+    This should fix issue LP#348472 reported against the Ubuntu package.
   * debian/in/control: The arm port has been dropped from Debian
     post-lenny.  Drop the special dependencies on the GCC suite packages
     for the arm architecture.

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2009-04-06 16:53:49 UTC (rev 2783)
+++ octave/trunk/debian/in/control	2009-04-06 19:24:08 UTC (rev 2784)
@@ -89,8 +89,7 @@
 
 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:Depends}, gcc ${gcc:Depends}, g++ ${gcc:Depends},
+Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), ${gcc:Depends},
  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-06 16:53:49 UTC (rev 2783)
+++ octave/trunk/debian/rules	2009-04-06 19:24:08 UTC (rev 2784)
@@ -21,10 +21,15 @@
 			'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')
+GCCCURVER	:= $(shell gcc --version | perl -ne '/Debian (.*)-/; print "$$1"; last')
+GCCNEXTVER	:= $(shell echo "$(GCCCURVER)" | \
+			perl -nle '@v=split(/\./);print join(".",(@v[0,$$\#v-1],$$v[$$\#v]+1))')
+GCCDEPS		:= $(shell perl -e 'print join (", ", map {					\
+					"$$_ (>= $(GCCCURVER)), $$_ (<< $(GCCNEXTVER))"	\
+				} ("gcc", "g++", "gfortran"))')
 
 hack:
-	@echo $(api_version)
+	@echo "$(GCCDEPS)"
 
 ifeq ($(major),3.1)
 priority	:= 70
@@ -459,7 +464,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a -l/usr/lib/octave-$(version)
-	echo 'gcc:Depends=(>= $(GCCVERSION))' >> $(debbase)/$(PACKAGE)-headers.substvars
+	echo 'gcc:Depends=$(GCCDEPS)' >> $(debbase)/$(PACKAGE)-headers.substvars
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a