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

electrum.desktop

@@ -6,7 +6,7 @@ Comment=Lightweight Bitcoin Client
 Exec=electrum %u
 GenericName[en_US]=Electrum
 GenericName=Electrum
-Icon=/usr/share/app-install/icons/electrum.png
+Icon=electrum
 Name[en_US]=Electrum Bitcoin Wallet
 Name=Electrum Bitcoin Wallet
 Categories=Network;

setup.py

@@ -21,7 +21,7 @@ if platform.system() == 'Linux' or platform.system() == 'FreeBSD':
     usr_share = os.path.join(sys.prefix, "share")
     data_files += [
         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-        (os.path.join(usr_share, 'app-install', 'icons/'), ['icons/electrum.png'])
+        (os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png'])
     ]