This is an automated email from the git hooks/post-receive script. yoh pushed a commit to branch master in repository python-mne.
commit a252b451036ac4982eb6e649276261cc4617aa72 Merge: 87a79fc a9e829c Author: Yaroslav Halchenko <[email protected]> Date: Wed Nov 25 10:58:25 2015 -0500 Merge branch 'master' into debian-origin * master: forgotten import -- was already in upstream before picked up commit debian/{rules.patches/changeset_b9d4d*} Absorb upstream patch and specify not using HOME directory for generated pre-computed data, but instead use tempdir. (Closes: #768730) debian/changelog | 8 ++++ ...t_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff | 46 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 56 insertions(+), 1 deletion(-) diff --cc debian/changelog index c6392a3,4c3fd04..8faa690 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,11 +1,19 @@@ +python-mne (0.10.1+dfsg-3.0) UNRELEASED; urgency=medium + + * NMU + * New upstream version + * Removed depedency on mayavi2 + + -- Jaakko Leppakangas <[email protected]> Wed, 25 Nov 2015 04:05:27 -0500 + + 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 + pre-computed data, but instead use tempdir. (Closes: #768730) + + -- Yaroslav Halchenko <[email protected]> Thu, 11 Dec 2014 09:33:18 -0500 + python-mne (0.8.6+dfsg-1) unstable; urgency=low * New upstream version diff --cc debian/patches/series index d34bb93,0b56cc9..751e8b0 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,2 -1,3 +1,3 @@@ + changeset_b9d4df78db7aaeda1feb58c18b0071934de2361e.diff changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff -debian_paths +paths diff --cc debian/rules index 920b4cd,4510dbe..98e6e01 --- a/debian/rules +++ b/debian/rules @@@ -13,10 -13,9 +13,10 @@@ override_dh_clean override_dh_auto_build: dh_auto_build yui-compressor debian/JS/bootstrap/bootstrap.js > $(CURDIR)/mne/html/bootstrap.min.js + echo -e "\n" >> $(CURDIR)/mne/html/bootstrap.min.js override_dh_auto_test: - MNE_SKIP_SAMPLE_DATASET_TESTS=true MNE_FORCE_SERIAL=true MNE_SKIP_NETWORK_TESTS=1 \ + MNE_DONTWRITE_HOME=true MNE_SKIP_SAMPLE_DATASET_TESTS=true MNE_FORCE_SERIAL=true MNE_SKIP_NETWORK_TESTS=1 \ xvfb-run --auto-servernum --server-num=20 -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset" \ $(NOSETESTS) mne -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
