Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian:
  Update the matlab project status.
  Prep for initial EEGLAB package.

diff --git a/future/blends/eeglab b/future/blends/eeglab
index 55a95606dc3c9f87434fc3bfb93553d8a9e7a754..58f737d3ff014d478df660195b607e032348b4e2 100644 (file)
--- a/future/blends/eeglab
+++ b/future/blends/eeglab
@@ -1,6 +1,7 @@
 Source: eeglab
 Tasks: debian-science/neuroscience-cognitive,
-          debian-med/imaging
+       debian-science/electrophysiology,
+       debian-med/imaging
 Homepage: http://sccn.ucsd.edu/eeglab
 Responsible: NeuroDebian Team <team@neuro.debian.net>
 Language: C, Matlab/Octave
@@ -8,6 +9,7 @@ Version: 9
 Author: Arnaud Delorme <arno@ucsd.edu>, Scott Makeig <smakeig@ucsd.edu>
 License: GPL-2+
 WNPP: 605739
+Pkg-URL: http://neuro.debian.net
 Published-Title: EEGLAB: an open source toolbox for analysis of single-trial EEG dynamics
 Published-Authors: Delorme A and Makeig S
 Published-In: Journal of Neuroscience Methods 134:9-21

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 580acb4ae999bca7589a454fd27cb4c43adfe810..ece9fea625a996a23a256e67f9035e5b8efddd28 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -42,6 +42,7 @@ prospective =
 # to be added as an alias as well
 cctools = coop-computing-tools
 mni-icbm152-nlin-2009 = mni-icbm152-nlin-2009a mni-icbm152-nlin-2009b mni-icbm152-nlin-2009c
+eeglab = matlab-eeglab11 eeglab11-sampledata
 fsl = fsl fsl-doc fsl-atlases fsl-possum-data fsl-first-data fsl-feeds fsl-mni152-templates
 fslview = fslview fslview-doc
 python-mvpa = python-mvpa python-mvpa2

diff --git a/sphinx/proj_matlab.rst b/sphinx/proj_matlab.rst
index a79948343446b676622ccfd60410e0df9e23e776..56d3ac119b38de56e452532bb74f8747241fc6fd 100644 (file)
--- a/sphinx/proj_matlab.rst
+++ b/sphinx/proj_matlab.rst
@@ -41,13 +41,15 @@ with Octave, as well as developing patches to achieve such compatibility.
 Status
 ------
 
-A :ref:`Matlab-support package <pkg_matlab-support>` draft is ready, available
-from NeuroDebian, and has been uploaded to `Debian NEW queue
-<http://ftp-master.debian.org/new.html>`_ .
+A :ref:`Matlab-support package <pkg_matlab-support>` is available starting from
+Debian 7.0 (wheezy) and Ubunty 11.10 (oneiric). Backports for older releases can
+be obtained from NeuroDebian.
 
-Packaging of individual Matlab-based software has started. This includes
-:ref:`SPM <pkg_matlab-spm8>` and :ref:`Fieldtrip <pkg_fieldtrip>` (see
-references_ for more packages). Expanding the coverage is planned.
+Packaging of individual Matlab-based software has started. An
+:ref:`SPM <pkg_matlab-spm8>` package is ready, and a preliminary package of
+:ref:`EEGLAB <pkg_matlab-eeglab11>` is available from NeuroDebian.
+An upcoming :ref:`Fieldtrip <pkg_fieldtrip>` package is work-in-progress (see
+references_ for more packages). Further expansion of the coverage is planned.
 
 .. todo:: Integrating Matlab-based software
 
@@ -57,17 +59,6 @@ references_ for more packages). Expanding the coverage is planned.
      complement :ref:`octave-psychtoolbox-3 <pkg_octave-psychtoolbox-3>`.
    * Create :ref:`matlab-biosig <pkg_matlab-biosig>` to
      complement :ref:`octave-biosig <pkg_octave-biosig>`.
-   * Package `EEGLAB <http://bugs.debian.org/605739>`_.
-
-.. note:: Done:
-
-   * Adapt the packaging of `dynare <http://packages.debian.org/sid/dynare-matlab>`_
-     in Debian to use the new support package. Once this is done and reviewed by
-     its maintainers the support package can be submitted for inclusion into
-     Debian proper.
-   * Upload :ref:`libgdf <pkg_libgdf-dev>` (including :ref:`matlab-gdf
-     <pkg_matlab-gdf>`) to Debian proper as soon as :ref:`matlab-support
-     <pkg_matlab-support>` is accepted
 
 References
 ----------