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

[Rafael Laboissiere]

Author: rafael
Date: 2008-09-30 14:36:44 +0000 (Tue, 30 Sep 2008)
New Revision: 2438

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Cope with tilde (~) in the upstream version number

This is only for treating the special cases of release-candidat tarballs.
I do not thinkk we will actually release *.*~rc* versions, but who knows?


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-09-29 16:16:14 UTC (rev 2437)
+++ octave/trunk/debian/changelog	2008-09-30 14:36:44 UTC (rev 2438)
@@ -1,13 +1,17 @@
 octave3.0 (1:3.0.3~rc2-1) UNRELEASED; urgency=low
 
+  [ Thomas Weber ]
   * Change dont_set_helvetica.dpatch to use an asterisk (*) instead of an
     empty string for the font; see
     http://thread.gmane.org/gmane.comp.gnu.octave.bugs/9843
     for the reasoning. Saving greek symbols as .png or .jpeg continues to not
     work with this, though.
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 24 Sep 2008 20:49:07 +0200
+  [ Rafael Laboissiere ]
+  * debian/rules: Cope with tilde (~) in the upstream version number
 
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 30 Sep 2008 16:27:03 +0200
+
 octave3.0 (1:3.0.2-4) experimental; urgency=low
 
   * Add octaveX.Y-common package containing the architecture-independent

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-09-29 16:16:14 UTC (rev 2437)
+++ octave/trunk/debian/rules	2008-09-30 14:36:44 UTC (rev 2438)
@@ -16,14 +16,14 @@
 PACKAGE		:= $(shell head -1 debian/changelog | \
 			perl -nle 'm/^(\S+)\s+/ and print $$1')
 version       	:= $(shell head -1 debian/changelog | \
-			perl -nle 'm/\S+\s+\((?:\d:)*(\S+)-\S+\)/ and print $$1')
+			perl -nle 'm/\S+\s+\((?:\d:)*([\d.]+)(~[^-]+)*-\S+\)/ and print $$1')
 major       	:= $(shell echo $(version) | perl -nle \
 			'm/(\d\.\d)\.\d+/ and print $$1')
 PACKAGEVER	:= $(shell echo $(PACKAGE) | \
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
 
 hack:
-	@echo $(PACKAGEVER)
+	@echo $(version)
 
 ifeq ($(major),3.1)
 priority	:= 70
@@ -77,8 +77,7 @@
 compilerflags	= -O2 -g
 
 # default to blas, atlas can overload where available (see README.Atlas)
-#atlas		= --with-blas=/usr/lib/libblas.so \
-#		  --with-lapack=/usr/lib/liblapack.so
+#atlas		= --with-blas=/usr/lib/libblas.so \#		  --with-lapack=/usr/lib/liblapack.so
 #atlas		= --with-blas=/usr/lib/libblas-3.so \
 #		  --with-lapack=/usr/lib/liblapack-3.so
 atlas		= --with-blas=-lblas-3gf --with-lapack=-llapackgf-3