Merge remote-tracking branch 'gh-cengique/master'

* gh-cengique/master:
  Several fixes in live image page and minor changes in derivatives page
  Addressed Yaroslav's comments on first draft about usb stick degradation, virtual machines, and clarifying the scope of the license.
  draft version of comp neurosci live usb stick blog page w/o download links

diff --git a/future/blends/neo b/future/blends/neo
index afea791f12fb424a27b3c5b10e42cd3d2ed8b1e6..8663a96fd5138f60ee380e9a8f3dc9e35178ee04 100644 (file)
--- a/future/blends/neo
+++ b/future/blends/neo
@@ -4,7 +4,8 @@ Homepage: http://neuralensemble.org/trac/neo
 License: BSD
 Author: Samuel Garcia, Pierre Yger, Luc Estabanez, Andrew Davison, Yury V. Zaytsev
 Language: Python
-Version: 0.1
+Version: 0.2
+WNPP: 659691
 Vcs-SVN: https://neuralensemble.org/svn/neo/
 Pkg-Description: IO library for electrophysiological data formats in Python
  NEO stands for Neural Ensemble Objects and is a project to provide common

diff --git a/neurodebian.cfg b/neurodebian.cfg
index ece9fea625a996a23a256e67f9035e5b8efddd28..fcb12658c3a471ae3d1faa473488d12c0c433351 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -60,11 +60,13 @@ pyxnat = python-pyxnat
 openwalnut = openwalnut-qt4
 neurodebian = neurodebian-dev neurodebian-desktop neurodebian-keyring neurodebian-popularity-contest neurodebian-guest-additions
 pytables = python-tables
+isis = isis-utils libisis-core-dev python-isis libisis-ioplugins-common libisis-ioplugins-dicom libisis-qt4-dev
 
 [mirrors]
 au = http://mirror.aarnet.edu.au/pub/neurodebian
 de = http://apsy.gse.uni-magdeburg.de/debian
 gr = http://neurobot.bio.auth.gr/neurodebian
+jp = http://neuroimaging.sakura.ne.jp/neurodebian
 us-ca = http://neurodeb.pirsquared.org
 us-nh = http://neuro.debian.net/debian
 us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
@@ -73,6 +75,7 @@ us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
 au = Australia (AARNET)
 de = Germany (University of Magdeburg)
 gr = Greece (Aristotle University of Thessaloniki)
+jp = Japan (Kiyotaka Nemoto)
 us-ca = USA-CA (Paul Ivanov, California)
 us-nh = USA-NH (Dartmouth College)
 us-tn = USA-TN (Vanderbilt)

diff --git a/sphinx/derivatives.rst b/sphinx/derivatives.rst
index a90d7788ecd6b2eeae5a5212cc38d758539195fd..bab14eb1dc347cb820d6652f0777b1516611d3bb 100644 (file)
--- a/sphinx/derivatives.rst
+++ b/sphinx/derivatives.rst
@@ -7,23 +7,26 @@
 NeuroDebian "Derivatives"
 *************************
 
+.. replace with icons eventually
+
+`Live CD/USB Media`_ | `Virtual Appliances`_ | `Cloud Solutions`_
+
 NeuroDebian_ is not a *Linux distribution* in a traditional sense because we
-work within Debian_ project thus not providing our custom installer etc.  But
-we are a Linux-distribution providing a repository of up-to-date builds and
-maintaining a :ref:`chap_vm` deployment of Debian.  Because of the openness
-and modularity of Debian other enthusiasts develop customized derivative
-solutions based to address a particular demand.
+are working within Debian_ project thus not providing our custom installer
+etc.  But we are a Linux-distribution providing a repository of up-to-date
+builds and maintaining a :ref:`chap_vm` deployment of Debian.  Because of the
+openness and modularity of Debian other enthusiasts develop customized
+derivative solutions to address their particular needs.
 
-This page presents such *derivative* projects which are tuned for particular
-domains of application in neuroscience and rely on NeuroDebian_ as the origin
-for necessary tools.
+This page presents some of such *derivative* projects which are tuned for
+particular domains of application in neuroscience and rely on NeuroDebian_ as
+the origin of necessary tools.
 
 .. note::
 
    These projects are not maintained by NeuroDebian_ team.  Please direct all
    you support inquiries to respective authors/maintainers.
 
