X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=support%2Fbuilddeb.py;h=a61c726555855c8cd63ab7494c8b823f1fe03ba2;hb=0aa88e3d49fe86ae72d5c671765bf9b8b7336fab;hp=bf7d213a9ba2867e751eb54b570b3a8a9538f756;hpb=b2b58b900f299417edb0ad0dac4340002c652baf;p=ejpi

diff --git a/support/builddeb.py b/support/builddeb.py
index bf7d213..a61c726 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -13,8 +13,11 @@ import constants
 
 __appname__ = constants.__app_name__
 __description__ = """A Touch Screen Optimized RPN Calculator using Pie Menus
+.
 RPN: Stack based math, come on it is fun
+.
 Pie Menus: Press them or press-drag them
+.
 History: Its such a drag, so drag them around, delete them, etc
 .
 Homepage: http://ejpi.garage.maemo.org/
@@ -24,56 +27,30 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-0.9.6
-* Fullscreen by Ctrl+Enter
-* "Enter" in number entry causes a push
-* Reversed stack order to be more proper
-* Logging support, Ctrl+l to copy the log
-* Fremantle Support
-
-0.9.4
- * Added icons
- * Minor improvements
- * Swapping the keyboard positions, seem more friendly to my thumb location this way
-
-0.9.3 - ""
- * Added +/-, !, sq, and sqrt functions
- * Improved Documentation
- * Copy of calculation result and the corresponding equation
- * Bug fixes
-
-0.9.2 - ""
- * Experimenting with faster startup by including pyc files in package
- * Minor tweaks and bug fixes
-
-0.9.1 - "Laziness doesn't always pay off"
- * Profiled the code with an especial focus on the pie menus
- * Tried to reduce potential bugs with double clicks
- * Fixed a visual artifact issue on popup
-
-0.9.0 - "Feed is for horses, so what about feedback?"
- * Initial public release
- * Pie menus for keys
- * Modifiable history
- * Supports different number types and bases
- * Basic trig support
-"""
+* Fixed and improved error reporting
+* Re-arranged trig and programmer keyboards to reduce keyboard swapping
+* Fixed issues with auto-scoll to latest item on startup
+* Reducing redraws on spurious rotations
+""".strip()
 
 
 __postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
-rm -f ~/.ejpi/ejpi.log
+rm -f ~/.%(name)s/%(name)s.log
+""" % {"name": constants.__app_name__}
+
+__preremove__ = """#!/bin/sh -e
 """
 
 
-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
 
@@ -98,68 +75,69 @@ def build_package(distribution):
 	p.prettyName = constants.__pretty_app_name__
 	p.description = __description__
 	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=ejpi"
-	#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",
 	])
-	maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
 	p.depends += {
-		"debian": ", python-glade2",
-		"chinook": maemoSpecificDepends,
-		"diablo": maemoSpecificDepends,
-		"fremantle": maemoSpecificDepends + ", python-glade2",
-		"mer": maemoSpecificDepends + ", python-glade2",
+		"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.section = {
 		"debian": "math",
-		"chinook": "accessories",
 		"diablo": "user/science",
 		"fremantle": "user/science",
-		"mer": "user/science",
 	}[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-ejpi.png",
-		"chinook": "26x26-ejpi.png",
 		"diablo": "26x26-ejpi.png",
 		"fremantle": "64x64-ejpi.png", # Fremantle natively uses 48x48
-		"mer": "64x64-ejpi.png",
 	}[distribution]
-	p["/usr/bin"] = [ "ejpi.py" ]
-	for relPath, files in unflatten_files(find_files(".")).iteritems():
-		fullPath = "/usr/lib/ejpi"
+	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
 		)
-	p["/usr/share/applications/hildon"] = ["ejpi.desktop"]
+	p["/usr/share/applications/hildon"] = ["%s.desktop" % __appname__]
 	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-ejpi.png|ejpi.png"]
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-ejpi.png|ejpi.png"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-ejpi.png|ejpi.png"]
 
-	print p
-	print p.generate(
-		version="%s-%s" % (__version__, __build__),
-		changelog=__changelog__,
-		build=True,
-		tar=True,
-		changes=True,
-		dsc=True,
-	)
-	print "Building for %s finished" % distribution
+	if distribution == "debian":
+		print p
+		print p.generate(
+			version="%s-%s" % (__version__, __build__),
+			changelog=__changelog__,
+			build=True,
+			tar=False,
+			changes=False,
+			dsc=False,
+		)
+		print "Building for %s finished" % distribution
+	else:
+		print p
+		print p.generate(
+			version="%s-%s" % (__version__, __build__),
+			changelog=__changelog__,
+			build=False,
+			tar=True,
+			changes=True,
+			dsc=True,
+		)
+		print "Building for %s finished" % distribution
 
 
 if __name__ == "__main__":