Merge remote branch 'alioth/master'

* alioth/master:
  added joblib and sphinx into the listing for ease of tracking

diff --git a/Makefile b/Makefile
index 4f37cf71ae3b7012393a60c6a02db4bc7fabd198..880f0d2f4123dccda9de3cafeb38c2dfd791ea09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ html: pics source
        cd artwork;     cp button_w200.png logo_tuned/fmri_w200.png ../build/src/_static; cd ..
        cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build 2>&1
        mv $(WWW_DIR)/_static/robots.txt $(WWW_DIR)/
+       cp -r build/src/lists $(WWW_DIR)/
 
 
 clean:

diff --git a/artwork/rssfeeds.svg b/artwork/rssfeeds.svg
new file mode 100644 (file)
index 0000000..684a1f8
--- /dev/null
+++ b/artwork/rssfeeds.svg
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="241"
+   height="240.27565"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="rssfeeds.svg"
+   inkscape:export-filename="/home/michael/hacking/neurodebian/artwork/rssfeeds.png"
+   inkscape:export-xdpi="18.728489"
+   inkscape:export-ydpi="18.728489">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       y2="123.79076"
+       x2="200.00002"
+       y1="197.40852"
+       x1="257.53381"
+       gradientTransform="matrix(1.0021732,0,0,1,193.14533,-94.285722)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3301"
+       xlink:href="#linearGradient3182"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="161.84015"
+       x2="281.60837"
+       y1="119.86061"
+       x1="281.60837"
+       gradientTransform="matrix(1.0002415,0,0,1,196.38123,-91.428569)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3299"
+       xlink:href="#linearGradient3182"
+       inkscape:collect="always" />
+    <radialGradient
+       r="153.54318"
+       fy="227.65692"
+       fx="271.95456"
+       cy="227.65692"
+       cx="271.95456"
+       gradientTransform="matrix(1.5951398,-0.2633269,0.1199966,0.7441248,23.784203,13.054503)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3297"
+       xlink:href="#linearGradient3157"
+       inkscape:collect="always" />
+    <filter
+       color-interpolation-filters="sRGB"
+       y="-0.25"
+       x="-0.25"
+       height="1.5"
+       width="1.5"
+       inkscape:label="Drop shadow"
+       id="filter3283">
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="5.000000"
+         in="SourceAlpha"
+         id="feGaussianBlur3285" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.500000 0 "
+         type="matrix"
+         result="bluralpha"
+         id="feColorMatrix3287" />
+      <feOffset
+         result="offsetBlur"
+         dy="5.000000"
+         dx="10.000000"
+         in="bluralpha"
+         id="feOffset3289" />
+      <feMerge
+         id="feMerge3291">
+        <feMergeNode
+           in="offsetBlur"
+           id="feMergeNode3293" />
+        <feMergeNode
+           in="SourceGraphic"
+           id="feMergeNode3295" />
+      </feMerge>
+    </filter>
+    <linearGradient
+       id="linearGradient2446">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2447" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2448" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2414">
+      <stop
+         style="stop-color:#e3b681;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2415" />
+      <stop
+         style="stop-color:#fde8b0;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2416" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3157">
+      <stop
+         id="stop3159"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3161"
+         offset="1"
+         style="stop-color:#31494f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3182"
+       inkscape:collect="always">
+      <stop
+         id="stop3184"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3186"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2974"
+       inkscape:persp3d-origin="120.61 : 80.091883 : 1"
+       inkscape:vp_z="241.22 : 120.13783 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 120.13783 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:menu-tooltip="Glow of object's own color at the edges"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Glow"
+       id="filter3810">
+      <feGaussianBlur
+         result="result91"
+         stdDeviation="5"
+         id="feGaussianBlur3812" />
+      <feComposite
+         operator="over"
+         in="SourceGraphic"
+         in2="result91"
+         id="feComposite3814" />
+    </filter>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3773" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2884" />
+    <inkscape:perspective
+       id="perspective10-2"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3816">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#141312;stop-opacity:0.31578946;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#1a1918;stop-opacity:0.67982459;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3231"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3363"
+       inkscape:persp3d-origin="128 : 85.333333 : 1"
+       inkscape:vp_z="256 : 128 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 128 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="RSSg"
+       y2="225.94001"
+       x2="225.94001"
+       y1="30.06"
+       x1="30.06"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3090"
+         stop-color="#E3702D"
+         offset="0.0"
+         style="stop-color:#d70751;stop-opacity:1" />
+      <stop
+         id="stop3092"
+         stop-color="#EA7D31"
+         offset="0.1071"
+         style="stop-color:#b62559;stop-opacity:1" />
+      <stop
+         id="stop3094"
+         stop-color="#F69537"
+         offset="0.3503"
+         style="stop-color:#d63f76;stop-opacity:1" />
+      <stop
+         id="stop3096"
+         stop-color="#FB9E3A"
+         offset="0.5"
+         style="stop-color:#f94686;stop-opacity:1" />
+      <stop
+         id="stop3098"
+         stop-color="#EA7C31"
+         offset="0.7016"
+         style="stop-color:#e02c6d;stop-opacity:1" />
+      <stop
+         id="stop3100"
+         stop-color="#DE642B"
+         offset="0.8866"
+         style="stop-color:#b9255a;stop-opacity:1" />
+      <stop
+         id="stop3102"
+         stop-color="#D95B29"
+         offset="1.0"
+         style="stop-color:#d70752;stop-opacity:0.88235295" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3120"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 64 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.25088207"
+     inkscape:cx="-100.75208"
+     inkscape:cy="-1.4332335"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="687"
+     inkscape:window-height="879"
+     inkscape:window-x="61"
+     inkscape:window-y="19"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-940.463,-1109.3672)">
+    <g
+       id="g3240"
+       transform="matrix(2.7112743,0,0,2.7112743,-115.40522,1041.1155)"
+       inkscape:export-filename="C:\Users\Anne Menini\Desktop\interface.png"
+       inkscape:export-xdpi="200"
+       inkscape:export-ydpi="200">
+      <rect
+         rx="12.121831"
+         style="fill:#1a1a1a;fill-opacity:0.44705882;stroke:#000000;stroke-width:0.73766053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3165"
+         width="88.266106"
+         height="87.88327"
+         x="389.91888"
+         y="25.542122"
+         ry="12.121831" />
+      <path
+         id="path3155"
+         d="m 476.22748,52.879463 c -83.45204,0.48174 -33.78189,4.12964 -82.40158,28.1875 l 0,20.093747 c 0,2.48247 1.10767,4.69086 2.84375,6.1875 l 76.71408,0 c 1.73843,-1.49668 2.84375,-3.70309 2.84375,-6.1875 l 0,-48.281247 z"
+         style="fill:url(#radialGradient3297);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         rx="8.1736317"
+         ry="8.1736317"
+         y="29.545734"
+         x="393.83136"
+         height="79.784973"
+         width="80.311104"
+         id="rect3194"
+         style="opacity:0.6143791;fill:none;stroke:#ffffff;stroke-width:4.04099989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         rx="8.1736317"
+         style="opacity:0.6143791;fill:none;stroke:#ffffff;stroke-width:4.04099989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3196"
+         width="80.311104"
+         height="79.784973"
+         x="393.83136"
+         y="29.545734"
+         ry="8.1736317" />
+      <path
+         id="rect3190"
+         d="m 402.73214,30.959821 c -4.52819,0 -8.1875,3.65931 -8.1875,8.1875 l 0,63.437499 c 0,4.52819 3.65931,8.18749 8.1875,8.1875 l 64.19427,0 c 4.52819,0 8.15627,-3.6593 8.15625,-8.1875 l 0,-63.437499 c 0,-4.52819 -3.62806,-8.1875 -8.15625,-8.1875 l -64.19427,0 z"
+         style="opacity:0.6143791;fill:url(#linearGradient3299);fill-opacity:1;stroke:none"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         id="rect3178"
+         d="m 400.20536,28.107138 c -4.52819,0 -8.15625,3.65931 -8.15625,8.1875 l 0,63.437502 c 0,4.52819 3.62806,8.15625 8.15625,8.15625 l 67.25381,0 c 4.52819,0 8.15625,-3.62806 8.15625,-8.15625 l 0,-63.437502 c 0,-4.52819 -3.62804,-8.1875 -8.15625,-8.1875 l -67.25381,0 z"
+         style="opacity:0.6143791;fill:url(#linearGradient3301);fill-opacity:1;stroke:none"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <g
+       id="g3131"
+       transform="matrix(0.80750877,0,0,0.80750877,957.56535,1127.0225)">
+      <rect
+         id="rect3104"
+         y="0"
+         x="0"
+         ry="55"
+         rx="55"
+         height="256"
+         width="256"
+         style="fill:#d70851;fill-opacity:0.90588235" />
+      <rect
+         id="rect3106"
+         y="5"
+         x="5"
+         ry="50"
+         rx="50"
+         height="246"
+         width="246"
+         style="fill:#a13d61;fill-opacity:1" />
+      <rect
+         id="rect3108"
+         y="10"
+         x="10"
+         ry="47"
+         rx="47"
+         height="236"
+         width="236"
+         style="fill:url(#RSSg)" />
+      <circle
+         id="circle3110"
+         r="24"
+         cy="189"
+         cx="68"
+         sodipodi:cx="68"
+         sodipodi:cy="189"
+         sodipodi:rx="24"
+         sodipodi:ry="24"
+         style="fill:#ffffff"
+         d="m 92,189 c 0,13.25483 -10.745166,24 -24,24 -13.254834,0 -24,-10.74517 -24,-24 0,-13.25483 10.745166,-24 24,-24 13.254834,0 24,10.74517 24,24 z" />
+      <path
+         id="path3112"
+         d="M 160,213 H 126 A 82,82 0 0 0 44,131 V 97 a 116,116 0 0 1 116,116 z"
+         style="fill:#ffffff" />
+      <path
+         id="path3114"
+         d="M 184,213 A 140,140 0 0 0 44,73 V 38 a 175,175 0 0 1 175,175 z"
+         style="fill:#ffffff" />
+    </g>
+  </g>
+</svg>

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 35edbd1902c43f389b497f3ac3064dcc2cd93776..caab129a3a7d8cd0c6419dd4b79de78505ed3e19 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -58,6 +58,13 @@ us-ca = http://neurodeb.pirsquared.org
 us-nh = http://neuro.debian.net/debian
 us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
 
