From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Mon, 31 Mar 2008 06:18:50 +0000 (-0600)
Subject: Fix release script and update configure for STABLE3
X-Git-Tag: SQUID_3_0_STABLE3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34deba86b57393969d7ba65ff6d506edbe488162;p=thirdparty%2Fsquid.git

Fix release script and update configure for STABLE3
---

diff --git a/configure.in b/configure.in
index b881028a53..50eb224870 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl  $Id: configure.in,v 1.488.2.3 2008/03/04 12:17:04 amosjeffries Exp $
 dnl
 dnl
 dnl
-AC_INIT(Squid Web Proxy, 3.0.STABLE2-CVS, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 3.0.STABLE3-BZR, http://www.squid-cache.org/bugs/, squid)
 AC_PREREQ(2.52)
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
diff --git a/mkrelease.sh b/mkrelease.sh
index 42cd33dae4..fb1b9ee634 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -31,7 +31,13 @@ tmpdir=${TMPDIR:-${PWD}}/${name}-mkrelease
 rm -rf $name.tar.gz $tmpdir
 trap "rm -rf $tmpdir" 0
 
-bzr export $tmpdir $BZRROOT/$module/tags/$tag || exit 1
+# AYJ 2008-03-31: add the named tag for use below.
+bzr tag $tag
+bzr export -r tag:$tag $tmpdir || exit 1
+#
+# AYJ: 2008-03-31: initial export attempt dies on 'not a branch' error.
+# bzr export $tmpdir $BZRROOT/$module/tags/$tag || exit 1
+#
 if [ ! -f $tmpdir/configure ]; then
 	echo "ERROR! Tag $tag not found in $module"
 fi