From: Ed Page <eopage@byu.net>
Date: Sat, 26 Sep 2009 22:34:55 +0000 (-0500)
Subject: Not ready for use but at least packaging stuff is now working and branding seems... 
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=218bfd2464d383becc840c69cce9a6cb0fd78b6a;ds=sidebyside

Not ready for use but at least packaging stuff is now working and branding seems to be fixed
---

diff --git a/Makefile b/Makefile
index 4da244f..a2c7d28 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,8 @@ package: $(OBJ)
 	rm -Rf $(BUILD_PATH)
 	mkdir -p $(BUILD_PATH)/generic
 	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)/generic
-	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).manager $(BUILD_PATH)/generic
 	cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service.in $(BUILD_PATH)/generic
 	cp support/icons/*-$(PROJECT_NAME).png $(BUILD_PATH)/generic/
diff --git a/support/builddeb.py b/support/builddeb.py
index 54d331c..aba0451 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -101,7 +101,6 @@ def build_package(distribution):
 		"fremantle": "64x64-theonering.png", # Fremantle natively uses 48x48
 		"mer": "64x64-theonering.png",
 	}[distribution]
-	p["/usr/bin"] = [ "theonering.py" ]
 	for relPath, files in unflatten_files(find_files(".")).iteritems():
 		fullPath = "/usr/lib/theonering"
 		if relPath:
@@ -110,7 +109,7 @@ def build_package(distribution):
 			"|".join((oldName, newName))
 			for (oldName, newName) in files
 		)
-	p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManagers.theonering.service.in"]
+	p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service.in"]
 	p["/usr/share/telepathy/managers"] = ["theonering.manager"]
 	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|theonering.png"]
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-theonering.png|theonering.png"]