Removing Mer support

diff --git a/Makefile b/Makefile
index f630aa0..6c59a71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,6 @@ package: $(OBJ)
        mkdir -p $(BUILD_PATH)/fremantle
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
        cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
-       mkdir -p $(BUILD_PATH)/mer
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-       cd $(BUILD_PATH)/mer ; python builddeb.py mer
        mkdir -p $(BUILD_PATH)/debian
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian

diff --git a/support/builddeb.py b/support/builddeb.py
index 058b9e5..f9e1a27 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -317,7 +317,6 @@ def build_package(distribution):
                "debian": ", python-glade2",
                "diablo": maemoSpecificDepends + ", python2.5-conic",
                "fremantle": maemoSpecificDepends + ", python-glade2, python-alarm",
-               "mer": maemoSpecificDepends + ", python-glade2",
        }[distribution]
        p.recommends = ", ".join([
        ])
@@ -325,11 +324,10 @@ def build_package(distribution):
                "debian": "comm",
                "diablo": "user/network",
                "fremantle": "user/network",
-               "mer": "user/network",
        }[distribution]
        p.arch = "all"
        p.urgency = "low"
-       p.distribution = "diablo fremantle mer debian"
+       p.distribution = "diablo fremantle debian"
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
@@ -338,7 +336,6 @@ def build_package(distribution):
                "debian": "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():