Removing chinook and mer

diff --git a/Makefile b/Makefile
index c2f2fda..9a56c1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,18 +54,12 @@ 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
        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
@@ -73,7 +67,6 @@ package: $(OBJ)
 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)

diff --git a/src/hildonize.py b/src/hildonize.py
index 09ee705..77d585a 100755 (executable)
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -277,30 +277,16 @@ else:
        hildonize_text_entry = _null_hildonize_text_entry
 
 
-def _hildon_mark_window_rotatable(window):
-       # gtk documentation is unclear whether this does a "=" or a "|="
-       window.set_flags(hildon.HILDON_PORTRAIT_MODE_SUPPORT)
-
-
-def _null_mark_window_rotatable(window):
-       pass
-
-
-try:
-       hildon.HILDON_PORTRAIT_MODE_SUPPORT
-       mark_window_rotatable = _hildon_mark_window_rotatable
-except AttributeError:
-       mark_window_rotatable = _null_mark_window_rotatable
-
-
 def _hildon_window_to_portrait(window):
        # gtk documentation is unclear whether this does a "=" or a "|="
-       window.set_flags(hildon.HILDON_PORTRAIT_MODE_SUPPORT)
+       flags = hildon.PORTRAIT_MODE_SUPPORT | hildon.PORTRAIT_MODE_REQUEST
+       hildon.hildon_gtk_window_set_portrait_flags(window, flags)
 
 
 def _hildon_window_to_landscape(window):
        # gtk documentation is unclear whether this does a "=" or a "&= ~"
-       window.unset_flags(hildon.HILDON_PORTRAIT_MODE_REQUEST)
+       flags = hildon.PORTRAIT_MODE_SUPPORT
+       hildon.hildon_gtk_window_set_portrait_flags(window, flags)
 
 
 def _null_window_to_portrait(window):
@@ -312,8 +298,9 @@ def _null_window_to_landscape(window):
 
 
 try:
-       hildon.HILDON_PORTRAIT_MODE_SUPPORT
-       hildon.HILDON_PORTRAIT_MODE_REQUEST
+       hildon.PORTRAIT_MODE_SUPPORT
+       hildon.PORTRAIT_MODE_REQUEST
+       hildon.hildon_gtk_window_set_portrait_flags
 
        window_to_portrait = _hildon_window_to_portrait
        window_to_landscape = _hildon_window_to_landscape

diff --git a/support/builddeb.py b/support/builddeb.py
index d3f8b32..7291511 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -13,8 +13,11 @@ import constants
 
 __appname__ = constants.__app_name__
 __description__ = """A Touch Screen Optimized RPN Calculator using Pie Menus
+.
 RPN: Stack based math, come on it is fun
+.
 Pie Menus: Press them or press-drag them
+.
 History: Its such a drag, so drag them around, delete them, etc
 .
 Homepage: http://ejpi.garage.maemo.org/
@@ -121,30 +124,24 @@ def build_package(distribution):
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
                "debian": ", python-glade2",
-               "chinook": maemoSpecificDepends,
                "diablo": maemoSpecificDepends,
                "fremantle": maemoSpecificDepends + ", python-glade2",
-               "mer": maemoSpecificDepends + ", python-glade2",
        }[distribution]
        p.section = {
                "debian": "math",
-               "chinook": "accessories",
                "diablo": "user/science",
                "fremantle": "user/science",
-               "mer": "user/science",
        }[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.icon = {
                "debian": "26x26-ejpi.png",
-               "chinook": "26x26-ejpi.png",
                "diablo": "26x26-ejpi.png",
                "fremantle": "64x64-ejpi.png", # Fremantle natively uses 48x48
-               "mer": "64x64-ejpi.png",
        }[distribution]
        p["/usr/bin"] = [ "ejpi.py" ]
        for relPath, files in unflatten_files(find_files(".")).iteritems():

diff --git a/www/download.html b/www/download.html
index 75fc0ba..8f58190 100644 (file)
--- a/www/download.html
+++ b/www/download.html
@@ -19,7 +19,7 @@
 
                <h3>Development</h3>
                <h4>Source</h4>
-               <p>For the most up to date version check out <a href="https://garage.maemo.org/scm/?group_id=887">svn</a>.
+               <p>For the most up to date version check out <a href="https://garage.maemo.org/scm/?group_id=887">git</a>.
                </p>
                <p>Requires</p>
                <ul>