[mousetrap/gnome3-wip: 4/240] Moved mousetrap.app.main to mousetrap.main

[Heidi Ellis <heidiellis src gnome org>]

commit 34a9c10a0438d73ab04b85a967b61a9c99937a05
Author: Kevin Brown <kbrown rediker com>
Date:   Thu Apr 17 08:37:13 2014 -0400

    Moved mousetrap.app.main to mousetrap.main
    
    This moves the main controller file to the mousetrap root.

 src/mousetrap/Makefile.am       |    3 ++-
 src/mousetrap/app/Makefile.am   |    3 +--
 src/mousetrap/app/mousetrap.in  |    2 +-
 src/mousetrap/{app => }/main.py |    9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/src/mousetrap/Makefile.am b/src/mousetrap/Makefile.am
index a65920e..44db681 100644
--- a/src/mousetrap/Makefile.am
+++ b/src/mousetrap/Makefile.am
@@ -1,7 +1,8 @@
 mousetrap_pathdir=$(pyexecdir)
 
 mousetrap_python_PYTHON = \
-       __init__.py 
+       __init__.py \
+       main.py
 
 SUBDIRS = app ocvfw
 
diff --git a/src/mousetrap/app/Makefile.am b/src/mousetrap/app/Makefile.am
index 03d93a1..0ed74d8 100644
--- a/src/mousetrap/app/Makefile.am
+++ b/src/mousetrap/app/Makefile.am
@@ -9,8 +9,7 @@ mousetrap_pathdir=$(pyexecdir)
 mousetrap_python_PYTHON = \
        environment.py \
        debug.py \
-       __init__.py \
-       main.py
+       __init__.py
 
 
 SUBDIRS = lib ui addons
diff --git a/src/mousetrap/app/mousetrap.in b/src/mousetrap/app/mousetrap.in
index 52c8dd8..3e9fe59 100644
--- a/src/mousetrap/app/mousetrap.in
+++ b/src/mousetrap/app/mousetrap.in
@@ -34,5 +34,5 @@ import sys
 sys.path.append('@pyexecdir@')
 
 # Load and start the mousetrap controller.
-import mousetrap.app.main as mousetrap
+import mousetrap.main as mousetrap
 mousetrap.Controller().start()
diff --git a/src/mousetrap/app/main.py b/src/mousetrap/main.py
similarity index 97%
rename from src/mousetrap/app/main.py
rename to src/mousetrap/main.py
index ebee204..6d48ce9 100644
--- a/src/mousetrap/app/main.py
+++ b/src/mousetrap/main.py
@@ -47,11 +47,12 @@ from mousetrap.app import environment as env
 
 from mousetrap.ocvfw import pocv
 
-from .ui.i18n import _
-from .ui.main import MainGui
-from .ui.scripts import get_script_class
+from mousetrap.app.ui.i18n import _
+from mousetrap.app.ui.main import MainGui
+from mousetrap.app.ui.scripts import get_script_class
+
+from mousetrap.app.lib import httpd, dbusd, settings
 
-from .lib import httpd, dbusd, settings
 
 class Controller():
     """