-
 Live CD/USB Media
 =================
 
@@ -54,25 +57,71 @@ USB Stick for Computational Neuroscience by Cengiz Günay
 Lin4Neuro
 ---------
 
++---------------------------+-------------------------------------------------------+
+|**Author**                 | Kiyotaka Nemoto <kiyotaka@nemotos.net>                |
++---------------------------+-------------------------------------------------------+
+|**Homepage**               | http://www.nemotos.net/?page_id=504                   |
++---------------------------+-------------------------------------------------------+
+|**Purpose**                | Neuroimaging tools for course-work                    |
++---------------------------+-------------------------------------------------------+
+|**Features**               | - Datasets and tutorials from C.Rorden (MRIcron)      |
+|                           | - Both 32- and 64-bit images                          |
+|                           | - Based on Ubuntu 10.04 LTS                           |
++---------------------------+-------------------------------------------------------+
+|**Pre-installed Software** | NeuroDebian                                           |
+|                           |   AFNI, AMIDE, Caret, FSL, LIPSIA, MRIcron, etc.      |
+|                           | Custom:                                               |
+|                           |   3DSlicer, MINC, MRIConvert, Virtual MRI             |
++---------------------------+-------------------------------------------------------+
+|**Download**               | ftp://ftp.nemotos.net/ [~2GB]                         |
++---------------------------+-------------------------------------------------------+
+|**References**             | http://www.biomedcentral.com/1471-2342/11/3           |
++---------------------------+-------------------------------------------------------+
+
 
 Virtual Appliances
 ==================
 
-* XNAT
-* MIPAV
+XNAT
+----
 
++---------------------------+-------------------------------------------------------+
+|**Author**                 | Satrajit Ghosh <satra@mit.edu>                        |
++---------------------------+-------------------------------------------------------+
+|**Homepage**               | http://datasharing.incf.org/ni/Install_XNAT           |
++---------------------------+-------------------------------------------------------+
+|**Purpose**                | XNAT deployment                                       |
++---------------------------+-------------------------------------------------------+
+|**Features**               | - XNAT 1.5                                            |
+|                           | - 64-bit only                                         |
+|                           | - Based on NeuroDebian VM appliance                   |
++---------------------------+-------------------------------------------------------+
+|**Pre-installed Software** | Custom:                                               |
+|                           |   XNAT                                                |
++---------------------------+-------------------------------------------------------+
+|**Download**               | `XNAT 1.5.0 NeuroDebian VM <xnat_vm_image>`_          |
++---------------------------+-------------------------------------------------------+
 
-Cloud Environments
-==================
+.. _xnat_vm_image: http://neuro.debian.net/_files/contrib/NeuroDebian_6.0.2+XNAT1.5.0-1_amd64.ova
+
+
+JIST Development Virtual Machine
+--------------------------------
+
+http://www.nitrc.org/projects/jist
+
+
+Cloud Solutions
+===============
 
-* NITRC?
+NeuroCloud
+----------
 
+http://gow.epsrc.ac.uk/ViewGrant.aspx?GrantRef=EP/I016856/1
 
-Cloud Images
-============
+..  * INCF Cloud App?
 
-* UK Grant project
-* INCF Cloud App?
+..  * NITRC?
 
 
 .. include:: link_names.txt

diff --git a/sphinx/index.rst b/sphinx/index.rst
index 052c687b563c17809bfae1df20073bd93b7ca4e8..2c788fe03cf716177e308cf55362da7ebe07097c 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -217,6 +217,7 @@ Thanks to the following institutions and individuals for hosting a mirror:
   *[us-tn]*
 * `Australia's research and education network (AARNET)
   <http://www.aarnet.edu.au>`_ *[au]*
+* Kiyotaka Nemoto (AKA Mr. Lin4Neuro_) *[jp]*
 
 If your are interested in mirroring the repository, please see the :ref:`faq`.
 

