From baca215d48cc383b5bfb164dc17f33c228d328d7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 8 Mar 2011 03:21:56 +0100
Subject: [PATCH] mkpkg: update mkpkg_xbmc-dharma-10.1 to xbmc-10.1 final

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...bmc-dharma-10.1 => mkpkg_xbmc-10.1-dharma} | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)
 rename tools/mkpkg/{mkpkg_xbmc-dharma-10.1 => mkpkg_xbmc-10.1-dharma} (62%)

diff --git a/tools/mkpkg/mkpkg_xbmc-dharma-10.1 b/tools/mkpkg/mkpkg_xbmc-10.1-dharma
similarity index 62%
rename from tools/mkpkg/mkpkg_xbmc-dharma-10.1
rename to tools/mkpkg/mkpkg_xbmc-10.1-dharma
index 7d69800e8..49b37be8d 100755
--- a/tools/mkpkg/mkpkg_xbmc-dharma-10.1
+++ b/tools/mkpkg/mkpkg_xbmc-10.1-dharma
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="Dharma-10.1"
+PKG_VERSION="10.1-Dharma"
 GIT_REPO="-b Dharma git@github.com:xbmc/xbmc.git"
 DEST_DIR="$PKG_NAME-$PKG_VERSION"
 
@@ -39,40 +39,40 @@ echo "getting version..."
   cd ..
 
 echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
-  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV
-  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version
+  rm -rf $PKG_NAME-$PKG_VERSION
+  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git
+  rm -rf $PKG_NAME-$PKG_VERSION/.git
 
 echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
-  mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
+  mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-*
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-*
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/project
+  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
            "PackageMaker" "Translator" "XBMCLive" "XprPack" \
            "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/tools/$i
+    rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
   done
 
   for i in dll a lib so bat; do
-    find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";"
+    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
   done
 
   # bundled win32 binaries
-  rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
+  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
 
 echo "packing sources..."
-  tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV
-  tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  tar cvjf $PKG_NAME-$PKG_VERSION.tar.bz2 $PKG_NAME-$PKG_VERSION
+  tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  rm -rf $PKG_NAME-$PKG_VERSION
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION