From add0687644bcca1b0c9ee7777513261147dfbc6e Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Sat, 6 Aug 2011 17:28:30 -0500
Subject: [PATCH] Trying to fix icons

---
 Makefile |    5 ++++-
 setup.py |   13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3ac4c21..be213a2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
 PROGRAM=$(PROJECT_NAME)-calc
 DIST_BASE_PATH=./dist
-ICON_SIZES=22 28 32 48 80
+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)
@@ -94,6 +94,7 @@ setup.fremantle.py: setup.py src/constants.py
 	cog.py -c \
 		-D DESKTOP_FILE_PATH=/usr/share/applications/hildon \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+		-D ICON_CATEGORY=hildon \
 		-o $@ $<
 	chmod +x $@
 
@@ -101,6 +102,7 @@ setup.harmattan.py: setup.py src/constants.py
 	cog.py -c \
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+		-D ICON_CATEGORY=hildon \
 		-o $@ $<
 	chmod +x $@
 
@@ -108,6 +110,7 @@ setup.ubuntu.py: setup.py src/constants.py
 	cog.py -c \
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+		-D ICON_CATEGORY=apps \
 		-o $@ $<
 	chmod +x $@
 
diff --git a/setup.py b/setup.py
index 435fa53..52b7c20 100755
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@ from distutils.core import setup
 #	cog.outl('BUILD="%s"' % constants.__build__)
 #	cog.outl('DESKTOP_FILE_PATH="%s"' % DESKTOP_FILE_PATH)
 #	cog.outl('INPUT_DESKTOP_FILE="%s"' % INPUT_DESKTOP_FILE)
+#	cog.outl('ICON_CATEGORY="%s"' % ICON_CATEGORY)
 #]]]
 APP_NAME="ejpi"
 PRETTY_APP_NAME="e**(j pi) + 1 = 0"
@@ -31,6 +32,7 @@ VERSION="0.1.0"
 BUILD=0
 DESKTOP_FILE_PATH="/usr/share/applications"
 INPUT_DESKTOP_FILE="data/harmattan/ejpi.desktop"
+ICON_CATEGORY="hildon"
 #[[[end]]]
 
 CHANGES = """Switching from py2deb.py to sdist_maemo
@@ -84,12 +86,11 @@ setup(
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
-		("/usr/share/icons/hicolor/22x22/apps", ["data/icons/22/%s.png" % APP_NAME]),
-		("/usr/share/icons/hicolor/28x28/apps", ["data/icons/28/%s.png" % APP_NAME]),
-		("/usr/share/icons/hicolor/32x32/apps", ["data/icons/32/%s.png" % APP_NAME]),
-		("/usr/share/icons/hicolor/48x48/apps", ["data/icons/48/%s.png" % APP_NAME]),
-		("/usr/share/icons/hicolor/80x80/apps", ["data/icons/80/%s.png" % APP_NAME]),
-		("/usr/share/icons/hicolor/scalable/apps", ["data/%s.svg" % APP_NAME]),
+		("/usr/share/icons/hicolor/26x26/%s" % ICON_CATEGORY, ["data/icons/26/%s.png" % APP_NAME]),
+		("/usr/share/icons/hicolor/32x32/%s" % ICON_CATEGORY, ["data/icons/32/%s.png" % APP_NAME]),
+		("/usr/share/icons/hicolor/48x48/%s" % ICON_CATEGORY, ["data/icons/48/%s.png" % APP_NAME]),
+		("/usr/share/icons/hicolor/80x80/%s" % ICON_CATEGORY, ["data/icons/80/%s.png" % APP_NAME]),
+		("/usr/share/icons/hicolor/scalable/%s" % ICON_CATEGORY, ["data/%s.svg" % APP_NAME]),
 	],
 	requires=[
 		"PySide",
-- 
1.7.9.5