From c5abf53ab9ff849c1f0cdd893b069c9846b4dd15 Mon Sep 17 00:00:00 2001
From: Steve Youngs <steve@steveyoungs.com>
Date: Sun, 19 Jun 2011 12:30:03 +1000
Subject: [PATCH] Migrate tla related stuff to git

	* build.sh (all): Add `tver' variable to hold non-git version.
	  Use `git describe' instead of tla commands to get version.

	* .gitignore: New file

	* *: Update my email and copyright notices everywhere.

Signed-off-by: Steve Youngs <steve@steveyoungs.com>
---
 .gitignore | 29 +++++++++++++++++++++++++++++
 build.sh   |  9 +++++----
 zcdrip.in  | 10 +++++-----
 zdiscid.c  |  8 ++++----
 4 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e55091c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+####
+# This file is used to ignore certain files in the repo, such as
+# anything that is generated by the build, etc.
+#
+# The zcdrip project uses a single .gitignore, so please DO NOT add
+# any .gitignore files to any of the sub directories.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard' command after
+# changing this file, to see if there are any tracked files which get
+# ignored after the change.
+####
+
+## Standard stuff
+*~
+*.orig
+\#*#
+*.o
+*.a
+*.i
+
+## build generated
+zcdrip
+ecdrip
+zdiscid
+
+## Because I'm so used to arch (tla)
+,,*
+++*
+=build
diff --git a/build.sh b/build.sh
index 046d2d5..9cb9d65 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,9 @@
 #!/bin/zsh
 
-## Copyright (C) 2006, 2007 Steve Youngs
+## Copyright (C) 2006 - 2011 Steve Youngs
 
-## Author:        Steve Youngs <steve@sxemacs.org>
-## Maintainer:    Steve Youngs <steve@sxemacs.org>
+## Author:        Steve Youngs <steve@steveyoungs.com>
+## Maintainer:    Steve Youngs <steve@steveyoungs.com>
 ## Created:       <2006-08-16>
 
 ## This file is part of zcdrip
@@ -49,7 +49,8 @@ all ()
 {
     clean
     sub=@VERSION@
-    rep=$(tla logs --full|tail -n1)
+    tver=v0.7
+    rep=$(git describe 2>/dev/null||echo ${tver})
     zmodload -i zsh/mapfile
     gcc -Wall -o zdiscid zdiscid.c
     mapfile[zcdrip]=${mapfile[zcdrip.in]/$sub/$rep}
diff --git a/zcdrip.in b/zcdrip.in
index 768799b..ce096b7 100644
--- a/zcdrip.in
+++ b/zcdrip.in
@@ -1,11 +1,11 @@
 #!/bin/zsh
 
-## Copyright (C) 2006 - 2008 Steve Youngs
+## Copyright (C) 2006 - 2011 Steve Youngs
 
-## Author:        Steve Youngs <steve@sxemacs.org>
-## Maintainer:    Steve Youngs <steve@sxemacs.org>
+## Author:        Steve Youngs <steve@steveyoungs.com>
+## Maintainer:    Steve Youngs <steve@steveyoungs.com>
 ## Created:       <2006-08-08>
-## Time-stamp:    <Thursday Jun 12, 2008 12:29:31 steve>
+## Time-stamp:    <Sunday Jun 19, 2011 12:21:40 steve>
 
 ## Redistribution and use in source and binary forms, with or without
 ## modification, are permitted provided that the following conditions
@@ -62,7 +62,7 @@ ourname=${0##*/}
 
 # Version info.
 VERSION=@VERSION@
-COPYRIGHT="Copyright (C) 2006 - 2008 Steve Youngs <steve@sxemacs.org>"
+COPYRIGHT="Copyright (C) 2006 - 2011 Steve Youngs <steve@steveyoungs.com>"
 
 version_str="${ourname}: ${VERSION}
 ${COPYRIGHT}"
diff --git a/zdiscid.c b/zdiscid.c
index 60158a3..9953812 100644
--- a/zdiscid.c
+++ b/zdiscid.c
@@ -1,13 +1,13 @@
 /* zdiscid.c -- Print the CDDB disc ID for an audio CD  */
 
 /* 
- * Copyright (C) 2006, 2007 Steve Youngs
+ * Copyright (C) 2006 - 2011 Steve Youngs
  */
 
 /* 
- * Author:        Steve Youngs <steve@sxemacs.org>  
- * Maintainer:    Steve Youngs <steve@sxemacs.org>  
- * Created:       <2006-08-13>  
+ * Author:        Steve Youngs <steve@steveyoungs.com>
+ * Maintainer:    Steve Youngs <steve@steveyoungs.com>
+ * Created:       <2006-08-13>
  */
  
 /*
-- 
2.25.1