From c34b030e217fbd3b7cb5d425015a40f5eebd5943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Dequ=C3=A8nes=20=28Duck=29?= <Duck@DuckCorp.org>
Date: Sat, 19 Oct 2013 14:57:15 +0200
Subject: [PATCH] bip-release script can now handle an optional release name

This release name is used in the git tag. The previous 'release'
variable was renamed in 'release_version' to avoid confusion.
---
 scripts/bip-release | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/bip-release b/scripts/bip-release
index 4051e83..cfec8bc 100755
--- a/scripts/bip-release
+++ b/scripts/bip-release
@@ -7,13 +7,14 @@ if [ ! -d src ] ; then
 	exit 1
 fi
 
-release="$1"
+release_version="$1"
+release_name="$2"
 : ${MAKEOPTS:=-j -l4}
 
 set_version() {
-	local release
-	release="${1}"
-	sed -i -e '/^AC_INIT/s/\(, \[\)[^]]*/\1'${release}'/' configure.ac
+	local release_version
+	release_version="${1}"
+	sed -i -e '/^AC_INIT/s/\(, \[\)[^]]*/\1'${release_version}'/' configure.ac
 }
 
 get_version() {
@@ -35,17 +36,21 @@ make_distcheck() {
 }
 
 git log > ChangeLog
-if [ -n "$release" ]; then
-	set_version "${release}"
+if [ -n "$release_version" ]; then
+	set_version "${release_version}"
 	make_distcheck || exit 1
 
-	git commit -a -m "Update version and ChangeLog for bip-${release} release."
-	git tag -s release-$release
+	git commit -a -m "Update version and ChangeLog for bip-${release_version} release."
+	TAG_COMMENT="Release ${release_version}"
+	if [ -n "${release_name}" ]; then
+		TAG_COMMENT="${TAG_COMMENT} '${release_name}'"
+	fi
+	git tag -s -m "${TAG_COMMENT}" release-${release_version}
 
-	set_version "${release}-git"
+	set_version "${release_version}-git"
 	git commit -a -m "Add -git to version string."
 
-	echo "See bip-${release}.tar.gz"
+	echo "See bip-${release_version}.tar.gz"
 else
 	make_distcheck || exit 1