Removing chinook/mer support

diff --git a/Makefile b/Makefile
index 4ed01ef..68d546f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,18 +51,12 @@ package: $(OBJ)
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic
 
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/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
        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)/diablo
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
        cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
        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
        mkdir -p $(BUILD_PATH)/debian
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian

@@ -70,7 +64,6 @@ package: $(OBJ)
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes

-       dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes

        cp $(BUILD_PATH)/debian/*.deb www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
        cp $(BUILD_PATH)/debian/*.deb www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)

diff --git a/support/builddeb.py b/support/builddeb.py
index b378630..f5bf9c9 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -198,33 +198,27 @@ def build_package(distribution):
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
                "debian": ", python-glade2",
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
                "debian": ", python-glade2",

-               "chinook": maemoSpecificDepends,

                "diablo": maemoSpecificDepends,
                "fremantle": maemoSpecificDepends + ", python-glade2",
                "diablo": maemoSpecificDepends,
                "fremantle": maemoSpecificDepends + ", python-glade2",

-               "mer": maemoSpecificDepends + ", python-glade2",

        }[distribution]
        p.recommends = ", ".join([
        ])
        p.section = {
                "debian": "science",
        }[distribution]
        p.recommends = ", ".join([
        ])
        p.section = {
                "debian": "science",

-               "chinook": "other",

                "diablo": "user/science",
                "fremantle": "user/science",
                "diablo": "user/science",
                "fremantle": "user/science",

-               "mer": "user/science",

        }[distribution]
        p.arch = "all"
        p.urgency = "low"
        }[distribution]
        p.arch = "all"
        p.urgency = "low"

-       p.distribution = "chinook diablo fremantle mer debian"
+       p.distribution = "diablo fremantle debian"

        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.preremove = __preremove__
        p.icon = {
                "debian": "data-pixmaps-gonvert.png",
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.preremove = __preremove__
        p.icon = {
                "debian": "data-pixmaps-gonvert.png",

-               "chinook": "data-pixmaps-gonvert.png",

                "diablo": "data-pixmaps-gonvert.png",
                "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48
                "diablo": "data-pixmaps-gonvert.png",
                "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48

-               "mer": "data-pixmaps-gonvert.png",

        }[distribution]
        p["/usr/bin"] = [ "gonvert.py" ]
        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
        }[distribution]
        p["/usr/bin"] = [ "gonvert.py" ]
        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():