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

diff --git a/support/builddeb.py b/support/builddeb.py
index 6805808..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,30 +30,31 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-* Fixed a minor packaging issue
+* Fixing notifications on Maemo 4.1 (put in error reporting mechanism half-way)
+* Fixing up various issues with clearing one's account information
 """.strip()
 
 
 __postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
-rm -f ~/.dialcentral/notifier.log
-rm -f ~/.dialcentral/dialcentral.log
-"""
+rm -f ~/.%(name)s/%(name)s.log
+rm -f ~/.%(name)s/notifier.log
+""" % {"name": constants.__app_name__}
 
 __preremove__ = """#!/bin/sh -e
 
-python /usr/lib/dialcentral/alarm_handler.py -d || true
+python /opt/dialcentral/lib/alarm_handler.py -d || true
 """
 
 
-def find_files(path):
+def find_files(prefix, path):
 	for root, dirs, files in os.walk(path):
 		for file in files:
-			if file.startswith("src-"):
+			if file.startswith(prefix+"-"):
 				fileParts = file.split("-")
 				unused, relPathParts, newName = fileParts[0], fileParts[1:-1], fileParts[-1]
-				assert unused == "src"
+				assert unused == prefix
 				relPath = os.sep.join(relPathParts)
 				yield relPath, file, newName
 
@@ -78,21 +79,17 @@ def build_package(distribution):
 	p.prettyName = constants.__pretty_app_name__
 	p.description = __description__
 	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=Dialcentral"
-	p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
 	p.author = __author__
 	p.mail = __email__
 	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([
 	])
@@ -113,9 +110,17 @@ def build_package(distribution):
 		"diablo": "26x26-dialcentral.png",
 		"fremantle": "64x64-dialcentral.png", # Fremantle natively uses 48x48
 	}[distribution]
-	p["/usr/bin"] = [ "dialcentral.py" ]
-	for relPath, files in unflatten_files(find_files(".")).iteritems():
-		fullPath = "/usr/lib/dialcentral"
+	p["/opt/%s/bin" % __appname__] = [ "%s.py" % __appname__ ]
+	for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
+		fullPath = "/opt/%s/lib" % __appname__
+		if relPath:
+			fullPath += os.sep+relPath
+		p[fullPath] = list(
+			"|".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(
@@ -127,8 +132,8 @@ def build_package(distribution):
 	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__,
@@ -137,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__,
@@ -148,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)