[med-svn] [python-mne] 03/03: updated changelog and removed one of the adopted patches

[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 324a95e6a522c8e912cd053339f5e828991a4674
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Wed Sep 24 08:22:55 2014 -0400

    updated changelog and removed one of the adopted patches
---
 debian/changelog                                          |  4 ++--
 ...hangeset_4a1b139e46d9b975188c74eda8e6cc74904636e1.diff | 15 ---------------
 debian/patches/series                                     |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afb7d52..bdeb0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-mne (0.8.3+dfsg-1) UNRELEASED; urgency=low
+python-mne (0.8.4+dfsg-1) unstable; urgency=low
 
   [ Alexandre Gramfort ]
   * New upstream version.
@@ -17,7 +17,7 @@ python-mne (0.8.3+dfsg-1) UNRELEASED; urgency=low
     - added mayavi2 and jquery packages into build-depends for robust 
       build across all Debian/Ubuntu releases and extended testing
 
- -- Yaroslav Halchenko <debian at onerussian.com>  Mon, 22 Sep 2014 11:17:31 +0200
+ -- Yaroslav Halchenko <debian at onerussian.com>  Wed, 24 Sep 2014 08:20:50 -0400
 
 python-mne (0.7.3-1) unstable; urgency=low
 
diff --git a/debian/patches/changeset_4a1b139e46d9b975188c74eda8e6cc74904636e1.diff b/debian/patches/changeset_4a1b139e46d9b975188c74eda8e6cc74904636e1.diff
deleted file mode 100644
index 488f1c1..0000000
--- a/debian/patches/changeset_4a1b139e46d9b975188c74eda8e6cc74904636e1.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Yaroslav Halchenko <debian at onerussian.com>
-Subject: BF: explicitly encode to UTF8 when saving report to a file
-  Otherwise, if it ended up being a unicode, saving might fail
-
---- a/mne/report.py
-+++ b/mne/report.py
-@@ -832,7 +832,7 @@ class Report(object):
-         if overwrite or not op.isfile(fname):
-             logger.info('Saving report to location %s' % fname)
-             fobj = open(fname, 'w')
--            fobj.write(_fix_global_ids(''.join(self.html)))
-+            fobj.write(_fix_global_ids(''.join(self.html)).encode('utf8'))
-             fobj.close()
- 
-             # remove header, TOC and footer to allow more saves
diff --git a/debian/patches/series b/debian/patches/series
index 051910d..87a6838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-changeset_4a1b139e46d9b975188c74eda8e6cc74904636e1.diff
 changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff
 debian_paths

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