X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=blobdiff_plain;f=Makefile;h=f630aa0b59d99b347e277f7c4f0fa5ecae8ed493;hp=ea37686d5774afbb6f37afd57fca86973403ff24;hb=0320d6d2086ce89fe554d8f902531f5b00dbec94;hpb=c19a09e21163c4ebb35cd120c9785e655383f687

diff --git a/Makefile b/Makefile
index ea37686..f630aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,6 @@ package: $(OBJ)
 	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
@@ -66,11 +63,14 @@ package: $(OBJ)
 	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) ; )