From c9222eb9c78be193155d70dce4f65766eb86d5bf Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Mon, 5 Sep 2011 00:13:01 +0200 Subject: [PATCH] Recognise pre-alpha, alpha, beta and rc version numbers in nightly build script and sort them accordingly Also bump version number in changelog again by one more tilde --- contrib/debian/nightlybuild.sh | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/debian/nightlybuild.sh b/contrib/debian/nightlybuild.sh index c9347f9..99ea555 100755 --- a/contrib/debian/nightlybuild.sh +++ b/contrib/debian/nightlybuild.sh @@ -166,7 +166,7 @@ else # Determine the correct version VERSION=`grep ^Version= $MASTERDIR/application.ini | \ - sed -e 's/^Version=//'`+git`date +%y%m%d` + sed -e 's/^Version=//;s/\(pre\)/~~\1/;s/\(rc\|b\|a\)/~\1/'`+git`date +%y%m%d` RELEASE="$VERSION-~nightlybuild$UNIXTIME" DATEDIR="$BUILDDIR/conkeror-$VERSION" diff --git a/debian/changelog b/debian/changelog index 0fe66ef..fa3b047 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -conkeror (1.0~pre-1) UNRELEASED; urgency=low +conkeror (1.0~~pre-1) UNRELEASED; urgency=low * Upstream version bump -- 2.11.4.GIT