X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=Makefile;h=0ba6f784e47e4b32dd1a94a0742746c14b4e4283;hp=2b26d836731a981e779482dd76d7ff89d249970c;hb=5bb8c8b09d35e396602d3b896945f86464aa0426;hpb=9c50899cc386ca8a29886af9021e144d178dd247

diff --git a/Makefile b/Makefile
index 2b26d83..0ba6f78 100644
--- a/Makefile
+++ b/Makefile
@@ -42,19 +42,17 @@ package: $(OBJ)
 
 	mkdir -p $(BUILD_PATH)/generic
 	cp $(SOURCE_PATH)/constants.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, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/
 	cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
-	cp support/$(PROJECT_NAME).profile $(BUILD_PATH)/generic
+	cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
 	cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
-	cp support/icons/*-$(PROJECT_NAME).png $(BUILD_PATH)/generic/
+	cp support/icons/*-tor_*.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
@@ -71,7 +69,6 @@ package: $(OBJ)
 upload:
 	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/telepathy-$(PROJECT_NAME)*.changes
 	dput diablo-extras-builder $(BUILD_PATH)/diablo/telepathy-$(PROJECT_NAME)*.changes
-	dput chinook-extras-builder $(BUILD_PATH)/chinook/telepathy-$(PROJECT_NAME)*.changes
 	cp $(BUILD_PATH)/debian/*.deb www/telepathy-$(PROJECT_NAME).deb
 
 lint: $(OBJ)