X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=support%2Fbuilddeb.py;h=3f3506eb8e49c40949a61e21153da7d1c79ad59a;hp=cb227be246f2efd07fb4c28eacf805042eff07fc;hb=HEAD;hpb=6addcd928fd6ec45983fdab7cf945194aa0fb5d0

diff --git a/support/builddeb.py b/support/builddeb.py
index cb227be..3f3506e 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -15,16 +15,14 @@ __appname__ = constants.__app_name__
 __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 (buggy on Maemo 4.1)
+* Send Texts and Receive both Texts and Voicemail through your chat window
 .
 * Initiate Google Voice callbacks from the dialpad or your contacts
 .
-* Access to all of your Google Voice contacts (Maemo 4.1 only for now)
+* Access to all of your Google Voice contacts
 .
 * Reduce battery drain by setting your status to "Away"
 .
-* Block incoming calls by switching your status to "Hidden"
-.
 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
@@ -34,39 +32,9 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-0.7.2
-* Added a Deny list
-* Added option to make GV Contacts optional
-* Added a limit, where if a state machine period is longer than it, than we set the period to infinite
-* Delayed when we say the connection is disconnected to hopefully help random issues
-* Tweaked how The One Ring shows up in the addressbook (Maemo 5)
-* Made polling configurable
-* Delayed auto-disconnect in case the user is just switching network connections (Maemo 4.1)
-* Bugfix: Removed superfluous blank message from debug prompt
-* Bugfix: Moved some more (very minor, very rarely used) timeouts to second resolution reducing overhead
-* Bugfix: debug prompt commands handled command validation poorly
-* Debug Prompt: Added a "version" command
-* Debug Prompt: Added a "get_polling" command to find out what the actual polling periods are
-* Debug Prompt: Added a "grab_log" command which is a broken but means to offer the log file through a file transfer
-* Debug Prompt: Added a "save_log" command to help till grab_log works and for where file transfers aren't supported by clients
-
-0.7.1
-* Reducing the race window where GV will mark messages as read accidently
-* Modified some things blindly "because thats what Butterfly does"
-* Modified some support files to mimic other plugins on Maemo 5 PR1.1
-* Added link to bug tracker and moved all bugs and enhancements to it
-* Switched contacts to being away by default upon user feedback
-* Adjusting handling of call states to at least allow the option of clients to provide clearer information to the user
-* Fixing some bugs with handling a variety of phone number formats
-* Removed a hack that changed the number being called, most likely put in place in a bygone era
-
-0.7.0
-* Initial beta release for Maemo 5
-* Late Alpha for Maemo 4.1 with horrible consequences like crashing RTComm
-
-0.1.0
-* Pre-Alpha Development Release
-"""
+* Limiting the size of log files
+* Blocking the caches from preventing log in
+""".strip()
 
 
 __postinstall__ = """#!/bin/sh -e
@@ -117,7 +85,6 @@ def build_package(distribution):
 		"debian": "comm",
 		"diablo": "user/network",
 		"fremantle": "user/network",
-		"mer": "user/network",
 	}[distribution]
 	p.depends = ", ".join([
 		"python (>= 2.5) | python2.5",
@@ -129,22 +96,16 @@ def build_package(distribution):
 		"debian": "",
 		"diablo": ", python2.5-conic, account-plugin-haze",
 		"fremantle": ", account-plugin-haze",
-		"mer": "",
 	}[distribution]
 	p.arch = "all"
 	p.urgency = "low"
-	p.distribution = "diablo fremantle mer debian"
+	p.distribution = "diablo fremantle debian"
 	p.repository = "extras"
 	p.changelog = __changelog__
 	p.postinstall = __postinstall__
-	p.icon = {
-		"debian": "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(
@@ -154,11 +115,23 @@ def build_package(distribution):
 	p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service"]
 	if distribution in ("debian", ):
 		p["/usr/share/mission-control/profiles"] = ["theonering.profile.%s|theonering.profile"% distribution]
-	elif distribution in ("diablo", "fremantle", "mer"):
+	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|im-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