Merge branch 'master' into newdesign

* master:
  injected spykeview
  BF: added an alias for neo (python-neo)

diff --git a/future/blends/spykeview b/future/blends/spykeview
new file mode 100644 (file)
index 0000000..ed1ce15
--- /dev/null
+++ b/future/blends/spykeview
@@ -0,0 +1,13 @@
+Source: spykeview
+Tasks: debian-science/electrophysiology
+Homepage: https://github.com/rproepp/spykeviewer
+License: promised MIT or BSD-3
+Author: Robert Pröpper <robert.proepper@googlamil.com>
+Language: Python
+Version: 0.1.0
+WNPP: 687703
+Pkg-Description: GUI application for navigating, analyzing and visualizing electrophysiological datasets
+ Based on the neo framework, it works with a wide variety of data
+ formats.  Plugin interfaces allow for rapid extension with custom
+ analyses.
+Remark: Upstream promises public release by SfN 2012 in October

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 830b2bab46edae0220e822e7748ddc09772d2d01..935d1c99a6a08fa92045d0bf2540f1b289e8a967 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -63,6 +63,7 @@ neurodebian = neurodebian-dev neurodebian-desktop neurodebian-keyring neurodebia
 pytables = python-tables
 isis = isis-utils libisis-core-dev python-isis libisis-ioplugins-common libisis-ioplugins-dicom libisis-qt4-dev
 guacamole = guacamole guacd libguac-dev libguac3 libguac-client-rdp guacamole-tomcat libguac-client-vnc0
+neo = python-neo
 
 [mirrors]
 au = http://mirror.aarnet.edu.au/pub/neurodebian