From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sun, 27 Jul 2008 09:28:37 +0000 (+1200)
Subject: Merge commit 'origin/master' into packaging
X-Git-Tag: debian-etch-0.9.0-1^0
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81a062cec8215dff751c7fee7a69d6e1b663e82;p=mythtv-status.git

Merge commit 'origin/master' into packaging

Conflicts:

	Makefile
---

a81a062cec8215dff751c7fee7a69d6e1b663e82
diff --cc Makefile
index ea5eb8c,c7907a0..65ecbe6
--- a/Makefile
+++ b/Makefile
@@@ -5,8 -5,8 +5,8 @@@ releases=etc
  sponsor_keyid=19D03486
  
  build=dpkg-buildpackage -sn -uc -us -rfakeroot -i'(.git|build|.gitignore|testing)*' -I.git -Ibuild -I.gitignore -Itesting
 -version=$(shell git-tag -l | grep '^[0-9]' | tail -1)
 -deb_version=$(shell git-tag -l | grep ^debian-[[:digit:]] | tail -1 | sed 's/debian-//')
 +version=$(shell git-tag -l | grep -v ^debian | tail -1)
- deb_version=$(shell git-tag -l | grep ^debian-puck | tail -1 | sed 's/debian-puck-//')
++deb_version=$(shell git-tag -l | grep ^debian-etch-[[:digit:]] | tail -1 | sed 's/debian-etch-//')
  
  deb=$(package)_$(deb_version)_all.deb
  orig_tarball=../$(package)_$(version).orig.tar.gz