X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=setup.py;h=8387afc971944abb86609c0d80ad7031d515204e;hb=HEAD;hp=803cb05df1c1e7cd9fda78cd4d9e63dd29afb39c;hpb=82f0e986eb55dad7086ef470add1e9c95ae9a6f1;p=ejpi

diff --git a/setup.py b/setup.py
index 803cb05..8387afc 100755
--- a/setup.py
+++ b/setup.py
@@ -25,17 +25,20 @@ from distutils.core import setup
 #	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)
+#	cog.outl('ICON_SIZES=[%s]' % ICON_SIZES)
 #]]]
 APP_NAME="ejpi"
 PRETTY_APP_NAME="e**(j pi) + 1 = 0"
-VERSION="0.1.0"
-BUILD=0
+VERSION="1.0.6"
+BUILD="9"
 DESKTOP_FILE_PATH="/usr/share/applications"
-INPUT_DESKTOP_FILE="data/harmattan/ejpi.desktop"
-ICON_CATEGORY="hildon"
-#[[[end]]]
+INPUT_DESKTOP_FILE="data/ubuntu/ejpi.desktop"
+ICON_CATEGORY="apps"
+ICON_SIZES=[32,48]
+#[[[end]]] (checksum: fb3742cf699ff6d0e1aab0ec61d503e7)
 
-CHANGES = """Switching from py2deb.py to sdist_maemo
+CHANGES = """* Support for PySide
+* XDG Support
 """.strip()
 BUGTRACKER_URL = "https://bugs.maemo.org/enter_bug.cgi?product=ejpi"
 
@@ -82,18 +85,22 @@ setup(
 	],
 	packages=list(find_packages(APP_NAME, includeRoot=True)),
 	package_data={
-		"ejpi.plugins": ["*.ini"],
+		"ejpi.plugins": ["*.ini", "images/*.png"],
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
-		("/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]),
+		("/usr/share/icons/hicolor/scalable/apps", ["data/%s.svg" % APP_NAME]),
+	] +
+	[
+		(
+			"/usr/share/icons/hicolor/%sx%s/%s" % (size, size, ICON_CATEGORY),
+			["data/icons/%s/%s.png" % (size, APP_NAME)]
+		)
+		for size in ICON_SIZES
 	],
 	requires=[
 		"PySide",
+		"pyxdg",
 	],
 	cmdclass={
 		'sdist_ubuntu': sdist_maemo,
@@ -108,7 +115,7 @@ setup(
 			"copyright": "lgpl",
 			"changelog": CHANGES,
 			"buildversion": str(BUILD),
-			"depends": "python, python-pyside.qtcore, python-pyside.qtgui",
+			"depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-xdg",
 			"architecture": "any",
 		},
 		"sdist_diablo": {
@@ -121,7 +128,7 @@ setup(
 			"copyright": "lgpl",
 			"changelog": CHANGES,
 			"buildversion": str(BUILD),
-			"depends": "python2.5, python2.5-qt4-core, python2.5-qt4-gui",
+			"depends": "python2.5, python2.5-qt4-core, python2.5-qt4-gui, python-xdg, python-simplejson",
 			"architecture": "any",
 		},
 		"sdist_fremantle": {
@@ -134,7 +141,8 @@ setup(
 			"copyright": "lgpl",
 			"changelog": CHANGES,
 			"buildversion": str(BUILD),
-			"depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-pyside.qtmaemo5",
+			#"depends": "python2.5, python2.5-qt4-core, python2.5-qt4-gui, python2.5-qt4-maemo5, python-xdg",
+			"depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-pyside.qtmaemo5, python-xdg, python-simplejson",
 			"architecture": "any",
 		},
 		"sdist_harmattan": {
@@ -149,7 +157,7 @@ setup(
 			"copyright": "lgpl",
 			"changelog": CHANGES,
 			"buildversion": str(BUILD),
-			"depends": "python, python-pyside.qtcore, python-pyside.qtgui",
+			"depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-xdg",
 			"architecture": "any",
 		},
 		"bdist_rpm": {