Merge branch 'master' of /home/yoh/deb/gits/pkg-exppsy/neurodebian

* 'master' of /home/yoh/deb/gits/pkg-exppsy/neurodebian:
  prepare VM images for VB 4.x series using squeeze-backports

diff --git a/sphinx/link_names.txt b/sphinx/link_names.txt
index b01586581e2d34592fa2f4407381dbd593a693df..24ca98ebe16be743acd2438c8307f316f39bafbb 100644 (file)
--- a/sphinx/link_names.txt
+++ b/sphinx/link_names.txt
@@ -158,6 +158,8 @@
 .. Some common terms as links outside and abbreviations
 .. _FOSS: http://en.wikipedia.org/wiki/Free_and_Open_Source_Software
 .. |FOSS| replace:: :abbr:`FOSS (Free and Open Source Software)`
+.. _DFSG: http://www.debian.org/social_contract#guidelines
+.. |DFSG| replace:: :abbr:`DFSG (Debian Free Software Guidelines)`
 
 .. Homepages
 .. _yoh: http://www.onerussian.com

diff --git a/sphinx/proj_freesurfer.rst b/sphinx/proj_freesurfer.rst
index 289d6e133159bdf9829a59ddccdb33d9da05790d..d9387f62148936b05ac0d79f7a4477fe5cbcbee1 100644 (file)
--- a/sphinx/proj_freesurfer.rst
+++ b/sphinx/proj_freesurfer.rst
@@ -7,23 +7,44 @@
 Packaging FreeSurfer
 ********************
 
+:ref:`FreeSurfer <pkg_freesurfer>` is a set of tools for analysis and
+visualization of structural and functional brain imaging data. It contains a
+fully automatic structural stream for processing cross sectional and
+longitudinal data.  Packaging of FreeSurfer for Debian is a part of our
+general efforts to provide comprehensive neuro-imaging research support.
+
 Status
 ------
 
-We are in contact with Freesurfer developers and are awaiting the resolution of
-legal issues that currently prevent legal redistribution of FreeSurfer.
+The majority of FreeSurfer 5.1.0 has been released under seems to be
+|DFSG|-compliant |FOSS| license terms on 24 May 2011.  We have started working
+on packaging.  Following has been done
+
+* modularization of the FreeSurfer distribution into code and data components
+
+* FreeSurfer 5.1.0 |FOSS| code made available from our `FreeSurfer GitHub
+  <https://github.com/neurodebian/freesurfer>`_ repository
+
+* :file:`debian/patches` contains a series of patches primarily to
+
+  - rely on system-provided libraries where applicable
+  - in general replace static inclusion with dynamic linking thus
+    greatly decreasing size of distributed binaries and making deployment more modular
 
-This project will continue as soon as the Freesurfer source code is available
-under |FOSS| license terms.
+.. todo:: FreeSurfer packaging
 
-..
- .. todo:: 
+   * Collect and provide all required libraries to link against
+   * Decide on further separation in to binary packages
+   * Decide on how to ship "freesurfer-cuda" (depends on non-free materials,
+     so cannot be build by the source in Debian `main` component)
+   * Investigate possibility to deprecate/replace functionality dependent on
+     antique libraries which might have been or soon will be removed from
+     Debian (e.g. xview)
 
 
-..
- References
- ----------
+References
+----------
 
- <references>
+* http://surfer.nmr.mgh.harvard.edu/fswiki/NextGenCode
 
 .. include:: link_names.txt

diff --git a/sphinx/proj_matlab.rst b/sphinx/proj_matlab.rst
index ef5f906d718dd20bfdbe6bfdd5dc4ed7aa851f8e..a79948343446b676622ccfd60410e0df9e23e776 100644 (file)
--- a/sphinx/proj_matlab.rst
+++ b/sphinx/proj_matlab.rst
@@ -53,15 +53,18 @@ references_ for more packages). Expanding the coverage is planned.
 
    * 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 support package. Once this is done and reviewed by
-     its maintainers the support 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>`.
    * 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