From 8eff8f8cbb3e32952015b3b6162bb1fa08ed6f67 Mon Sep 17 00:00:00 2001
From: Martin Matusiak <numerodix@gmail.com>
Date: Wed, 28 Jan 2009 00:03:27 +0100
Subject: [PATCH] packaging

---
 dist/pkg.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dist/pkg.sh b/dist/pkg.sh
index 0904ef7..3ffad25 100755
--- a/dist/pkg.sh
+++ b/dist/pkg.sh
@@ -16,7 +16,7 @@ if [ $v = "git" ]; then
 	v="9999"
 	tag=HEAD
 else
-	branch=$(git-branch -a | grep $v | head -n1 | tr -d "*")
+	branch=$(git branch -a | grep $v | head -n1 | tr -d "*")
 	if [ $branch ]; then
 		tag=$branch
 	fi
@@ -49,8 +49,8 @@ rpm_group="Applications/Multimedia"
 
 ubuntu_version=$(cat /etc/lsb-release 2>/dev/null | grep DISTRIB_CODENAME | sed "s/DISTRIB_CODENAME=//g")
 
-myname=$(git-config user.name)
-myemail=$(git-config user.email)
+myname=$(git config user.name)
+myemail=$(git config user.email)
 
 sf_user="numerodix"
 
@@ -66,7 +66,7 @@ function tarball() {
 	local nopack="$2"
 	mkdir -p $dest
 	files=$(find . doc test -maxdepth 1 -type f | xargs)
-	git-archive --prefix=$proj-$v/ $tag $files > $dest/$proj-$v.tar
+	git archive --prefix=$proj-$v/ $tag $files > $dest/$proj-$v.tar
 	if [ ! $nopack ]; then
 		gzip $dest/$proj-$v.tar
 	fi
@@ -269,7 +269,7 @@ function package() {
 
 
 if [ "$action" = "tag" ]; then
-	git-tag $v -m$v -s -u $gpg_keyid
+	git tag $v -m$v -s -u $gpg_keyid
 elif [ "$action" = "tarball" ]; then
 	tarball pub
 elif [ "$action" = "fedora" ]; then
-- 
2.11.4.GIT