+[mirror names]
+de = Germany (University of Magdeburg)
+gr = Greece (Aristotle University of Thessaloniki)
+us-ca = USA-CA (Paul Ivanov)
+us-nh = USA-NH (Dartmouth College)
+us-tn = USA-TN (Vanderbilt)
+
 [neurodebian]
 # Release files of all repositories to be contained in the website
 releases =
@@ -113,6 +120,7 @@ jaunty = nd09.04
 karmic = nd09.10
 lucid = nd10.04
 maverick = nd10.10
+natty = nd11.04
 
 [nitrc ids]
 afni = 23

diff --git a/neurodebian/dde.py b/neurodebian/dde.py
index aac6a64cea86e96bbc8f039a5a2b2a5b91f67de1..c80ab18ceac10a347ec1a00542dd15b53688c979 100755 (executable)
--- a/neurodebian/dde.py
+++ b/neurodebian/dde.py
@@ -639,7 +639,7 @@ def read_db(filename):
 
 def write_sourceslist(jinja_env, cfg, outdir):
     create_dir(outdir)
-    create_dir(os.path.join(outdir, '_static'))
+    create_dir(os.path.join(outdir, 'lists'))
 
     repos = {}
     for release in cfg.options('release codenames'):
@@ -649,9 +649,9 @@ def write_sourceslist(jinja_env, cfg, outdir):
         transrel = trans_codename(release, cfg)
         repos[transrel] = []
         for mirror in cfg.options('mirrors'):
