Trying to adapt to the Maemo 5, bumping to 0.1.0-3

* Added distribution dependent paths for the .profile file
* Switched the mission control icon to the The One Ring icon
* Removed Chinook since it didn't support rtcom (I think)

diff --git a/Makefile b/Makefile
index 2b26d83..ae3148d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,9 +52,6 @@ package: $(OBJ)
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic
 
-       mkdir -p $(BUILD_PATH)/chinook
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-       cd $(BUILD_PATH)/chinook ; python builddeb.py chinook
        mkdir -p $(BUILD_PATH)/diablo
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
        cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
@@ -71,7 +68,6 @@ package: $(OBJ)
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/telepathy-$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/telepathy-$(PROJECT_NAME)*.changes
-       dput chinook-extras-builder $(BUILD_PATH)/chinook/telepathy-$(PROJECT_NAME)*.changes
        cp $(BUILD_PATH)/debian/*.deb www/telepathy-$(PROJECT_NAME).deb
 
 lint: $(OBJ)

diff --git a/src/constants.py b/src/constants.py
index fdfb5c3..6218da6 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Telepathy-TheOneRing"
 __app_name__ = "telepathy-theonering"
 __version__ = "0.1.0"
-__build__ = 2
+__build__ = 3
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering")
 _user_settings_ = "%s/settings.ini" % _data_path_

diff --git a/support/builddeb.py b/support/builddeb.py
index 4f385a0..5939782 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -84,20 +84,18 @@ def build_package(distribution):
        ])
        p.section = {
                "debian": "comm",
-               "chinook": "communication",
                "diablo": "user/network",
                "fremantle": "user/network",
                "mer": "user/network",
        }[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,8 +109,10 @@ def build_package(distribution):
                        for (oldName, newName) in files
                )
        p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service"]
-       if distribution == "debian":
+       if distribution in ("debian", ):
                p["/usr/share/mission-control/profiles"] = ["theonering.profile"]
+       elif distribution in ("diablo", "fremantle", "mer"):
+               p["/usr/share/osso-rtcom"] = ["theonering.profile"]
        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"]

diff --git a/support/theonering.profile b/support/theonering.profile
index 181bcb9..a2314bd 100644 (file)
--- a/support/theonering.profile
+++ b/support/theonering.profile
@@ -2,7 +2,7 @@
 Manager=theonering
 Protocol=sip
 DisplayName=Google Voice
-IconName = im-google-talk
+IconName = theonering
 SupportsInvisible = 1
 Capabilities = chat-p2p, voice-p2p, supports-alias
 VCardDefault = 1