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

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  updated VM installation instructions (screenshots and text to talk about ova)
  added ITP to freesurfer proj page
  added dmtcp

diff --git a/future/blends/dmtcp b/future/blends/dmtcp
new file mode 100644 (file)
index 0000000..7f010ca
--- /dev/null
+++ b/future/blends/dmtcp
@@ -0,0 +1,6 @@
+Depends: dmtcp
+Tasks: debian-science/distributedcomputing
+Published-Title: DMTCP: Transparent Checkpointing for Cluster Computations and the Desktop
+Published-Authors: Jason Ansel, Kapil Arya, and Gene Cooperman
+Published-In: 23rd IEEE International Parallel and Distributed Processing Symposium (IPDPS'09).
+Published-Year: 2009

diff --git a/sphinx/pics/vm_host_folder.jpg b/sphinx/pics/vm_host_folder.jpg
deleted file mode 100644 (file)
index 773b321..0000000
Binary files a/sphinx/pics/vm_host_folder.jpg and /dev/null differ

diff --git a/sphinx/pics/vm_host_folder.png b/sphinx/pics/vm_host_folder.png
new file mode 100644 (file)
index 0000000..e4a9d00
Binary files /dev/null and b/sphinx/pics/vm_host_folder.png differ

diff --git a/sphinx/pics/vm_import_wizard.jpg b/sphinx/pics/vm_import_wizard.jpg
deleted file mode 100644 (file)
index 1491c41..0000000
Binary files a/sphinx/pics/vm_import_wizard.jpg and /dev/null differ

diff --git a/sphinx/pics/vm_import_wizard.png b/sphinx/pics/vm_import_wizard.png
index 12350fbef26ee2fc64a7f7f4cea8a3909ceb8732..1471b7c7aae4854a95d0fface48cf1990e459ba0 100644 (file)
Binary files a/sphinx/pics/vm_import_wizard.png and b/sphinx/pics/vm_import_wizard.png differ

diff --git a/sphinx/pics/vm_settings.jpg b/sphinx/pics/vm_settings.jpg
deleted file mode 100644 (file)
index b2133a8..0000000
Binary files a/sphinx/pics/vm_settings.jpg and /dev/null differ

diff --git a/sphinx/pics/vm_settings.png b/sphinx/pics/vm_settings.png
new file mode 100644 (file)
index 0000000..7131fc5
Binary files /dev/null and b/sphinx/pics/vm_settings.png differ

diff --git a/sphinx/pics/vm_settings_display.png b/sphinx/pics/vm_settings_display.png
new file mode 100644 (file)
index 0000000..1bd3b5f
Binary files /dev/null and b/sphinx/pics/vm_settings_display.png differ

diff --git a/sphinx/proj_freesurfer.rst b/sphinx/proj_freesurfer.rst
index d9387f62148936b05ac0d79f7a4477fe5cbcbee1..0bd47d9d8efbeb1d132fe4999130085440a50dca 100644 (file)
--- a/sphinx/proj_freesurfer.rst
+++ b/sphinx/proj_freesurfer.rst
@@ -45,6 +45,9 @@ on packaging.  Following has been done
 References
 ----------
 
+* `Debian ITP bug report <http://bugs.debian.org/628183>`_ with additional
+  information on the packaging progress.
+* `FreeSurfer GitHub`_ with the full source code and the Debian packaging
 * http://surfer.nmr.mgh.harvard.edu/fswiki/NextGenCode
 
 .. include:: link_names.txt

diff --git a/sphinx/vm.rst b/sphinx/vm.rst
index 39e99bd577beb9b0980e15625a0239d106016c50..b3178b9823be0d164af3ac8f9743b050fa39ee4b 100644 (file)
--- a/sphinx/vm.rst
+++ b/sphinx/vm.rst
@@ -48,6 +48,12 @@ virtual appliances:
 * `NeuroDebian 6.0.2 image (64bit)
   <http://neuro.debian.net/debian/vm/neurodebian_6.0.2_amd64.zip>`_ [~560MB]
 
+.. note::
+
+  This older virtual appliances are distributed as a `zip` file. Please
+  extract all files from the `.zip` file, using appropriate software
+  for your operating system.
+
 .. note::
 
   You can verify that you have downloaded archives correctly using
@@ -127,17 +133,16 @@ potential questions regarding installation and maintenance.
 .. _VirtualBox: http://www.virtualbox.org
 
 Next, download the most recent version of the NeuroDebian virtual machine from
-the Downloads_ section. The machine is distributed as a zip file. Please
-extract this file, using appropriate software for your operating system.
-Once extracted, start VirtualBox and select "Import Appliance" from the file
+the Downloads_ section.  Start VirtualBox and select "Import Appliance" from the file
 menu.
 
 .. image:: pics/vm_import_app.jpg
 
 The next dialog will ask you to choose a virtual machine. Please navigate to the
-extracted NeuroDebian download and select the `.ovf` file.
+extracted NeuroDebian download and select the `.ova` (or extracted
+`.ovf` for older appliances shipped as `.zip`) file.
 
-.. image:: pics/vm_import_wizard.jpg
+.. image:: pics/vm_import_wizard.png
 
 You can finish importing of NeuroDebian by clicking on *next* a couple of
 times.  There is no need to change anything, as we will get through the
@@ -149,9 +154,7 @@ but select NeuroDebian and hit the *Settings* button. In the following dialog
 you'll have a chance to configure the machine. You can assign the amount of RAM
 that should be made available to it (for serious fMRI data processing, please
 allow at least 2 GB). If you have a recent computer with multiple CPU cores,
-you can also decide how many cores should be used by the virtual machine. If
-you have a large screen you should increase the display memory to 32 MB in the
-*Display* settings.
+you can also decide how many cores should be used by the virtual machine.
 
 .. image:: pics/vm_add_host_folder.jpg
 
@@ -161,10 +164,16 @@ easy way to access data on the computer without duplicating it or using the
 network to access it. The virtual machine is preconfigured to access a shared
 folder named labeled "host".  Click on the *add* button to select a folder that
 shall be accessible by the machine (e.g. your home directory) and put "host" as
-the folder name. Note, the folder name is simply a label. Your directory will
+the folder name and mark it to be auto-mounted. Note, the folder name is simply a label. Your directory will
 not be renamed.
 
-.. image:: pics/vm_host_folder.jpg
+.. image:: pics/vm_host_folder.png
+
+If you have a large screen you should increase the display memory to
+32 MB in the *Display* settings.  Also you might like to enable the
+support for 3D Acceleration
+
+.. image:: pics/vm_settings_display.png
 
 Finally, close the settings dialog. You have now completed the setup, and you
 can start the virtual machine by hitting the *Start* button. A new window will
@@ -174,7 +183,7 @@ configuration. You can now explore the system. The virtual machine is connected
 with your host computer, and shares its Internet connection. Via this
 connection you can update the contained software packages at any time.
 
-.. image:: pics/vm_settings.jpg
+.. image:: pics/vm_settings.png
 
 The virtual machine logs yourself in automatically. The name of the virtual
 machine user is `brain` and the password is `neurodebian`. The *root* password