X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=support%2Fbuilddeb.py;h=36f8c79ed86a7186b56d033624e3c45c925bc9cc;hb=0e6232290e79538b22b9744f6c6e3e6dd3792a87;hp=f068d6aea7aab2d2a4b2be0aa5e4bed8c1f85727;hpb=d218bc127b747e9ea80b7a3aa841efbb40b3cb79;p=gc-dialer

diff --git a/support/builddeb.py b/support/builddeb.py
index f068d6a..36f8c79 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -12,7 +12,7 @@ import constants
 
 
 __appname__ = constants.__app_name__
-__description__ = """Touch screen enhanced interface to the GoogleVoice phone service"
+__description__ = """Touch screen enhanced interface to the GoogleVoice phone service
 Features:
 .
 * Dialpad for quick call
@@ -30,9 +30,8 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-* Fixing a bug where a failed login would cause problems
-* Fixing a bug preventing failed logins to be reported to the user
-* Adding some more detail to the log
+* Fixing notifications on Maemo 4.1 (put in error reporting mechanism half-way)
+* Fixing up various issues with clearing one's account information
 """.strip()
 
 
@@ -85,15 +84,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([
 	])
@@ -123,13 +119,21 @@ def build_package(distribution):
 			"|".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"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-dialcentral.png|dialcentral.png"]
 
+	print p
 	if distribution == "debian":
-		print p
 		print p.generate(
 			version="%s-%s" % (__version__, __build__),
 			changelog=__changelog__,
@@ -138,9 +142,7 @@ def build_package(distribution):
 			changes=False,
 			dsc=False,
 		)
-		print "Building for %s finished" % distribution
 	else:
-		print p
 		print p.generate(
 			version="%s-%s" % (__version__, __build__),
 			changelog=__changelog__,
@@ -149,20 +151,12 @@ def build_package(distribution):
 			changes=True,
 			dsc=True,
 		)
-		print "Building for %s finished" % distribution
+	print "Building for %s finished" % distribution
 
 
 if __name__ == "__main__":
-	if len(sys.argv) > 1:
-		try:
-			import optparse
-		except ImportError:
-			optparse = None
-
-		if optparse is not None:
-			parser = optparse.OptionParser()
-			(commandOptions, commandArgs) = parser.parse_args()
+	if len(sys.argv) == 1:
+		distribution = "fremantle"
 	else:
-		commandArgs = None
-		commandArgs = ["diablo"]
-	build_package(commandArgs[0])
+		distribution = sys.argv[1]
+	build_package(distribution)