Noticed 2 bugs, fixed one

[gc-dialer] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index 5f84a0b..c910be1 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -1,5 +1,9 @@
 #!/usr/bin/python2.5
 
+"""
+@bug In update desrcription stuff
+"""
+
 import os
 import sys
 
@@ -19,19 +23,31 @@ __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
 1.0.6
-* Fixing some dependencies for Diablo
-* Fixed error on refreshing tabs when not logged in
-* Adding seperator between dialcentral launches in log
-* Fixed Bug #4471 Notification Checkbox Won't Stay Checked (hour roll over error)
-* Implemented a work around for https://bugs.maemo.org/show_bug.cgi?id=4957
-* Fixing a bug where phone numbers in texts wouldn't appear
-* Deletes notifications on uninstall
-* Fixed category for Fremantle/Diablo
-* Fixed needing to manually create "~/.dialcentral" due to earlier logging changes
-* Fixed dependencies for fremantle
-* Including a vastly improved py2deb
-* Tweaked sizes of stuff on recent tab
-* Starting some work on rotation support for fremantle
+* Fremantle Prep: Simplified menus in prep for no menu or the Fremantle App Menu
+* Fremantle Prep: Implemented a work around for https://bugs.maemo.org/show_bug.cgi?id=4957
+* Fremantle Prep: Switched to touch selectors for notification time, callback number, and contact addressbook
+* Fremantle Prep: Making various widgets pannable rather than scrollable
+* Fremantle Prep: CTRL-V added for paste for Dialpad
+* Fremantle Prep: CTRL-Enter added for fullscreen
+* UI Tweak: Phone selection and SMS Message dialogs now highlight the last message and are easier to scroll
+* UI Tweak: Tweaked sizes of stuff on recent tab
+* UI Tweak: Added notifcations for various things like login and dialing
+* UI Tweak: Switch to accounts tab when logging in and callback is blank as a sublte hint to configure it
+* UI Tweak: Switch to accounts tab on failed login to remind the user they are not logged in
+* Packaging: Disables notifications on uninstall
+* Packaging: Including a vastly improved py2deb for better packages (icons on package, etc)
+* Debugging: Adding seperator between dialcentral launches in log
+* Bug Fix: Made startup more error resistant
+* Bug Fix: some dependencies for Diablo
+* Bug Fix: Error on refreshing tabs when not logged in
+* Bug Fix: #4471 Notification Checkbox Won't Stay Checked (hour roll over error)
+* Bug Fix: Phone numbers in voicemails wouldn't appear
+* Bug Fix: category for Fremantle/Diablo
+* Bug Fix: needing to manually create "~/.dialcentral" due to earlier logging changes
+* Bug Fix: dependencies for fremantle
+* Bug Fix: Issues when trying to stack error messages
+* Bug Fix: Python2.6 deprecates some stuff I did
+* Bug Fix: On refreshing the Accounts tab, the callback number resets to the number from startup
 
 1.0.5
 * Contacts Tab remembers the last address book viewed on restart
@@ -150,7 +166,7 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor
 
 __preremove__ = """#!/bin/sh -e
 
-/usr/lib/dialcentral/alarm_handler.py -d
+python /usr/lib/dialcentral/alarm_handler.py -d || true
 """
 
 
@@ -183,6 +199,7 @@ def build_package(distribution):
        py2deb.Py2deb.SECTIONS = py2deb.SECTIONS_BY_POLICY[distribution]
        p = py2deb.Py2deb(__appname__)
        p.description = __description__
+       p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
        p.author = __author__
        p.mail = __email__
        p.license = "lgpl"
@@ -190,19 +207,20 @@ 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 += {
-               "chinook": "",
-               "diablo": "",
-               "fremantle": ", python-glade2",
-               "mer": ", python-glade2",
+               "debian": ", python-glade2",
+               "chinook": maemoSpecificDepends,
+               "diablo": maemoSpecificDepends,
+               "fremantle": maemoSpecificDepends + ", python-glade2",
+               "mer": maemoSpecificDepends + ", python-glade2",
        }[distribution]
        p.recommends = ", ".join([
-               "python-osso | python2.5-osso",
-               "python-dbus | python2.5-dbus",
-               "python-hildon | python2.5-hildon",
        ])
        p.section = {
+               "debian": "comm",
                "chinook": "communication",
                "diablo": "user/network",
                "fremantle": "user/network",
@@ -210,12 +228,18 @@ def build_package(distribution):
        }[distribution]
        p.arch = "all"
        p.urgency = "low"
-       p.distribution = "chinook diablo fremantle mer"
+       p.distribution = "chinook diablo fremantle mer debian"
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.preremove = __preremove__
-       p.icon = "26x26-dialcentral.png"
+       p.icon = {
+               "debian": "26x26-dialcentral.png",
+               "chinook": "26x26-dialcentral.png",
+               "diablo": "26x26-dialcentral.png",
+               "fremantle": "64x64-dialcentral.png", # Fremantle natively uses 48x48
+               "mer": "64x64-dialcentral.png",
+       }[distribution]
        p["/usr/bin"] = [ "dialcentral.py" ]
        for relPath, files in unflatten_files(find_files(".")).iteritems():
                fullPath = "/usr/lib/dialcentral"