X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=1266b05d889be55e6e485cb08f42a772da2c56cc;hb=92e7aa99f087d1dbfc157cf51743f0ee801832ea;hp=be213a2731d654fea7eec1afccb4aa634928e0cb;hpb=add0687644bcca1b0c9ee7777513261147dfbc6e;p=ejpi

diff --git a/Makefile b/Makefile
index be213a2..1266b05 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,13 @@ PACKAGE_NAME=$(PROJECT_NAME)
 SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
-PROGRAM=$(PROJECT_NAME)-calc
-DIST_BASE_PATH=./dist
+PROGRAM=ejpi-calc
 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)
@@ -66,7 +66,8 @@ package: $(OBJ) $(ICONS) $(SETUP_FILES) $(DESKTOP_FILES)
 upload:
 	dput diablo-extras-builder $(DIST_BASE_PATH)_diablo/$(PROJECT_NAME)*.changes
 	dput fremantle-extras-builder $(DIST_BASE_PATH)_fremantle/$(PROJECT_NAME)*.changes
-	cp $(DIST_BASE_PATH)_ubuntu/*.deb www/ejpi.deb
+	./support/obs_upload.sh $(PROJECT_NAME) harmattan dist_harmattan
+	cp $(DIST_BASE_PATH)_ubuntu/*.deb www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )
@@ -95,6 +96,7 @@ setup.fremantle.py: setup.py src/constants.py
 		-D DESKTOP_FILE_PATH=/usr/share/applications/hildon \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
 		-D ICON_CATEGORY=hildon \
+		-D ICON_SIZES=26,32,48 \
 		-o $@ $<
 	chmod +x $@
 
@@ -103,6 +105,7 @@ setup.harmattan.py: setup.py src/constants.py
 		-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 \
 		-o $@ $<
 	chmod +x $@
 
@@ -111,6 +114,7 @@ setup.ubuntu.py: setup.py src/constants.py
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
 		-D ICON_CATEGORY=apps \
+		-D ICON_SIZES=32,48 \
 		-o $@ $<
 	chmod +x $@