diff --git a/sphinx/link_names.txt b/sphinx/link_names.txt
index 24ca98ebe16be743acd2438c8307f316f39bafbb..3071b03213628e257689a67089c58c0caf321ddf 100644 (file)
--- a/sphinx/link_names.txt
+++ b/sphinx/link_names.txt
@@ -122,6 +122,7 @@
 .. _Comedi: http://www.comedi.org
 .. _RTAI: https://www.rtai.org
 .. |RTAI| replace:: :abbr:`RTAI (Real Time Application Interface)`
+.. _Lin4Neuro: http://www.nemotos.net/lin4neuro
 
 .. Functional imaging labs
 .. _`functional imaging laboratory`: http://www.fil.ion.ucl.ac.uk

diff --git a/tools/backport-dsc b/tools/backport-dsc
index fe94763671b8ab028f216bd5e04cd3cead45615b..5140a9243c59b1447987444fc2ad18b386f20902 100755 (executable)
--- a/tools/backport-dsc
+++ b/tools/backport-dsc
@@ -5,7 +5,7 @@ set -e
 set -u
 
 # version of this script
-backports_dsc_version=0.1
+backports_dsc_version=0.2
 
 ############
 # Defaults #
@@ -43,7 +43,7 @@ print_version()
 cat << EOT
 backport-dsc $backports_dsc_version
 
-Copyright (C) 2010 Michael Hanke <michael.hanke@gmail.com>
+Copyright (C) 2010-2012 Michael Hanke <michael.hanke@gmail.com>
 
 Licensed under GNU Public License version 2 or later.
 This is free software; see the source for copying conditions.  There is NO
@@ -91,7 +91,7 @@ Usage:  backport-dsc [OPTIONS] <dsc-file>
 Options:
 
 -d <distname>, --target-distribution <distname>
-  Arbitrary distribution name (e.g. lenny-backports). This will be the target
+  Arbitrary distribution name (e.g. squeeze-backports). This will be the target
   distribution used for the backport changelog entry. The distribution name
   also serves as an identifier to search for backport patches in the source
   package.
@@ -175,11 +175,11 @@ backport-dsc reads configuration from two files: system-wide from
 be sourced by backport-dsc. The following variables (each shown with an
 example setting) can be used to pre-configure backport-dsc:
 
-bp_distribution="lenny-backports"
+bp_distribution="squeeze-backports"
   Backport target distribution (see --backport-distribution)
 
 bp_version_prefix="~"
-  Version suffix (see --version-prefix)
+  Version prefix (see --version-prefix)
 
 bp_version_suffix="bpo60"
   Version suffix (see --version-suffix)

diff --git a/tools/nd_apachelogs2subscriptionstats b/tools/nd_apachelogs2subscriptionstats
index b39df162fb0799ebcbcc61b19fd3306c3faad3d4..f7962ba24fcda13b14203c27b749af5e8d0d89e0 100755 (executable)
--- a/tools/nd_apachelogs2subscriptionstats
+++ b/tools/nd_apachelogs2subscriptionstats
@@ -24,12 +24,12 @@ dt = [('ip', '|S16'),
       ('date', float)]
 
 
-def make_figure(data):
+def make_figure(data, ymax):
     fig = pl.figure(figsize=(14,3))
     ax = fig.add_subplot(121)
-    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Debian')], title="Debian", ymax=11)
+    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Debian')], title="Debian", ymax=ymax)
     ax = fig.add_subplot(122)
-    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Ubuntu')], title="Ubuntu", ymax=11)
+    plot_datehist(ax, data, 10, [code for code in cfg.options('release codenames') if cfg.get('release codenames', code).count('Ubuntu')], title="Ubuntu", ymax=ymax)
     fig.autofmt_xdate()
     return fig
 
@@ -104,4 +104,4 @@ if __name__ == '__main__':
         date = datetime.strptime(date, "%d %b %Y")
         data.append((ip.strip(), loc, suite, date2num(date)))
     data = np.array(data, dtype=dt)
-    make_figure(data).savefig(sys.argv[1], bbox_inches='tight', dpi=60)
+    make_figure(data, ymax=13).savefig(sys.argv[1], bbox_inches='tight', dpi=60)