From e4169af2c4b8f39056196c0362614c3b7a140c5a Mon Sep 17 00:00:00 2001 From: el_cubano Date: Sun, 28 Oct 2007 23:26:58 +0000 Subject: [PATCH] Fix computation of next version for release candidates git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7564 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/debian/changelog | 7 +++++++ Shorewall-common/debian/rules | 2 +- Shorewall-lite/debian/changelog | 7 +++++++ Shorewall-lite/debian/rules | 2 +- Shorewall-perl/debian/changelog | 7 +++++++ Shorewall-perl/debian/rules | 4 ++-- Shorewall-shell/debian/changelog | 7 +++++++ Shorewall-shell/debian/rules | 4 ++-- 8 files changed, 34 insertions(+), 6 deletions(-) diff --git a/Shorewall-common/debian/changelog b/Shorewall-common/debian/changelog index 04ffcd9bb..dc692f1ed 100644 --- a/Shorewall-common/debian/changelog +++ b/Shorewall-common/debian/changelog @@ -1,3 +1,10 @@ +shorewall-common (4.0.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * debian/rules: Fix computation of next version for release candidates + + -- Roberto C. Sanchez Sun, 28 Oct 2007 19:20:29 -0400 + shorewall-common (4.0.5-1) experimental; urgency=low * Initial release (Closes: #446657, #436071, #436072, #336088) diff --git a/Shorewall-common/debian/rules b/Shorewall-common/debian/rules index 26bc8249a..f37caab49 100755 --- a/Shorewall-common/debian/rules +++ b/Shorewall-common/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpatch/dpatch.make # shorewall version -export V=`cat install.sh | grep "^VERSION=" | head -n 1 | cut -f 2 -d "="` +export V=`grep "^VERSION=" install.sh | head -n 1 | cut -f 2 -d "="` SRWL=$(CURDIR)/debian/shorewall-common diff --git a/Shorewall-lite/debian/changelog b/Shorewall-lite/debian/changelog index f820fe210..6c64054c9 100644 --- a/Shorewall-lite/debian/changelog +++ b/Shorewall-lite/debian/changelog @@ -1,3 +1,10 @@ +shorewall-lite (4.0.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * debian/rules: Fix computation of next version for release candidates + + -- Roberto C. Sanchez Sun, 28 Oct 2007 19:21:52 -0400 + shorewall-lite (4.0.5-1) experimental; urgency=low * New upstream release (Closes: #430119) diff --git a/Shorewall-lite/debian/rules b/Shorewall-lite/debian/rules index 93c22d79e..a18d69364 100755 --- a/Shorewall-lite/debian/rules +++ b/Shorewall-lite/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpatch/dpatch.make # shorewall version -export V=`cat install.sh | grep "^VERSION=" | head -n 1 | cut -f 2 -d "="` +export V=`grep "^VERSION=" install.sh | head -n 1 | cut -f 2 -d "="` SRWL=$(CURDIR)/debian/shorewall-lite diff --git a/Shorewall-perl/debian/changelog b/Shorewall-perl/debian/changelog index 4a5b5d3ae..1fd95f86c 100644 --- a/Shorewall-perl/debian/changelog +++ b/Shorewall-perl/debian/changelog @@ -1,3 +1,10 @@ +shorewall-perl (4.0.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * debian/rules: Fix computation of next version for release candidates + + -- Roberto C. Sanchez Sun, 28 Oct 2007 19:22:16 -0400 + shorewall-perl (4.0.5-1) experimental; urgency=low * Initial release (Closes: #446645) diff --git a/Shorewall-perl/debian/rules b/Shorewall-perl/debian/rules index b24a4c0e1..317e34e73 100755 --- a/Shorewall-perl/debian/rules +++ b/Shorewall-perl/debian/rules @@ -7,11 +7,11 @@ include /usr/share/dpatch/dpatch.make # shorewall version -export V=`cat install.sh | grep "^VERSION=" | head -n 1 | cut -f 2 -d "="` +export V=`grep "^VERSION=" install.sh | head -n 1 | cut -f 2 -d "="` VMAJOR:=$(shell echo $(V) |cut -f 1 -d .) VMINOR:=$(shell echo $(V) |cut -f 2 -d .) VPATCH:=$(shell echo $(V) |cut -f 3 -d .) -NEXTPATCH:=$(shell expr $(VPATCH) + 1) +NEXTPATCH:=$(shell expr $(VPATCH) + 1 2>/dev/null || expr `echo $(VPATCH) | cut -f 1 -d - ` + 1) SRWL=$(CURDIR)/debian/shorewall-perl diff --git a/Shorewall-shell/debian/changelog b/Shorewall-shell/debian/changelog index f6f3c9c26..80d76410e 100644 --- a/Shorewall-shell/debian/changelog +++ b/Shorewall-shell/debian/changelog @@ -1,3 +1,10 @@ +shorewall-shell (4.0.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * debian/rules: Fix computation of next version for release candidates + + -- Roberto C. Sanchez Sun, 28 Oct 2007 19:22:28 -0400 + shorewall-shell (4.0.5-1) experimental; urgency=low * Initial release (Closes: #446644) diff --git a/Shorewall-shell/debian/rules b/Shorewall-shell/debian/rules index 42ba6c9c8..83ec4a3cf 100755 --- a/Shorewall-shell/debian/rules +++ b/Shorewall-shell/debian/rules @@ -7,11 +7,11 @@ include /usr/share/dpatch/dpatch.make # shorewall version -export V=`cat install.sh | grep "^VERSION=" | head -n 1 | cut -f 2 -d "="` +export V=`grep "^VERSION=" install.sh | head -n 1 | cut -f 2 -d "="` VMAJOR:=$(shell echo $(V) |cut -f 1 -d .) VMINOR:=$(shell echo $(V) |cut -f 2 -d .) VPATCH:=$(shell echo $(V) |cut -f 3 -d .) -NEXTPATCH:=$(shell expr $(VPATCH) + 1) +NEXTPATCH:=$(shell expr $(VPATCH) + 1 2>/dev/null || expr `echo $(VPATCH) | cut -f 1 -d - ` + 1) SRWL=$(CURDIR)/debian/shorewall-shell