tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e2225ce17e8e8e66dabf24bafd49822d580325d5
DIR parent 2d84deeaad3f7f2e5706db7a562d8cec8a41c9ca
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 30 Mar 2015 14:12:02 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M electrum.desktop | 2 +-
M setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum.desktop b/electrum.desktop
t@@ -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;
DIR diff --git a/setup.py b/setup.py
t@@ -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'])
]