-            listname = 'neurodebian.%s.%s.sources.list' % (release, mirror)
+            listname = '%s.%s' % (release, mirror)
             repos[transrel].append((mirror, listname))
-            lf = open(os.path.join(outdir, '_static', listname), 'w')
+            lf = open(os.path.join(outdir, 'lists', listname), 'w')
             for rel in ('data', release):
                 aptcfg = '%s %s main contrib non-free\n' % (cfg.get('mirrors', mirror),
                                                           rel)
@@ -659,9 +659,20 @@ def write_sourceslist(jinja_env, cfg, outdir):
                 lf.write('#deb-src %s' % aptcfg)
             lf.close()
 
+    id2codename = dict([(cfg.get('release backport ids', r), r)
+                            for r in cfg.options('release codenames')])
+    id2relname = dict([(cfg.get('release backport ids', r), trans_codename(r, cfg))
+                            for r in cfg.options('release codenames')])
+    mirror2name = dict([(m, cfg.get('mirror names', m))
+                            for m in cfg.options('mirrors')])
+    mirror2url = dict([(m, cfg.get('mirrors', m))
+                            for m in cfg.options('mirrors')])
     srclist_template = jinja_env.get_template('sources_lists.rst')
     sl = open(os.path.join(outdir, 'sources_lists'), 'w')
