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

[ejpi] / setup.py

diff --git a/setup.py b/setup.py
index 1bff3e0..b2ae5b8 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,8 @@ 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)
+#      cog.outl('ICON_SIZES=[%s]' % ICON_SIZES)
 #]]]
 APP_NAME="ejpi"
 PRETTY_APP_NAME="e**(j pi) + 1 = 0"
@@ -31,6 +33,8 @@ VERSION="0.1.0"
 BUILD=0
 DESKTOP_FILE_PATH="/usr/share/applications"
 INPUT_DESKTOP_FILE="data/harmattan/ejpi.desktop"
+ICON_CATEGORY="hildon"
+ICON_SIZES=[32,80]
 #[[[end]]]
 
 CHANGES = """Switching from py2deb.py to sdist_maemo
@@ -79,14 +83,18 @@ setup(
                "ejpi-calc",
        ],
        packages=list(find_packages(APP_NAME, includeRoot=True)),
+       package_data={
+               "ejpi.plugins": ["*.ini", "images/*.png"],
+       },
        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/%sx%s/%s" % (size, size, ICON_CATEGORY),
+                       ["data/icons/%s/%s.png" % (size, APP_NAME)]
+               )
+               for size in ICON_SIZES
        ],
        requires=[
                "PySide",
@@ -117,7 +125,7 @@ setup(
                        "copyright": "lgpl",
                        "changelog": CHANGES,
                        "buildversion": str(BUILD),
-                       "depends": "python, python-qt4-core, python-qt4-gui",
+                       "depends": "python2.5, python2.5-qt4-core, python2.5-qt4-gui",
                        "architecture": "any",
                },
                "sdist_fremantle": {
@@ -130,7 +138,7 @@ setup(
                        "copyright": "lgpl",
                        "changelog": CHANGES,
                        "buildversion": str(BUILD),
-                       "depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-pyside.maemo5",
+                       "depends": "python, python-pyside.qtcore, python-pyside.qtgui, python-pyside.qtmaemo5",
                        "architecture": "any",
                },
                "sdist_harmattan": {