[Pkg-bitcoin-commits] [electrum] 12/13: Add patch to remove /usr/share check.

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit ab46fbe783e021dc251fc614486916e7573b352c
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Nov 28 00:37:47 2013 +0200

    Add patch to remove /usr/share check.
---
 debian/control                            |  2 +-
 debian/patches/dont_use_local_share.patch | 19 +++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 1b381bf..b573f4e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: utils
 Maintainer: Debian Bitcoin Packaging Team <pkg-bitcoin-devel at lists.alioth.debian.org>
 Uploaders: Vasudev Kamath <kamathvasudev at gmail.com>,
- Tristan Seligmann <mithrandi at mithrandi.net>
+ Tristan Seligmann <mithrandi at debian.org>
 Build-Depends: cdbs (>= 0.4.106~),
  debhelper,
  dh-buildinfo,
diff --git a/debian/patches/dont_use_local_share.patch b/debian/patches/dont_use_local_share.patch
new file mode 100644
index 0000000..463814a
--- /dev/null
+++ b/debian/patches/dont_use_local_share.patch
@@ -0,0 +1,19 @@
+Description: Do not not install into ~/.local
+ setup.py tries to be smart about installing into $XDG_DATA_HOME, but this is
+ never the right location for building a system package.
+Author: Tristan Seligmann <mithrandi at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-11-28
+Index: electrum/setup.py
+===================================================================
+--- electrum.orig/setup.py	2013-11-27 23:52:12.701659641 +0200
++++ electrum/setup.py	2013-11-28 00:26:40.881727396 +0200
+@@ -16,8 +16,6 @@
+     sys.exit("Error: Electrum requires Python version >= 2.6.0...")
+ 
+ usr_share = '/usr/share'
+-if not os.access(usr_share, os.W_OK):
+-    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
+ 
+ data_files = []
+ if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
diff --git a/debian/patches/series b/debian/patches/series
index 2613d4a..f732575 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 3001_dont_fetch_translations_from_web.patch
 2001_add_tailing_semicolon.patch
+dont_use_local_share.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git