Bump to 1.1.6 to fix a user issue

[gonvert] / Makefile

diff --git a/Makefile b/Makefile
index 24904d7..4edd813 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
 PROGRAM=Gonvert
-ICON_SIZES=26 32 48 80
+ICON_SIZES=26 32 48 64 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)
@@ -78,7 +78,7 @@ upload_diablo:
 upload_fremantle:
        dput fremantle-extras-builder $(DIST_BASE_PATH)_fremantle/$(PROJECT_NAME)*.changes
 upload_harmattan:
-       ./support/obs_upload.sh $(PROJECT_NAME) harmattan dist_harmattan
+       echo "OBS upload disabled" #./support/obs_upload.sh $(PROJECT_NAME) harmattan dist_harmattan
 upload_ubuntu:
        cp $(DIST_BASE_PATH)_ubuntu/*.deb www/$(PROJECT_NAME).deb
 
@@ -119,8 +119,8 @@ 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 \
-               -D ICON_SIZES=32,80 \
+               -D ICON_CATEGORY=apps \
+               -D ICON_SIZES=64,80 \
                -o $@ $<
        chmod +x $@
 
@@ -144,6 +144,7 @@ $(DESKTOP_FILES): data/template.desktop
        cog.py -d \
                -D VARIANT=$(VARIANT) \
                -D PROGRAM=$(PROGRAM) \
+               -D ICON_NAME=$(PROJECT_NAME) \
                -o $@ $<