-    sl.write(srclist_template.render(repos=repos))
+    sl.write(srclist_template.render(id2codename=id2codename,
+                                     id2relname=id2relname,
+                                     mirror2name=mirror2name,
+                                     mirror2url=mirror2url))
     sl.close()
 
 

diff --git a/neurodebian/templates/sources_lists.rst b/neurodebian/templates/sources_lists.rst
index 58dd044565799ccb7b2036c2172f7da57c114583..e48025e9e727221448554203185f3325af1b84c7 100644 (file)
--- a/neurodebian/templates/sources_lists.rst
+++ b/neurodebian/templates/sources_lists.rst
@@ -1,4 +1,65 @@
-{% for dist, mirrors in repos|dictsort %}
-* {{ dist }}: {% for mirror, list in mirrors|sort %}[`{{ mirror }} <_static/{{ list }}>`__] {% endfor %}
-{% endfor %}
+.. raw:: html
+
+ <select id="release" name="release">
+   <option value="">Select a release</option>
+{%- for id, relname in id2relname|dictsort(true, 'value') %}
+   <option value="{{ id }}">{{ relname }}</option>
+{%- endfor %}
+ </select>
+ <select id="mirror" name="mirror">
+{%- for id, mirrorname in mirror2name|dictsort %}
+{%- if id == 'us-nh' %}
+   <option selected value="{{ id }}">{{ mirrorname }}</option>
+{%- else %}
+   <option value="{{ id }}">{{ mirrorname }}</option>
+{%- endif %}
+{%- endfor %}
+ </select>
+
+ <div class="highlight-python" id="reposetup">
+ <pre id="code">
+ After selecting a release the setup code will be shown here.
+ </pre>
+ </div>
+ <script>
+ <!--
+ 
+  var rel2name =  {
+{%- for id, codename in id2codename|dictsort %}
+   "{{ id }}" : "{{ codename }}",
+{%- endfor %}
+  };
+
+  var mirrors =  {
+{%- for id, url in mirror2url|dictsort %}
+   "{{ id }}" : "{{ url }}",
+{%- endfor %}
+  };
+
+  function createrepourl(rel, mir) {
+    if(rel in rel2name && mir in mirrors) {
+
+        var retrepo = "sudo apt-key adv --recv-keys --keyserver pgp.mit.edu 2649A5A9\n" +
+         "wget -O- http://neuro.debian.net/lists/" + rel2name[rel] + "."
+         + mir + " | sudo tee /etc/apt/sources.list.d/neurodebian.sources.list\n";
+        return retrepo;
+    }
+
+  };
+  function updateout(rel, mir) {
+        $('#code').text(createrepourl(rel, mir));
+  };
+   $('#release').change(function() {
+     var singleValues = $("#release").val();
+     var mirrorVal = $("#mirror").val();
+     updateout(singleValues, mirrorVal);
+   });
+   $('#mirror').change(function() {
+     var singleValues = $("#release").val();
+     var mirrorVal = $("#mirror").val();
+     updateout(singleValues, mirrorVal);
+   });
+
+ //-->
+ </script>
 

diff --git a/sphinx/_static/rssfeeds.png b/sphinx/_static/rssfeeds.png
new file mode 100644 (file)
index 0000000..a1771b2
Binary files /dev/null and b/sphinx/_static/rssfeeds.png differ

diff --git a/sphinx/index.rst b/sphinx/index.rst
index 1e17e1fd46a7365bbde571b2fa453a4fb7b902af..85c9341b69db986b10cc099222c02393a688c02f 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -31,6 +31,7 @@ you want to get involved. If you appreciate this service, please |spread|.
  <a href="vm.html"><img border="0" src="_static/machine.png" title="Get NeuroDebian for your non-Debian computer" /></a>
  <a href="debian/pool"><img border="0" src="_static/pool.png" title="Go to the package pool (deep and cold, only for experts)" /></a>
  <a href="projects.html"><img border="0" src="_static/workarea.png" title="Current and planned projects: Get involved!" /></a>
+ <a href="feeds/blog.xml"><img border="0" src="_static/rssfeeds.png" title="NeuroDebian Insider feed" /></a>
  </p>
 
 .. _Ubuntu: http://www.ubuntu.com
@@ -86,61 +87,30 @@ Follow us on identi.ca_ or twitter_ to subscribe to the NeuroDebian news.
 How to use this repository
 ==========================
 
