From: Ed Page <eopage@byu.net>
Date: Tue, 9 Aug 2011 23:16:10 +0000 (-0500)
Subject: Removing the scalable icon to try to fix icon issues and some misc cleanup
X-Git-Url: http://vcs.maemo.org/git/?p=ejpi;a=commitdiff_plain;h=e74498470d0e9f5e0ab919efb707f1ab79f4093d

Removing the scalable icon to try to fix icon issues and some misc cleanup
---

diff --git a/Makefile b/Makefile
index a4ad0f8..d153b40 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,12 @@ SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
 PROGRAM=$(PROJECT_NAME)-calc
-DIST_BASE_PATH=./dist
 ICON_SIZES=26 32 48 80
 ICONS=$(foreach size, $(ICON_SIZES), data/icons/$(size)/$(PROJECT_NAME).png)
 PACKAGE_VARIANTS=fremantle harmattan ubuntu
 DESKTOP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), data/$(variant)/$(PROJECT_NAME).desktop)
 SETUP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), ./setup.$(variant).py)
+DIST_BASE_PATH=./dist
 DIST_PATHS=$(foreach variant, $(PACKAGE_VARIANTS), $(DIST_BASE_PATH)_$(variant)) $(DIST_BASE_PATH)_diablo
 
 OBJ=$(SOURCE:.py=.pyc)
diff --git a/README b/README
deleted file mode 100644
index ac2fe23..0000000
--- a/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Building a package
-===================
-Run
-	make package
diff --git a/ejpi/constants.py b/ejpi/constants.py
index 1f89e01..2aa466e 100644
--- a/ejpi/constants.py
+++ b/ejpi/constants.py
@@ -8,4 +8,5 @@ __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".%s" % __app_name__)
 _user_settings_ = "%s/settings.ini" % _data_path_
 _user_logpath_ = "%s/%s.log" % (_data_path_, __app_name__)
+
 IS_MAEMO = True
diff --git a/setup.py b/setup.py
index 228333a..b2ae5b8 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,6 @@ setup(
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
-		("/usr/share/icons/hicolor/scalable/%s" % ICON_CATEGORY, ["data/%s.svg" % APP_NAME]),
 	] +
 	[
 		(