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

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian:
  added tigervnc to the list of listed packages
  unfortunately previous ones were not rotated and sphinx is not smart enough
  more coffee art

diff --git a/neurodebian.cfg b/neurodebian.cfg
index b88c21657a073446ea59e1877471a2f766a7c590..541206d5fa9267bb302cc8caaadd6d3f79901cdb 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -23,7 +23,7 @@ select names = libnifti2 odin mitools afni-atlases python-pyssdh python-networkx
  python-sklearn python-scikits-learn python-mdp python-mlpy python-openpyxl libgdf-dev matlab-support
  svgtune rorden-mri-tutorial caret-data python-joblib python-sphinx fail2ban
  python-pandas python-skimage neurodebian numdiff nuitka pytables
- guacamole freeipmi remake vowpal-wabbit
+ guacamole freeipmi remake vowpal-wabbit tigervnc
 
 # Information about prospective packages to be imported from taskfiles
 prospective =
@@ -65,6 +65,7 @@ isis = isis-utils libisis-core-dev python-isis libisis-ioplugins-common libisis-
 guacamole = guacamole guacd libguac-dev libguac3 libguac-client-rdp guacamole-tomcat libguac-client-vnc0
 neo = python-neo
 openvibe = openvibe-bin openvibe-data openvibe-dev openvibe-libs openvibe-plugins
+tigervnc = tigervnc-viewer tigervnc-xorg-extension tigervnc-standalone-server tigervnc-scraping-server tigervnc-common
 
 [mirrors]
 au = http://mirror.aarnet.edu.au/pub/neurodebian

diff --git a/sphinx/coffeeart.rst b/sphinx/coffeeart.rst
index e64b075befefa786f7f8ab7a13930c10871f2da1..06be357c2fea9699fdc92fe451183351a086a25e 100644 (file)
--- a/sphinx/coffeeart.rst
+++ b/sphinx/coffeeart.rst
@@ -8,6 +8,47 @@
 Coffee Art
 **********
 
+2013-03-08 09:37:13
+-------------------
+
+.. figure:: /pics/coffeeart/20130308_093713.jpg
+
+2013-02-22 10:01:26
+-------------------
+
+.. figure:: /pics/coffeeart/20130222_100126.jpg
+
+2013-02-21 12:54:10
+-------------------
+
+.. figure:: /pics/coffeeart/20130221_125410.jpg
+
+2012-12-03 08:35:05
+-------------------
+
+.. figure:: /pics/coffeeart/20121203_083505.jpg
+
+2012-11-08 16:03:36
+-------------------
+
+.. figure:: /pics/coffeeart/20121108_160336.jpg
+
+2012-11-01 08:58:25
+-------------------
+
+.. figure:: /pics/coffeeart/20121101_085825.jpg
+
+2012-03-01 14:00:37
+-------------------
+
+.. figure:: /pics/coffeeart/20120301_140037.jpg
+
+2012-02-06 09:21:40
+-------------------
+
+.. figure:: /pics/coffeeart/20120206_092140.jpg
+
+
 2011-12-30 12:28:37
 -------------------
 

diff --git a/sphinx/pics/coffeeart/20120206_092140.jpg b/sphinx/pics/coffeeart/20120206_092140.jpg
new file mode 100644 (file)
index 0000000..b38d8a1
Binary files /dev/null and b/sphinx/pics/coffeeart/20120206_092140.jpg differ

diff --git a/sphinx/pics/coffeeart/20120301_140037.jpg b/sphinx/pics/coffeeart/20120301_140037.jpg
new file mode 100644 (file)
index 0000000..6350994
Binary files /dev/null and b/sphinx/pics/coffeeart/20120301_140037.jpg differ

diff --git a/sphinx/pics/coffeeart/20121101_085825.jpg b/sphinx/pics/coffeeart/20121101_085825.jpg
new file mode 100644 (file)
index 0000000..7a0f149
Binary files /dev/null and b/sphinx/pics/coffeeart/20121101_085825.jpg differ

diff --git a/sphinx/pics/coffeeart/20121108_160336.jpg b/sphinx/pics/coffeeart/20121108_160336.jpg
new file mode 100644 (file)
index 0000000..afb8e5f
Binary files /dev/null and b/sphinx/pics/coffeeart/20121108_160336.jpg differ

diff --git a/sphinx/pics/coffeeart/20121203_083505.jpg b/sphinx/pics/coffeeart/20121203_083505.jpg
new file mode 100644 (file)
index 0000000..b47b0eb
Binary files /dev/null and b/sphinx/pics/coffeeart/20121203_083505.jpg differ

diff --git a/sphinx/pics/coffeeart/20130221_125410.jpg b/sphinx/pics/coffeeart/20130221_125410.jpg
new file mode 100644 (file)
index 0000000..fd1c387
Binary files /dev/null and b/sphinx/pics/coffeeart/20130221_125410.jpg differ

diff --git a/sphinx/pics/coffeeart/20130222_100126.jpg b/sphinx/pics/coffeeart/20130222_100126.jpg
new file mode 100644 (file)
index 0000000..2a5de70
Binary files /dev/null and b/sphinx/pics/coffeeart/20130222_100126.jpg differ

diff --git a/sphinx/pics/coffeeart/20130308_093713.jpg b/sphinx/pics/coffeeart/20130308_093713.jpg
new file mode 100644 (file)
index 0000000..94ba848
Binary files /dev/null and b/sphinx/pics/coffeeart/20130308_093713.jpg differ