X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=Makefile;h=a4c08c6406a7e0a027433669ed99906ab1389bbd;hp=8d93fbacf2b947ea203f5116359d3455b1e9be70;hb=989d15b85b8a64aa7b213f165b99001159ae6c1c;hpb=bb8e13c683c105ddf66e22ca36ba243999f7d629

diff --git a/Makefile b/Makefile
index 8d93fba..a4c08c6 100644
--- a/Makefile
+++ b/Makefile
@@ -46,31 +46,25 @@ package: $(OBJ)
 	cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)/generic
 	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
 	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-	#$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
 	cp support/$(PROJECT_NAME).desktop $(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
 
-upload: package
+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
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )