From c366fec82c72a78b1495a0ec282a6e27b7c1389c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 16 May 2012 20:45:36 +0300
Subject: [PATCH] htop: cleanup

---
 packages/addons/debugging/tools/htop/addon    |  6 +----
 .../addons/debugging/tools/htop/changelog.txt |  3 +++
 packages/addons/debugging/tools/htop/meta     |  2 +-
 .../debugging/tools/htop/source/bin/htop      | 27 -------------------
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100755 packages/addons/debugging/tools/htop/source/bin/htop

diff --git a/packages/addons/debugging/tools/htop/addon b/packages/addons/debugging/tools/htop/addon
index 7178d7a735..5585786245 100755
--- a/packages/addons/debugging/tools/htop/addon
+++ b/packages/addons/debugging/tools/htop/addon
@@ -23,8 +23,4 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin/htop.bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libtinfo.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libncurses.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
index c43af68d06..6daa9a9e31 100644
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@@ -1,3 +1,6 @@
+2.1.2
+- cleanup
+
 2.1.1
 - rebuild for addon version 2.1
 - update to htop-1.0.1
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
index 725914772f..eba4a74a00 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="1.0.1"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
diff --git a/packages/addons/debugging/tools/htop/source/bin/htop b/packages/addons/debugging/tools/htop/source/bin/htop
deleted file mode 100755
index 47eebfa154..0000000000
--- a/packages/addons/debugging/tools/htop/source/bin/htop
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="$HOME/.xbmc/addons/debug.tools.htop"
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" htop.bin $@