Optification due to readhing the rootfs limit

diff --git a/src/constants.py b/src/constants.py
index 961f16c..4999df0 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Gonvert"
 __app_name__ = "gonvert"
 __version__ = "1.0.1"
 __pretty_app_name__ = "Gonvert"
 __app_name__ = "gonvert"
 __version__ = "1.0.1"

-__build__ = 0
+__build__ = 2

 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".gonvert")
 _user_settings_ = "%s/settings.json" % _data_path_
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".gonvert")
 _user_settings_ = "%s/settings.json" % _data_path_

diff --git a/src/gonvert.py b/src/gonvert.py
index 2aabb5c..3c91235 100755 (executable)
--- a/src/gonvert.py
+++ b/src/gonvert.py
@@ -6,7 +6,7 @@ import logging
 
 
 _moduleLogger = logging.getLogger("gonvert")
 
 
 _moduleLogger = logging.getLogger("gonvert")

-sys.path.append("/usr/lib/gonvert/")
+sys.path.append("/opt/gonvert/lib")

 
 
 import constants
 
 
 import constants

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index e42b1e4..77ce4af 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -70,9 +70,8 @@ class Gonvert(object):
        _glade_files = [
                os.path.join(os.path.dirname(__file__), "gonvert.glade"),
                os.path.join(os.path.dirname(__file__), "../data/gonvert.glade"),
        _glade_files = [
                os.path.join(os.path.dirname(__file__), "gonvert.glade"),
                os.path.join(os.path.dirname(__file__), "../data/gonvert.glade"),

-               os.path.join(os.path.dirname(__file__), "../lib/gonvert.glade"),
+               os.path.join(os.path.dirname(__file__), "../share/gonvert.glade"),

                '/usr/share/gonvert/gonvert.glade',
                '/usr/share/gonvert/gonvert.glade',

-               '/usr/lib/gonvert/gonvert.glade',

        ]
 
        UNITS_NAME_IDX = 0
        ]
 
        UNITS_NAME_IDX = 0

diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py
index cd131b5..e2489e1 100755 (executable)
--- a/src/gonvert_qt.py
+++ b/src/gonvert_qt.py
@@ -58,10 +58,10 @@ class Gonvert(object):
 
        _DATA_PATHS = [
                os.path.dirname(__file__),
 
        _DATA_PATHS = [
                os.path.dirname(__file__),

+               os.path.join(os.path.dirname(__file__), "../share"),

                os.path.join(os.path.dirname(__file__), "../data"),
                os.path.join(os.path.dirname(__file__), "../data"),

-               os.path.join(os.path.dirname(__file__), "../lib"),

                '/usr/share/gonvert',
                '/usr/share/gonvert',

-               '/usr/lib/gonvert',
+               '/opt/gonvert/share',

        ]
 
        def __init__(self, app):
        ]
 
        def __init__(self, app):

diff --git a/support/builddeb.py b/support/builddeb.py
index 1804b25..d1eba3d 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -19,7 +19,7 @@ __email__ = "anthony@unihedron.com"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """

-* Maemo 4.1 support
+* Optification

 """
 
 
 """
 
 

@@ -95,9 +95,9 @@ def build_package(distribution):
                "diablo": "data-pixmaps-gonvert.png",
                "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48
        }[distribution]
                "diablo": "data-pixmaps-gonvert.png",
                "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48
        }[distribution]

-       p["/usr/bin"] = [ "gonvert.py" ]
+       p["/opt/gonvert/bin"] = [ "gonvert.py" ]

        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():

-               fullPath = "/usr/lib/gonvert"
+               fullPath = "/opt/gonvert/lib"

                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(
                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(

@@ -105,7 +105,7 @@ def build_package(distribution):
                        for (oldName, newName) in files
                )
        for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
                        for (oldName, newName) in files
                )
        for relPath, files in unflatten_files(find_files("data", ".")).iteritems():

-               fullPath = "/usr/share/gonvert"
+               fullPath = "/opt/gonvert/share"

                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(
                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(

diff --git a/support/gonvert.desktop b/support/gonvert.desktop
index b48eb51..ef36e40 100644 (file)
--- a/support/gonvert.desktop
+++ b/support/gonvert.desktop
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Name=Gonvert
 Version=1.0
 Type=Application
 Name=Gonvert

-Exec=/usr/bin/run-standalone.sh /usr/bin/gonvert.py
+Exec=/usr/bin/run-standalone.sh /opt/gonvert/bin/gonvert.py

 Icon=gonvert
 Icon=gonvert

diff --git a/www/gonvert.deb b/www/gonvert.deb
index 7b199cb..b0749be 100644 (file)
Binary files a/www/gonvert.deb and b/www/gonvert.deb differ