From f5b4829b3e2de7f66177a3241aa28817b89ef155 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Wed, 13 Jun 2012 23:12:22 +1200 Subject: [PATCH] Handle selecting version numbers like 0.10.0 as being higher than 0.9.0. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b20fef8..741f2c8 100755 --- 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 \ -- 2.30.2