From a2c99aada00595e45f8f01d5f2b8ccabb85e6508 Mon Sep 17 00:00:00 2001 From: Karl Ramm Date: Thu, 8 Aug 2013 02:36:01 -0400 Subject: cleanup debian/changelog and fix the bug in the release script that was messing it up --- debian/changelog | 17 +++++++++++++---- release | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e55bce..ebcae7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,21 @@ -zephyr (1:3.1~beta1-trunk) UNRELEASED; urgency=low +zephyr (1:3.1~beta1-trunk) unstable; urgency=low - * Any further revisions to 3.0.x go on the 3.0.x branch; the mainline is for 3.1 stuff - * release 3.1-beta0 - * release 3.1~beta0 * release 3.1~beta1 -- Karl Ramm Thu, 08 Aug 2013 02:23:32 -0400 +zephyr (1:3.1-beta0-trunk) unstable; urgency=low + + * release 3.1-beta0 + + -- Karl Ramm Sun, 07 Jul 2013 22:08:01 -0400 + +zephyr (1:3.0.999-trunk) UNRELEASED; urgency=low + + * Any further revisions to 3.0.x go on the 3.0.x branch; the mainline is for 3.1 stuff + + -- Karl Ramm Sat, 11 Feb 2012 10:53:49 -0500 + zephyr (1:3.0.2-trunk) unstable; urgency=low * release 3.0.2 diff --git a/release b/release index 0616678..a56c131 100755 --- a/release +++ b/release @@ -11,6 +11,7 @@ if test -n "$(git status --porcelain)"; then exit 2 fi dch -b -v 1:${VERSION}-trunk release $VERSION +dch -r '' git add debian/changelog git commit -m "release $VERSION" TAGNAME=$(echo $VERSION | sed -e 's/~/%7E/') # sigh -- cgit v1.2.3