Fixing dependencies

[quicknote] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index 17a8614..fb58354 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -12,14 +12,38 @@ import constants
 
 
 __appname__ = constants.__app_name__
-__description__ = "Simple note taking application in a similar vein as PalmOS Memos"
+__description__ = """Simple note taking application in a similar vein as PalmOS Memos
+.
+Homepage: http://quicknote.garage.maemo.org/
+"""
 __author__ = "Christoph Wurstle"
 __email__ = "n800@axique.net"
 __version__ = constants.__version__
-__build__ = 0
-__changelog__ = '''
+__build__ = constants.__build__
+__changelog__ = """
+0.7.10
+ * Moved history to the (app)menu
+ * Moved search to Ctrl+f and (app)menu
+ * Switched category selection over to a touch selector entry, making it prettier and easier
+ * Deleting empty notes no longer prompts the user
+ * Cleaned up the history dialog a smidge
+ * Ctrl+w/q to quit
+ * Bug fix: not very consistent when a category is visible in dialogs
+
+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
+ * Spell checking (Desktop only)
+ * 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
@@ -47,14 +71,14 @@ __changelog__ = '''
 
 0.7.0
   * Initial Release.
-'''
+"""
 
 
-__postinstall__ = '''#!/bin/sh -e
+__postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
-exit 0
-'''
+rm -f ~/.quicknote/quicknote.log
+"""
 
 
 def find_files(path, root):
@@ -85,23 +109,49 @@ def build_package(distribution):
        except:
                pass
 
+       py2deb.Py2deb.SECTIONS = py2deb.SECTIONS_BY_POLICY[distribution]
        p = py2deb.Py2deb(__appname__)
+       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.author = __author__
        p.mail = __email__
-       p.license = "lgpl"
-       p.depends = {
-               "diablo": "python2.5, python2.5-gtk2",
-               "mer": "python2.6, python-gtk2",
+       p.license = "gpl"
+       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",
+       }[distribution]
+       p.section = {
+               "debian": "editors",
+               "chinook": "accessories",
+               "diablo": "user/office",
+               "fremantle": "user/office",
+               "mer": "user/office",
        }[distribution]
-       p.section = "user/other"
        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.icon = "26x26-quicknote.png"
+       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():
                fullPath = "/usr/share/locale"
@@ -120,18 +170,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__, __build__, changelog=__changelog__,
-               tar=True, dsc=True, changes=True, build=False, src=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__":