X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sphinx%2Fproj_matlab.rst;h=56d3ac119b38de56e452532bb74f8747241fc6fd;hb=4ef89632c58a00c85cfa772252f61b2a5af89d1c;hp=11984e8e8d2fba9a5c0bcbe2609a2f7a78c264e4;hpb=56fde2f99569b83e9b21c157793518e6ab6ba10d;p=neurodebian.git

diff --git a/sphinx/proj_matlab.rst b/sphinx/proj_matlab.rst
index 11984e8..56d3ac1 100644
--- a/sphinx/proj_matlab.rst
+++ b/sphinx/proj_matlab.rst
@@ -11,14 +11,14 @@ There is a vast amount of Matlab-based software for neuro-imaging and
 psychological research. For various reasons, such software has not been
 considered for integration into Debian in the past. However, recent advances of
 the Octave_ project allow running a significant number of Matlab tools without
-a proprietary environment.
+the proprietary environment.
 
 To ease the transition to a completely open-source research environment, we are
 following a two-fold approach. On one hand we start packaging all relevant
 Octave-compatible software for Debian. On the other hand we work on a proper
 integration of (still) Matlab-only software.
 
-The latter shall be achieved by establishing an adaptor Debian package that can
+The latter shall be achieved by providing a support Debian package that can
 represent local Matlab installations to the Debian package management system.
 Moreover, this package provides helper tools that ease building MEX extensions
 from source during package installation with a local Matlab and therefor allow
@@ -34,28 +34,31 @@ completely migrate to Octave when full compatibility for a particular software
 is achieved.
 
 This effort includes talking to upstream projects about the possibility to run
-with Octave, as well as developing patches to achieve compatibility.
+with Octave, as well as developing patches to achieve such compatibility.
 
 .. _Octave: http://www.gnu.org/software/octave
 
 Status
 ------
 
-A :ref:`Matlab-adaptor package <pkg_matlab>` draft is ready and available from
-NeuroDebian.
+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
 
    * Finish packaging of fieldtrip which is necessary to complete the packaging
      of SPM.
-   * Adapt the packaging of `dynare <http://packages.debian.org/sid/dynare-matlab>`_
-     in Debian to use the new adaptor package. Once this is done and reviewed by
-     its maintainers the adaptor package can be submitted for inclusion into
-     Debian proper.
+   * Create :ref:`matlab-psychtoolbox-3 <pkg_matlab-psychtoolbox-3>` to
+     complement :ref:`octave-psychtoolbox-3 <pkg_octave-psychtoolbox-3>`.
+   * Create :ref:`matlab-biosig <pkg_matlab-biosig>` to
+     complement :ref:`octave-biosig <pkg_octave-biosig>`.
 
 References
 ----------