rename gui package

diff --git a/electrum b/electrum
index a277cf9..f9b795f 100755 (executable)
--- a/electrum
+++ b/electrum
@@ -126,7 +126,7 @@ if __name__ == '__main__':
     if cmd == 'gui':
         gui_name = config.get('gui','classic')
         try:
-            gui = __import__('electrum_gui.gui_' + gui_name, fromlist=['electrumGUI'])
+            gui = __import__('electrum_gui.gui_' + gui_name, fromlist=['electrum_gui'])
         except ImportError:
             sys.exit("Error: Unknown GUI: " + gui_name )
         

diff --git a/setup.py b/setup.py
index 528ee96..37b4845 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ data_files += [
 setup(name = "Electrum",
     version = version.ELECTRUM_VERSION,
     install_requires = ['slowaes','ecdsa'],
-    package_dir = {'electrum': 'lib', 'electrumGUI': 'gui'},
+    package_dir = {'electrum': 'lib', 'electrum_gui': 'gui'},
     scripts= ['electrum'],
     data_files = data_files,
     py_modules = ['electrum.version',
@@ -62,22 +62,22 @@ setup(name = "Electrum",
                   'electrum.bitcoin',
                   'electrum.deserialize',
                   'electrum.verifier',
-                  'electrumGUI.gui',
-                  'electrumGUI.qt_console',
-                  'electrumGUI.gui_qt',
-                  'electrumGUI.gui_lite',
-                  'electrumGUI.gui_text',
-                  'electrumGUI.exchange_rate',
-                  'electrumGUI.icons_rc',
-                  'electrumGUI.pyqrnative',
-                  'electrumGUI.qrscanner',
-                  'electrumGUI.history_widget',
-                  'electrumGUI.receiving_widget',
-                  'electrumGUI.bmp',
-                  'electrumGUI.i18n'],
+                  'electrum_gui.gui_gtk',
+                  'electrum_gui.qt_console',
+                  'electrum_gui.gui_classic',
+                  'electrum_gui.gui_lite',
+                  'electrum_gui.gui_text',
+                  'electrum_gui.exchange_rate',
+                  'electrum_gui.icons_rc',
+                  'electrum_gui.pyqrnative',
+                  'electrum_gui.qrscanner',
+                  'electrum_gui.history_widget',
+                  'electrum_gui.receiving_widget',
+                  'electrum_gui.bmp',
+                  'electrum_gui.i18n'],
     description = "Lightweight Bitcoin Wallet",
-    author = "thomasv",
-    author_email = "thomasv@gitorious",
+    author = "ecdsa",
+    author_email = "ecdsa@github",
     license = "GNU GPLv3",
     url = "http://electrum-desktop.com",
     long_description = """Lightweight Bitcoin Wallet"""