X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=support%2Fbuilddeb.py;h=9b64e84363cca083dda55c2161c1bd4878e3d19b;hp=83940232255a3b12aaa3d92d5acd78263bbccab7;hb=d52589b00b9fa5e55a0b8f8160b8e02fbc219334;hpb=266a5c1fe33c8cefaf937780936c7a0ff6cc80e5

diff --git a/support/builddeb.py b/support/builddeb.py
index 8394023..9b64e84 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -21,48 +21,9 @@ __email__ = "n800@axique.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-0.7.9
- * UI Tweak: Removed "New Note..." due to weirdness and duplicated behavior
- * UI Tweak: Added App Menu to access some category functionality
- * Bugfix: Move To Category
- * Bugfix: Removed carriage return on Ctrl+Enter
- * Added .deb package support
-
-0.7.8
- * Spell checking
- * Fixing the application title
- * Fremantle Support
- * Ctrl+i and Ctrl+o to zoom in/out the interface
- * Ctrl+enter to fullscreen app
- * Ctrl+l to copy to clipboard the application debug log
-
-0.7.7
- * Slight modifications to the note history and SQL dialogs
- * On zoom, also hiding the history status and button
- * Touched up the note list, making it ellipsize at the end rather than scroll
- * Storing of zoom, wordwrap, and fullscreen settings
-
-0.7.6
-  * Line-wrap
-  * Zoom
-
-0.7.4
-  * fixed small bugs
-  * move category
-
-0.7.3
-  * fixed small bugs
-  * move category
-
-0.7.2
-  * improved sync, fixed a small bug
-
-0.7.1
-  * improved sync
-
-0.7.0
-  * Initial Release.
-"""
+ * Small bugfix for launch
+ * Some code cleanup
+""".strip()
 
 
 __postinstall__ = """#!/bin/sh -e
@@ -105,7 +66,7 @@ def build_package(distribution):
 	p.prettyName = constants.__pretty_app_name__
 	p.description = __description__
 	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=quicknote"
-	#p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
+	p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
 	p.author = __author__
 	p.mail = __email__
 	p.license = "gpl"
@@ -113,34 +74,29 @@ def build_package(distribution):
 		"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",
 	}[distribution]
 	p.section = {
 		"debian": "editors",
-		"chinook": "accessories",
 		"diablo": "user/office",
 		"fremantle": "user/office",
-		"mer": "user/office",
 	}[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-quicknote.png",
-		"chinook": "26x26-quicknote.png",
 		"diablo": "26x26-quicknote.png",
 		"fremantle": "48x48-quicknote.png", # Fremantle natively uses 48x48
-		"mer": "48x48-quicknote.png",
 	}[distribution]
 	p["/usr/bin"] = [ "quicknote.py" ]
 	for relPath, files in unflatten_files(find_files(".", "locale")).iteritems():
@@ -160,22 +116,33 @@ def build_package(distribution):
 			for (oldName, newName) in files
 		)
 	p["/usr/share/applications/hildon"] = ["quicknote.desktop"]
-	#p["/usr/share/dbus-1/services"] = ["quicknote.service"]
 	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-quicknote.png|quicknote.png"]
 	p["/usr/share/icons/hicolor/40x40/hildon"] = ["40x40-quicknote.png|quicknote.png"]
 	p["/usr/share/icons/hicolor/48x48/hildon"] = ["48x48-quicknote.png|quicknote.png"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-quicknote.png|quicknote.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__":