X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=support%2Fbuilddeb.py;h=133446e07a5fbb75e6a5ed097e8bcd82b57392cd;hp=57a88a534ee4b68718d6e7a8266bb0d0f829a37b;hb=02a126316c2b761233aed2d194e61074fc69620b;hpb=eec5a4bd189db8c198fb3034920367b011b80e2c

diff --git a/support/builddeb.py b/support/builddeb.py
index 57a88a5..133446e 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -38,14 +38,14 @@ __changelog__ = """
 __postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
-rm -f ~/.telepathy-theonering/telepathy-theonering.log
+rm -f ~/.telepathy-theonering/theonering.log
 """
 
 def find_files(path):
 	for root, dirs, files in os.walk(path):
 		for file in files:
-			if file.startswith("src-"):
-				fileParts = file.split("-")
+			if file.startswith("src!"):
+				fileParts = file.split("!")
 				unused, relPathParts, newName = fileParts[0], fileParts[1:-1], fileParts[-1]
 				assert unused == "src"
 				relPath = os.sep.join(relPathParts)
@@ -77,27 +77,25 @@ def build_package(distribution):
 	p.mail = __email__
 	p.license = "lgpl"
 	p.depends = ", ".join([
-		"python (>= 2.5)",
-		"python-dbus",
-		"python-gobject",
-		"python-telepathy",
+		"python (>= 2.5) | python2.5",
+		"python-dbus | python2.5-dbus",
+		"python-gobject | python2.5-gobject",
+		"python-telepathy | python2.5-telepathy",
 	])
 	p.section = {
 		"debian": "comm",
-		"chinook": "communication",
 		"diablo": "user/network",
 		"fremantle": "user/network",
 		"mer": "user/network",
 	}[distribution]
 	p.arch = "all"
 	p.urgency = "low"
-	p.distribution = "chinook diablo fremantle mer debian"
+	p.distribution = "diablo fremantle mer debian"
 	p.repository = "extras"
 	p.changelog = __changelog__
 	p.postinstall = __postinstall__
 	p.icon = {
 		"debian": "26x26-theonering.png",
-		"chinook": "26x26-theonering.png",
 		"diablo": "26x26-theonering.png",
 		"fremantle": "64x64-theonering.png", # Fremantle natively uses 48x48
 		"mer": "64x64-theonering.png",
@@ -111,8 +109,10 @@ def build_package(distribution):
 			for (oldName, newName) in files
 		)
 	p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service"]
-	if distribution == "debian":
-		p["/usr/share/mission-control/profiles"] = ["theonering.profile"]
+	if distribution in ("debian", ):
+		p["/usr/share/mission-control/profiles"] = ["theonering.profile.%s|theonering.profile"% distribution]
+	elif distribution in ("diablo", "fremantle", "mer"):
+		p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
 	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"]