From: Ed Page <eopage@byu.net>
Date: Thu, 2 Dec 2010 03:29:42 +0000 (-0600)
Subject: Merge branch 'master' into qt
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=38fca96583e6961c8ffdde3463f7880bf40fc12f;hp=-c

Merge branch 'master' into qt
---

38fca96583e6961c8ffdde3463f7880bf40fc12f
diff --combined support/builddeb.py
index 3e93809,a6ecb2e..b128299
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@@ -30,13 -30,7 +30,7 @@@ __email__ = "eopage@byu.net
  __version__ = constants.__version__
  __build__ = constants.__build__
  __changelog__ = """
- * First Qt Release (BETA)
- * Access to call cancel
- * Divider on various lists (for time ones, tried to balance heavy/light phone users)
- * Condensed history
- * Changed SMS Entry letter count style from GV to Nokia
- * Tabs are cached between launches
- * Display when history/messages tabs where last refreshed
+ * Fixing deps
  """.strip()
  
  
@@@ -89,12 -83,15 +83,12 @@@ def build_package(distribution)
  	p.license = "lgpl"
  	p.depends = ", ".join([
  		"python2.6 | python2.5",
 -		"python-gtk2 | python2.5-gtk2",
 -		"python-xml | python2.5-xml",
 -		"python-dbus | python2.5-dbus",
 +		"python-simplejson",
  	])
 -	maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
  	p.depends += {
 -		"debian": ", python-glade2",
 -		"diablo": maemoSpecificDepends + ", python2.5-conic",
 -		"fremantle": maemoSpecificDepends + ", python-glade2, python-alarm",
 +		"debian": ", python-qt4",
 +		"diablo": ", python2.5-qt4-core, python2.5-qt4-gui",
 +		"fremantle": ", python2.5-qt4-core, python2.5-qt4-gui, python2.5-qt4-maemo5",
  	}[distribution]
  	p.recommends = ", ".join([
  	])
@@@ -124,14 -121,6 +118,14 @@@
  			"|".join((oldName, newName))
  			for (oldName, newName) in files
  		)
 +	for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
 +		fullPath = "/opt/%s/share" % __appname__
 +		if relPath:
 +			fullPath += os.sep+relPath
 +		p[fullPath] = list(
 +			"|".join((oldName, newName))
 +			for (oldName, newName) in files
 +		)
  	p["/usr/share/applications/hildon"] = ["dialcentral.desktop"]
  	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-dialcentral.png|dialcentral.png"]
  	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-dialcentral.png|dialcentral.png"]