[apparmor] [patch] adjust bzr tag make target to not include embedded '~'

[John Johansen]

On 06/02/2011 05:53 PM, Steve Beattie wrote:
> This patch adjusts the tag make target to use a separate version with
> '~' replaced by '-'. This is needed for mirroring to git as git can't
> handle '~'s embedded in tag or branch names.
> 
> Tested by setting up a separate tag_version target like so:
> tag_version:
> 	echo ${TAG_VERSION}
> 
> Nominating for 2.6 as well.
> ---
>  Makefile |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> Index: b/Makefile
> ===================================================================
> --- a/Makefile
> +++ b/Makefile
> @@ -20,6 +20,11 @@ REPO_URL?=lp:apparmor
>  RELEASE_DIR=apparmor-${VERSION}
>  __SETUP_DIR?=.
>  
> +# We create a separate version for tags because git can't handle tags
> +# with embedded ~s in them. No spaces around '-' or they'll get
> +# embedded in ${VERSION}
> +TAG_VERSION=$(subst ~,-, ${VERSION})
> +
>  .PHONY: tarball
>  tarball: clean
>  	REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
> @@ -55,4 +60,5 @@ setup:
>  
>  .PHONY: tag
>  tag:
> -	bzr tag apparmor_${VERSION}
> +	bzr tag apparmor_${TAG_VERSION}
> +
> 
> 
Acked-by: John Johansen <john.johansen at canonical.com>