[Pkg-bitcoin-commits] [electrum] 07/11: - Remove 2002_dont_use_local_share.patch: obsolete.

[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 e613bc6dfb0a8eab47aca06fd14ff9f5b8c8aaad
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri May 1 22:15:57 2015 +0200

      - Remove 2002_dont_use_local_share.patch: obsolete.
---
 debian/changelog                               |  3 ++-
 debian/patches/2002_dont_use_local_share.patch | 17 -----------------
 debian/patches/series                          |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d22a406..a632305 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ electrum (2.1.1-1) UNRELEASED; urgency=medium
   [ Tristan Seligmann ]
   * New upstream release.
     - Update debian/watch.
-    - Remove 3001_dont_fetch_translations_from_web.patch: no longer necessary.
+    - Remove 3001_dont_fetch_translations_from_web.patch: obsolete.
     - Remove 2001_add_tailing_semicolon.patch: merged upstream.
+    - Remove 2002_dont_use_local_share.patch: obsolete.
 
  -- Vasudev Kamath <kamathvasudev at gmail.com>  Sun, 23 Nov 2014 20:07:00 +0530
 
diff --git a/debian/patches/2002_dont_use_local_share.patch b/debian/patches/2002_dont_use_local_share.patch
deleted file mode 100644
index 46adedb..0000000
--- a/debian/patches/2002_dont_use_local_share.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
---- a/setup.py
-+++ b/setup.py
-@@ -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 6579343..98cfd78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-2002_dont_use_local_share.patch
 1001_use_sslv23_method.patch
 1002_qt_compatibility.patch

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