[Pkg-octave-commit] r2795 - octave/trunk/debian

[Rafael Laboissiere]

tags 523496 pending
thanks

Author: rafael
Date: 2009-04-10 18:12:43 +0000 (Fri, 10 Apr 2009)
New Revision: 2795

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Fix dependencies on gcc, g++, and gfortran

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-04-10 13:49:18 UTC (rev 2794)
+++ octave/trunk/debian/changelog	2009-04-10 18:12:43 UTC (rev 2795)
@@ -1,3 +1,12 @@
+octave3.0 (1:3.0.5-2) UNRELEASED; urgency=low
+
+  * debian/rules: Fix versioned dependencies on gcc, g++ and gfortran by
+    adding the lacking epoch to the them.  Also, add dependencies on the
+    -MAJOR.MINOR packages appropriately.  Thanks to Aaron M. Ucko for the
+    heads up and the proposed solution (closes: #523496).
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 10 Apr 2009 20:11:47 +0200
+
 octave3.0 (1:3.0.5-1) unstable; urgency=low
 
   [ Rafael Laboissiere ]
@@ -2,3 +11,3 @@
   * New upstream release
-    - Only change to 3.0.4: Fix regression when loading ascii files 
+    - Only change to 3.0.4: Fix regression when loading ascii files
       (closes: #523042)

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-04-10 13:49:18 UTC (rev 2794)
+++ octave/trunk/debian/rules	2009-04-10 18:12:43 UTC (rev 2795)
@@ -21,12 +21,18 @@
 			'm/(\d\.\d)\.\d+/ and print $$1')
 PACKAGEVER	:= $(shell echo $(PACKAGE) | \
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
+
 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"))')
+GCCMAJOR	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[0]')
+GCCMINOR	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[1]')
+GCCMICRO	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[2]')
+GCCDEPS		:= $(shell perl -e '										\
+	print join (", ", map {											\
+		join (", ", ("$$_ (>= 4:$(GCCMAJOR).$(GCCMINOR))",						\
+			"$$_ (<< 4:$(GCCMAJOR)." . ($(GCCMINOR)+1) . ")",					\
+			"$$_-$(GCCMAJOR).$(GCCMINOR) (>= $(GCCCURVER))",					\
+			"$$_-$(GCCMAJOR).$(GCCMINOR) (<< $(GCCMAJOR).$(GCCMINOR)." . ($(GCCMICRO)+1) .")"))	\
+	} ("gcc", "g++", "gfortran"))')
 
 hack:
 	@echo "$(GCCDEPS)"