[mousetrap/gnome3-wip: 18/240] Rename main.py to controller.py and remove generated file and fix gitignore

[Heidi Ellis <heidiellis src gnome org>]

commit 4a6f4a7d65f4d68a9838402184e74876cc53834b
Author: Stoney Jackson <dr stoney gmail com>
Date:   Thu Apr 17 12:32:26 2014 -0400

    Rename main.py to controller.py and remove generated file and fix gitignore

 .gitignore                               |    2 +-
 README                                   |    1 -
 src/mousetrap/Makefile.am                |    2 +-
 src/mousetrap/{main.py => controller.py} |    0
 src/mousetrap/mousetrap                  |   38 ------------------------------
 src/mousetrap/mousetrap.in               |    4 +-
 6 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 405bfdb..392f9e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,7 @@ stamp-h1
 xmldocs.make
 docs/doxygen/Doxyfile
 po/stamp-it
-src/mousetrap/app/mousetrap
+src/mousetrap/mousetrap
 po/Makefile.in.in
 aclocal.m4
 *.py.bak
diff --git a/src/mousetrap/Makefile.am b/src/mousetrap/Makefile.am
index 5f08882..1d4bf8d 100644
--- a/src/mousetrap/Makefile.am
+++ b/src/mousetrap/Makefile.am
@@ -8,7 +8,7 @@ mousetrap_pathdir=$(pyexecdir)
 mousetrap_python_PYTHON = \
        __init__.py \
        environment.py \
-       main.py
+       controller.py
 
 SUBDIRS = app ocvfw
 
diff --git a/src/mousetrap/main.py b/src/mousetrap/controller.py
similarity index 100%
rename from src/mousetrap/main.py
rename to src/mousetrap/controller.py
diff --git a/src/mousetrap/mousetrap.in b/src/mousetrap/mousetrap.in
index 3e9fe59..12a4402 100644
--- a/src/mousetrap/mousetrap.in
+++ b/src/mousetrap/mousetrap.in
@@ -34,5 +34,5 @@ import sys
 sys.path.append('@pyexecdir@')
 
 # Load and start the mousetrap controller.
-import mousetrap.main as mousetrap
-mousetrap.Controller().start()
+from mousetrap.controller import Controller
+Controller().start()