-The easiest way to use this repository is to download an APT-configuration file
-(`sources.list`). Simply choose your target distribution/release and download
-the configuration for a mirror close to you (depending on your browser, you
-might have to right-click and choose 'save as'). Once downloaded, put the file
-in the `/etc/apt/sources.list.d/` directory on your system. Moving files in
-this directory will require superuser privileges, therefore you should probably
-download the file into a temporary directory and subsequently move it into
-`/etc/apt/sources.list.d/`. APT-configurations are available for the following
-releases and repository mirrors:
+To enable the NeuroDebian repository on your system, select your Debian or
+Ubuntu release and a repository mirror from the lists below. Upon selection
+a short command snippet will be displayed that can be copied and pasted into
+a terminal session. These commands will configure the system package manager
+with the NeuroDebian repository key and package source information.
 
 .. include:: sources_lists
 
-.. note::
-  Thanks to the following institutions and individuals for hosting a mirror:
-
-  * `Department of Psychological and Brain Sciences at Dartmouth College`_
-    *[us-nh]* (primary mirror)
-  * `Department of Experimental Psychology at the University of Magdeburg`_
-    *[de]*
-  * `Neurobot at Aristotle University of Thessaloniki, Greece`_ *[gr]*
-  * `Paul Ivanov`_ *[us-ca]*
-  * `Medical-image Analysis and Statistical Interpretation lab at Vanderbilt`_
-    *[us-tn]*
-
-  If your are interested in mirroring the repository, please see the :ref:`faq`.
-
-.. _Department of Psychological and Brain Sciences at Dartmouth College: http://www.dartmouth.edu/~psych
-.. _Department of Experimental Psychology at the University of Magdeburg: http://apsy.gse.uni-magdeburg.de
-.. _Neurobot at Aristotle University of Thessaloniki, Greece: http://neurobot.bio.auth.gr
-.. _Paul Ivanov: http://www.pirsquared.org
-.. _Medical-image Analysis and Statistical Interpretation lab at Vanderbilt: https://masi.vuse.vanderbilt.edu
-
 Once this is done, you have to update the package index. Use your favorite
-package manager, e.g. synaptic, adept, or whatever you like. In the terminal
-you can use :command:`aptitude` to achieve the same::
+package manager, e.g. synaptic, adept. In the terminal you can use
+:command:`apt-get` to achieve this::
 
-  sudo aptitude update
+  sudo apt-get update
 
-Now, you can proceed to install packages, e.g.::
+Now, you can install packages, e.g.::
 
-  sudo aptitude install lipsia
+  sudo apt-get install mricron
 
 .. note::
+
   Not every package is available for all distributions/releases. For information
   about which package version is available for which release and architecture,
   please have a look at the corresponding package pages.
 
-After this initial setup you probably also want to configure your package
-manager to recognize the NeuroDebian archive key. With this key the package
-manager can verify that packages haven't been modified and are identical with
-the ones in the main NeuroDebian archive, regardless of which mirror you
-downloaded them from. The NeuroDebian key id is **2649A5A9**. If you need further
-help setting up package authentication, please take a look at
-:ref:`corresponding FAQ <sec_pkg_authentication>`.
-
 
 .. _chap_installation:
 
@@ -222,6 +192,26 @@ Italian espresso <coffeeart>`.
 
 .. _Jim Haxby: http://haxbylab.dartmouth.edu/ppl/jim.html
 
+Thanks to the following institutions and individuals for hosting a mirror:
+
+* `Department of Psychological and Brain Sciences at Dartmouth College`_
+  *[us-nh]* (primary mirror)
+* `Department of Experimental Psychology at the University of Magdeburg`_
+  *[de]*
+* `Neurobot at Aristotle University of Thessaloniki, Greece`_ *[gr]*
+* `Paul Ivanov`_ *[us-ca]*
+* `Medical-image Analysis and Statistical Interpretation lab at Vanderbilt`_
+  *[us-tn]*
+
+If your are interested in mirroring the repository, please see the :ref:`faq`.
+
+.. _Department of Psychological and Brain Sciences at Dartmouth College: http://www.dartmouth.edu/~psych
+.. _Department of Experimental Psychology at the University of Magdeburg: http://apsy.gse.uni-magdeburg.de
+.. _Neurobot at Aristotle University of Thessaloniki, Greece: http://neurobot.bio.auth.gr
+.. _Paul Ivanov: http://www.pirsquared.org
+.. _Medical-image Analysis and Statistical Interpretation lab at Vanderbilt: https://masi.vuse.vanderbilt.edu
+
+
 Publications
 ============