[med-svn] [python-mne] 09/13: debian/patches - dropped CPed from upstream changeset_9c7ef6d1*

[Yaroslav Halchenko]

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

yoh pushed a commit to branch master
in repository python-mne.

commit a071e9fbf694c801889c199894fe70d8d96a7442
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Wed Nov 25 11:02:41 2015 -0500

    debian/patches - dropped CPed from upstream changeset_9c7ef6d1*
---
 debian/changelog                                   | 10 +++--
 ...t_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff | 46 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8faa690..4816dc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-python-mne (0.10.1+dfsg-3.0) UNRELEASED; urgency=medium
+python-mne (0.10.1+dfsg-1) UNRELEASED; urgency=medium
 
-  * NMU
+  [ Jaakko Leppakangas ]
   * New upstream version
   * Removed depedency on mayavi2
 
- -- Jaakko Leppakangas <jaeilepp at student.jyu.fi>  Wed, 25 Nov 2015 04:05:27 -0500
+  [ Yaroslav Halchenko ]
+  * debian/patches
+    - dropped CPed from upstream changeset_9c7ef6d1*
+
+ -- Yaroslav Halchenko <debian at onerussian.com>  Wed, 25 Nov 2015 11:02:06 -0500
 
 python-mne (0.8.6+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff b/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
deleted file mode 100644
index bce913e..0000000
--- a/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-commit b9d4df78db7aaeda1feb58c18b0071934de2361e
-Author: Eric89GXL <larson.eric.d at gmail.com>
-Date:   Wed Nov 12 10:22:45 2014 -0800
-
-    ENH: Allow not writing home
-
---- a/mne/utils.py
-+++ b/mne/utils.py
-@@ -24,6 +24,8 @@ from math import log, ceil
- import json
- import ftplib
- import hashlib
-+from functools import partial
-+import atexit
- 
- import numpy as np
- import scipy
-@@ -983,8 +985,12 @@ def get_subjects_dir(subjects_dir=None,
-     return subjects_dir
- 
- 
-+_temp_home_dir = None
-+
-+
- def _get_extra_data_path(home_dir=None):
-     """Get path to extra data (config, tables, etc.)"""
-+    global _temp_home_dir
-     if home_dir is None:
-         # this has been checked on OSX64, Linux64, and Win32
-         if 'nt' == os.name.lower():
-@@ -996,7 +1002,14 @@ def _get_extra_data_path(home_dir=None):
-             # of script that isn't launched via the command line (e.g. a script
-             # launched via Upstart) then the HOME environment variable will
-             # not be set.
--            home_dir = os.path.expanduser('~')
-+            if os.getenv('MNE_DONTWRITE_HOME', '') == 'true':
-+                if _temp_home_dir is None:
-+                    _temp_home_dir = tempfile.mkdtemp()
-+                    atexit.register(partial(shutil.rmtree, _temp_home_dir,
-+                                            ignore_errors=True))
-+                home_dir = _temp_home_dir
-+            else:
-+                home_dir = os.path.expanduser('~')
- 
-         if home_dir is None:
-             raise ValueError('mne-python config file path could '
diff --git a/debian/patches/series b/debian/patches/series
index 751e8b0..d34bb93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
 changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff
 paths

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git