Merged frontend and backend into 'ventoo'

11 files changed, 3 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index ac6321e..1d665e6 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ for dirpath, dirnames, filenames in os.walk('modules'):
     built_data_files.append([os.path.join('/usr/share/ventoo/', dirpath), [os.path.join(dirpath, f) for f in filenames]])
 
 #update module search paths for install location
-f = open("src/backend/search_paths.py", 'a')
+f = open("src/ventoo/search_paths.py", 'a')
 f.write("\nmodules = ['/usr/share/ventoo/modules']\n")
 f.close()
 
@@ -23,8 +23,7 @@ setup(name='Ventoo',
       author='Christopher Harvey',
       author_email='chris@basementcode.com',
       url='http://www.google.ca/search?q=ventoo',
-      packages=['frontend', 'backend'],
-      package_dir={'frontend' : 'src/frontend',
-                   'backend' : 'src/backend'},
+      packages=['ventoo'],
+      package_dir={'ventoo' : 'src/ventoo'},
       data_files=built_data_files
      )
diff --git a/src/frontend/__init__.py b/src/frontend/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/src/frontend/__init__.py
+++ /dev/null
diff --git a/src/frontend/AugEditTree.py b/src/ventoo/AugEditTree.py
index 3400c91..5ad62cc 100644
--- a/src/frontend/AugEditTree.py
+++ b/src/ventoo/AugEditTree.py
@@ -20,7 +20,6 @@
 """
 
 import sys
-sys.path.append('../backend')
 import pygtk
 pygtk.require('2.0')
 import gtk
diff --git a/src/frontend/AugFileTree.py b/src/ventoo/AugFileTree.py
index 7e6c85f..7e6c85f 100644
--- a/src/frontend/AugFileTree.py
+++ b/src/ventoo/AugFileTree.py
diff --git a/src/frontend/ErrorDialog.py b/src/ventoo/ErrorDialog.py
index 64ad119..bd22c1e 100644
--- a/src/frontend/ErrorDialog.py
+++ b/src/ventoo/ErrorDialog.py
@@ -20,7 +20,6 @@
 """
 
 import sys
-sys.path.append('../backend')
 import os.path as osp
 import pygtk
 pygtk.require('2.0')
diff --git a/src/frontend/RcUpdateWindow.py b/src/ventoo/RcUpdateWindow.py
index 29533f7..5642c03 100644
--- a/src/frontend/RcUpdateWindow.py
+++ b/src/ventoo/RcUpdateWindow.py
@@ -21,7 +21,6 @@
 """
 
 import sys
-sys.path.append('../backend')
 import pygtk
 pygtk.require('2.0')
 import gtk
diff --git a/src/backend/VentooModule.py b/src/ventoo/VentooModule.py
index 35c79f9..35c79f9 100644
--- a/src/backend/VentooModule.py
+++ b/src/ventoo/VentooModule.py
diff --git a/src/backend/__init__.py b/src/ventoo/__init__.py
index e69de29..e69de29 100644
--- a/src/backend/__init__.py
+++ b/src/ventoo/__init__.py
diff --git a/src/backend/augeas_utils.py b/src/ventoo/augeas_utils.py
index 6db6551..6db6551 100644
--- a/src/backend/augeas_utils.py
+++ b/src/ventoo/augeas_utils.py
diff --git a/src/frontend/main.py b/src/ventoo/main.py
index 84dd7d9..84fe695 100644
--- a/src/frontend/main.py
+++ b/src/ventoo/main.py
@@ -20,7 +20,6 @@
 """
 
 import sys
-sys.path.append('../backend')
 import augeas
 import os.path as osp
 import pygtk
diff --git a/src/backend/search_paths.py b/src/ventoo/search_paths.py
index 5c0c24d..5c0c24d 100644
--- a/src/backend/search_paths.py
+++ b/src/ventoo/search_paths.py