X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=support%2Fbuilddeb.py;h=c9bdb8310a7a4f3e0f760f17c28761413ec4689f;hp=a99e14cd9b46825bebccb16456dbd51141f6e990;hb=HEAD;hpb=8751944890714ed35b90b83ec1f555270ff79892

diff --git a/support/builddeb.py b/support/builddeb.py
index a99e14c..c9bdb83 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -12,13 +12,13 @@ import constants
 
 
 __appname__ = constants.__app_name__
-__description__ = """Streaming media player for inspirational streaming radio and audiobooks including the KJV Bible
+__description__ = """Media player for inspirational streaming radio and audiobooks including the KJV Bible
 Supports streaming:
 * "Mormon Channel" inspirational radio station
 * Conference precedings and magazines from The Church of Jesus Christ of Latter-day Saints
 * Scriptures, including King James Version of the Bible and the Book of Mormon
 .
-.This application is not endorsed by The Church of Jesus Christ of Latter-day Saints
+This application is not endorsed by The Church of Jesus Christ of Latter-day Saints
 .
 Homepage: http://watersofshiloah.garage.maemo.org
 """
@@ -27,13 +27,17 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-Initial release
+* Fixing Maemo 4.1
 """
 
 
 __postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
+rm -f ~/.%(name)s/%(name)s.log
+""" % {"name": constants.__app_name__}
+
+__preremove__ = """#!/bin/sh -e
 """
 
 
@@ -67,8 +71,7 @@ def build_package(distribution):
 	p = py2deb.Py2deb(__appname__)
 	p.prettyName = constants.__pretty_app_name__
 	p.description = __description__
-	p.bugTracker = ""
-	p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
+	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=Waters%%20of%%20Shiloah"
 	p.author = __author__
 	p.mail = __email__
 	p.license = "lgpl"
@@ -77,13 +80,13 @@ def build_package(distribution):
 		"python-gtk2 | python2.5-gtk2",
 		"python-xml | python2.5-xml",
 		"python-dbus | python2.5-dbus",
-		"python-gst0.10 | python2.5-gst0.10",
+		"python-telepathy | python2.5-telepathy",
 	])
 	maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
 	p.depends += {
-		"debian": "",
+		"debian": ", python-gst0.10",
 		"diablo": maemoSpecificDepends,
-		"fremantle": maemoSpecificDepends,
+		"fremantle": maemoSpecificDepends + ", python-gst0.10",
 	}[distribution]
 	p.recommends = ", ".join([
 	])
@@ -104,10 +107,17 @@ def build_package(distribution):
 		fullPath = "/opt/WatersOfShiloah/lib"
 		if relPath:
 			fullPath += os.sep+relPath
-		p[fullPath] = list(
+		fileLocationTransforms = list(
 			"|".join((oldName, newName))
 			for (oldName, newName) in files
 		)
+		if not relPath:
+			fileLocationTransforms.append({
+				"debian": "src-stream_gst.py|stream.py",
+				"diablo": "src-stream_osso.py|stream.py",
+				"fremantle": "src-stream_gst.py|stream.py",
+			}[distribution])
+		p[fullPath] = fileLocationTransforms
 	for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
 		fullPath = "/opt/WatersOfShiloah/share"
 		if relPath: