Merge branch 'master' of git://github.com/spesmilo/electrum

contrib/build-wine/deterministic.spec

@@ -1,9 +1,9 @@
 # -*- mode: python -*-
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis(['electrum', 'gui/gui_classic.py', 'gui/gui_lite.py', 'gui/gui_text.py',
+a = Analysis(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui/text.py',
               'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py',
-              'lib/bitcoin.py', 'lib/deserialize.py' 
+              'lib/bitcoin.py'
               ],
              hiddenimports=["lib","gui"], 
              pathex=['lib:gui:plugins'],

setup-release.py

@@ -35,7 +35,7 @@ if sys.platform == 'darwin':
                                  includes = ['PyQt4.QtCore','PyQt4.QtGui', 'sip'],
                                  packages = ['lib', 'gui', 'plugins'],
                                  iconfile='electrum.icns',
-                                 plist=plist,
+#                                 plist=plist,
                                  resources=["data", "icons"])),
     )
 elif sys.platform == 'win32':