Merge branch 'master' into qt

[gc-dialer] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index 2119eaa..6fdad6b 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -86,15 +86,12 @@ def build_package(distribution):
        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",
+               "python-simplejson",
        ])
-       maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
-               "debian": ", python-glade2",
-               "diablo": maemoSpecificDepends + ", python2.5-conic",
-               "fremantle": maemoSpecificDepends + ", python-glade2, python-alarm",
+               "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.recommends = ", ".join([
        ])
@@ -124,6 +121,14 @@ def build_package(distribution):
                        "|".join((oldName, newName))
                        for (oldName, newName) in files
                )
+       for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
+               fullPath = "/opt/%s/share" % __appname__
+               if relPath:
+                       fullPath += os.sep+relPath
+               p[fullPath] = list(
+                       "|".join((oldName, newName))
+                       for (oldName, newName) in files
+               )
        p["/usr/share/applications/hildon"] = ["dialcentral.desktop"]
        p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-dialcentral.png|dialcentral.png"]
        p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-dialcentral.png|dialcentral.png"]