X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=Makefile;h=d0d39b46dc40c7f4b4143ad6f7d35b4a99a01406;hp=c54f2b852da053b5c3fc5f2ac0493ccfffaad5e5;hb=3bba09e995f4c8c2627b10f5503a4dbb961e6d2e;hpb=aeea89e96f1ae1326a627854d70a7d59576ef408

diff --git a/Makefile b/Makefile
index c54f2b8..d0d39b4 100644
--- a/Makefile
+++ b/Makefile
@@ -67,26 +67,17 @@ package: $(OBJ) build_mo
 	$(foreach file, $(LOCALE_FILES), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
 	cp data/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
 	cp data/$(PROJECT_NAME).service $(BUILD_PATH)/generic
-	cp data/low/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
-	cp data/40/$(PROJECT_NAME).png $(BUILD_PATH)/generic/40x40-$(PROJECT_NAME).png
-	cp data/48/$(PROJECT_NAME).png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
-	cp data/scale/$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
+	cp data/*_$(PROJECT_NAME).png $(BUILD_PATH)/generic/
 	cp support/builddeb.py $(BUILD_PATH)/generic
 	cp support/py2deb.py $(BUILD_PATH)/generic
 	cp support/fake_py2deb.py $(BUILD_PATH)/generic
 
-	mkdir -p $(BUILD_PATH)/chinook
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-	cd $(BUILD_PATH)/chinook ; python builddeb.py chinook
 	mkdir -p $(BUILD_PATH)/diablo
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
 	cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
 	mkdir -p $(BUILD_PATH)/fremantle
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
 	cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
-	mkdir -p $(BUILD_PATH)/mer
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-	cd $(BUILD_PATH)/mer ; python builddeb.py mer
 	mkdir -p $(BUILD_PATH)/debian
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
 	cd $(BUILD_PATH)/debian ; python builddeb.py debian
@@ -94,8 +85,7 @@ package: $(OBJ) build_mo
 upload:
 	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
 	dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
-	dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes
-	cp $(BUILD_PATH)/debian/*.deb ../www/$(PROJECT_NAME).deb
+	cp $(BUILD_PATH)/debian/*.deb ./www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )