[med-svn] [python-mne] 02/02: forgotten import -- was already in upstream before picked up commit

Yaroslav Halchenko debian at onerussian.com
Wed Nov 25 15:52:55 UTC 2015


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

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

commit a9e829c904d66aa12f1d99fd25607ffb3d14af9d
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Thu Dec 11 09:37:53 2014 -0500

    forgotten import -- was already in upstream before picked up commit
---
 debian/changelog                                                   | 2 +-
 .../changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b829f4..4c3fd04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-mne (0.8.6+dfsg-1) unstable; urgency=medium
+python-mne (0.8.6+dfsg-2) unstable; urgency=medium
 
   * debian/{rules.patches/changeset_b9d4d*}
     Absorb upstream patch and specify not using HOME directory for generated
diff --git a/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff b/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
index df5e861..bce913e 100644
--- a/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
+++ b/debian/patches/changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff
@@ -6,15 +6,16 @@ Date:   Wed Nov 12 10:22:45 2014 -0800
 
 --- a/mne/utils.py
 +++ b/mne/utils.py
-@@ -24,6 +24,7 @@ from math import log, ceil
+@@ -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 +984,12 @@ def get_subjects_dir(subjects_dir=None,
+@@ -983,8 +985,12 @@ def get_subjects_dir(subjects_dir=None,
      return subjects_dir
  
  
@@ -27,7 +28,7 @@ Date:   Wed Nov 12 10:22:45 2014 -0800
      if home_dir is None:
          # this has been checked on OSX64, Linux64, and Win32
          if 'nt' == os.name.lower():
-@@ -996,7 +1001,14 @@ def _get_extra_data_path(home_dir=None):
+@@ -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.

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



More information about the debian-med-commit mailing list