X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=support%2Fbuilddeb.py;h=471542bdaa05d827babbbf914a30c6d170f13128;hp=4f385a0d01f9fce687ce44a38a143c404411be5b;hb=5b7c9614e01a6d01df71e595c08bc607c31f5048;hpb=d9d53f5f22033094187ed0b5296952914e692c4f;ds=sidebyside

diff --git a/support/builddeb.py b/support/builddeb.py
index 4f385a0..471542b 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -12,17 +12,19 @@ import constants
 
 
 __appname__ = constants.__app_name__
-__description__ = """Google Voice Communication Plugin
+__description__ = """Send/receive texts and initiate GV callbacks all through Conversations and Phone
 Features:
 .
 * Send Texts and Receive both Texts and Voicemail through your chat window
 .
-* Save battery life by setting your status to "Away"
-.
-* Block incoming calls by switching your status to "Hidden"
+* Initiate Google Voice callbacks from the dialpad or your contacts
 .
 * Access to all of your Google Voice contacts
 .
+* Reduce battery drain by setting your status to "Away"
+.
+Note: Google and Google Voice are probably trademarks of Google.  This software nor the author has any affiliation with Google
+.
 Homepage: http://theonering.garage.maemo.org
 """
 __author__ = "Ed Page"
@@ -30,9 +32,9 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-0.1.0
-* Initial release
-"""
+* Providing a more descriptive error message on most failed calls
+* Working around an issue when pulling data from GV
+""".strip()
 
 
 __postinstall__ = """#!/bin/sh -e
@@ -44,8 +46,8 @@ 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)
@@ -69,41 +71,41 @@ def build_package(distribution):
 
 	py2deb.Py2deb.SECTIONS = py2deb.SECTIONS_BY_POLICY[distribution]
 	p = py2deb.Py2deb(__appname__)
-	p.prettyName = constants.__pretty_app_name__
+	if distribution == "debian":
+		p.prettyName = constants.__pretty_app_name__
+	else:
+		p.prettyName = "Google Voice plugin for Conversations and Calls"
 	p.description = __description__
-	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=theonering"
+	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=The%%20One%%20Ring"
 	#p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
 	p.author = __author__
 	p.mail = __email__
 	p.license = "lgpl"
+	p.section = {
+		"debian": "comm",
+		"diablo": "user/network",
+		"fremantle": "user/network",
+	}[distribution]
 	p.depends = ", ".join([
 		"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",
+	p.depends += {
+		"debian": "",
+		"diablo": ", python2.5-conic, account-plugin-haze",
+		"fremantle": ", account-plugin-haze",
 	}[distribution]
 	p.arch = "all"
 	p.urgency = "low"
-	p.distribution = "chinook diablo fremantle mer debian"
+	p.distribution = "diablo fremantle 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",
-	}[distribution]
+	p.icon = "32-tor_handset.png"
 	for relPath, files in unflatten_files(find_files(".")).iteritems():
-		fullPath = "/usr/lib/theonering"
+		fullPath = "/opt/theonering/lib"
 		if relPath:
 			fullPath += os.sep+relPath
 		p[fullPath] = list(
@@ -111,12 +113,25 @@ 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"):
+		p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
+	p["/usr/lib/telepathy"] = ["telepathy-theonering"]
 	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"]
-	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-theonering.png|theonering.png"]
+	if distribution in ("debian", ):
+		iconBasePath = "/usr/share/icons/gnome/%s/apps"
+	elif distribution in ("diablo", "fremantle"):
+		iconBasePath = "/usr/share/icons/hicolor/%s/hildon"
+	p[iconBasePath % "26x26"] = ["26-tor_handset.png|im-theonering.png"]
+	p[iconBasePath % "32x32"] = ["32-tor_handset.png|im-theonering.png"]
+	p[iconBasePath % "64x64"] = ["64-tor_handset.png|im-theonering.png"]
+	p["/opt/theonering/share"] = [
+		"32-tor_handset.png|tor_handset.png",
+		"32-tor_phone.png|tor_phone.png",
+		"32-tor_question.png|tor_question.png",
+		"32-tor_self.png|tor_self.png",
+	]
 
 	if distribution == "debian":
 		print p