]> git.etc.gen.nz Git - mythtv-status.git/commitdiff
Handle selecting version numbers like 0.10.0 as being higher than 0.9.0.
authorAndrew Ruthven <andrew@etc.gen.nz>
Wed, 13 Jun 2012 11:12:22 +0000 (23:12 +1200)
committerAndrew Ruthven <andrew@etc.gen.nz>
Wed, 13 Jun 2012 11:12:22 +0000 (23:12 +1200)
Makefile

index b20fef80e1be2fea5ed59b7e8120c1633f118d73..741f2c8a666e79813b0d8af343783d9ce5d971d8 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ release=sid
 sponsor_keyid=19D03486
 
 build=dpkg-buildpackage -rfakeroot -i'(.git|build|.gitignore|testing)*' -I.git -Ibuild -I.gitignore -Itesting -tc -k0C62B791
-version=$(shell git tag -l | grep '^[0-9]' | tail -1)
-deb_version=$(shell git tag -l | grep ^debian-$(release)-[[:digit:]] | tail -1 | sed 's/debian-$(release)-//' | sed 's/@/~/')
+version=$(shell git tag -l | grep '^[0-9]' | sort -t"." -k 1,1 -k 2,2 -k 3,3 -n | tail -1)
+deb_version=$(shell git tag -l | grep ^debian-$(release)-[[:digit:]] | sort -t"." -k 1,1 -k 2,2 -k 3,3 -n | tail -1 | sed 's/debian-$(release)-//' | sed 's/@/~/')
 
 deb=$(package)_$(deb_version)_all.deb
 orig_tarball=../$(package)_$(version).orig.tar.gz
@@ -37,7 +37,7 @@ build/$(release)/$(deb):
        @echo Building $(release)
        @ssh -t build-$(release)-i386 "cd `pwd`; $(build)"
        @ssh build-$(release)-i386 "cd `pwd`/..; /usr/bin/lintian -i -I $(package)_$(version)*.changes" || true
-       @ssh build-$(release)-i386 "cd `pwd`/..; /usr/bin/linda -i $(package)_$(version)*.changes" || true
+       #@ssh build-$(release)-i386 "cd `pwd`/..; /usr/bin/linda -i $(package)_$(version)*.changes" || true
        @mkdir -p build/$(release)
        @cp ../$(deb)  \
                ../$(package)_$(deb_version)_i386.changes \