Removing a superfluous check slowing down login

[theonering] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index 4f385a0..957767e 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -44,8 +44,8 @@ rm -f ~/.telepathy-theonering/theonering.log
 def find_files(path):
        for root, dirs, files in os.walk(path):
                for file in files:
-                       if file.startswith("src-"):
-                               fileParts = file.split("-")
+                       if file.startswith("src!"):
+                               fileParts = file.split("!")
                                unused, relPathParts, newName = fileParts[0], fileParts[1:-1], fileParts[-1]
                                assert unused == "src"
                                relPath = os.sep.join(relPathParts)
@@ -76,28 +76,33 @@ def build_package(distribution):
        p.author = __author__
        p.mail = __email__
        p.license = "lgpl"
+       p.section = {
+               "debian": "comm",
+               "diablo": "user/network",
+               "fremantle": "user/network",
+               "mer": "user/network",
+       }[distribution]
        p.depends = ", ".join([
                "python (>= 2.5) | python2.5",
                "python-dbus | python2.5-dbus",
                "python-gobject | python2.5-gobject",
                "python-telepathy | python2.5-telepathy",
        ])
-       p.section = {
-               "debian": "comm",
-               "chinook": "communication",
-               "diablo": "user/network",
-               "fremantle": "user/network",
-               "mer": "user/network",
+       p.depends += {
+               "debian": "",
+               "chinook": "",
+               "diablo": ", account-plugin-haze",
+               "fremantle": ", account-plugin-haze",
+               "mer": "",
        }[distribution]
        p.arch = "all"
        p.urgency = "low"
-       p.distribution = "chinook diablo fremantle mer debian"
+       p.distribution = "diablo fremantle mer debian"
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.icon = {
                "debian": "26x26-theonering.png",
-               "chinook": "26x26-theonering.png",
                "diablo": "26x26-theonering.png",
                "fremantle": "64x64-theonering.png", # Fremantle natively uses 48x48
                "mer": "64x64-theonering.png",
@@ -111,12 +116,13 @@ def build_package(distribution):
                        for (oldName, newName) in files
                )
        p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service"]
-       if distribution == "debian":
-               p["/usr/share/mission-control/profiles"] = ["theonering.profile"]
+       if distribution in ("debian", ):
+               p["/usr/share/mission-control/profiles"] = ["theonering.profile.%s|theonering.profile"% distribution]
+       elif distribution in ("diablo", "fremantle", "mer"):
+               p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
+       p["/usr/lib/telepathy"] = ["telepathy-theonering"]
        p["/usr/share/telepathy/managers"] = ["theonering.manager"]
-       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|theonering.png"]
-       p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-theonering.png|theonering.png"]
-       p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-theonering.png|theonering.png"]
+       p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|im-theonering.png"]
 
        if distribution == "debian":
                print p