NF: List recommened and suggested packages as 'related packages'.

[neurodebian.git] / neurodebian / templates / pkg.rst

diff --git a/neurodebian/templates/pkg.rst b/neurodebian/templates/pkg.rst
index 7f12e1c4eb18891e2ddfa483063bdbb91627351f..dc827b0ecf79883ba04cc9ed9a629d5621586093 100644 (file)
--- a/neurodebian/templates/pkg.rst
+++ b/neurodebian/templates/pkg.rst
@@ -4,15 +4,79 @@
 
 {{ title }}
 
-{{ long_description | wordwrap(width=79, break_long_words=False) }}
+{{ long_description }}
 
 Homepage: {{ db.main.homepage }}
 
+{% if db.main.publication %}
+Citable reference:
+  *{{ db.main.publication.authors }}* ({{ db.main.publication.year }}).
+  {%- if db.main.publication.url %} `{{ db.main.publication.title }} <{{ db.main.publication.url }}>`_.
+  {%- else %} {{ db.main.publication.title }}.
+  {%- endif %} {{ db.main.publication.in }}.
+  {%- if db.main.publication.doi %} (`DOI <http://dx.doi.org/{{ db.main.publication.doi }}>`_)
+  {%- endif %}
+{% endif %}
+
+{% if db.main.registration -%}
+.. note::
+  The software authors ask users to
+  `register <{{ db.main.registration }}>`_. Available user statistics might be 
+  helpful to acquire funding for this project and therefore foster continued
+  developement in the future.
+{% endif -%}
+
+{% if db.blends or db.main.debian_popcon or db.main.ubuntu_popcon or
+      db.main.recommends or db.main.suggests -%}
+Package Details
+===============
 {% if db.blends %}
-Associated `Debian Pure Blends <http://wiki.debian.org/DebianPureBlends>`_:
+`Debian Pure Blends <http://wiki.debian.org/DebianPureBlends>`_ Status
+----------------------------------------------------------------------
+Associated blends:
+
 {% for blend, name, url in db.blends.tasks %}
 * `{{ name }} ({{ blend }}) <{{ url }}>`_
 {% endfor %}
+{% if db.blends.remark %}
+.. note::
+{{ db.blends.remark | indent(width=2, indentfirst=true) }}
+{% endif -%}
+{% endif -%}
+
+{% if db.main.debian_popcon or db.main.ubuntu_popcon %}
+Reported installations [#]_
+---------------------------
+{% if db.main.debian_popcon -%}
+- Debian: {{ db.main.debian_popcon.insts }} (`more info <http://qa.debian.org/popcon.php?package={{ pkg }}>`_)
+{% endif -%}
+{% if db.main.ubuntu_popcon -%}
+- Ubuntu: {{ db.main.ubuntu_popcon.insts }}
+{% endif %}
+
+.. [#] Due to the nature of this data, the reported number can only be
+       considered a conservative estimate of the lower bound of the true
+       number of installations.
+{% endif -%}
+{% endif -%}
+
+{% if db.main.recommends or db.main.suggests %}
+Related packages
+----------------
+{% if db.main.recommends %}
+{%- for pkg in db.main.recommends.split(',') %}
+{%- if pkg.split('|')[0].strip() in fulldb %}
+* :ref:`pkg_{{ pkg.strip() }}`
+{%- else %}
+* {{ pkg }}
+{% endif -%}{% endfor %}{% endif %}
+{%- if db.main.suggests %}
+{%- for pkg in db.main.suggests.split(',') %}
+{%- if pkg.split('|')[0].strip() in fulldb %}
+* :ref:`pkg_{{ pkg.strip() }}`
+{%- else %}
+* {{ pkg.strip() }}
+{% endif -%}{% endfor %}{% endif %}
 {% endif %}
 
 Binary packages
@@ -21,8 +85,8 @@ Binary packages
 NeuroDebian
 -----------
 
-{% for dist, distpkg in db|dictsort if dist[1].startswith('neurodebian') %}
-{% if loop.first %}
+{% for dist, distpkg in db|dictsort if dist[1].startswith('neurodebian') -%}
+{% if loop.first -%}
 The repository contains binary packages for the following distribution
 releases and system architectures. The corresponding source packages
 are available too.
@@ -32,7 +96,6 @@ are available too.
   regularly. Instead configure your package manager to use this
   repository by following the instructions on the
   :ref:`front page <repository_howto>`.
-
 {% endif %}
 {{ dist[0] }} [{{ distpkg.component}}]:
   `{{distpkg.version}} <../../debian/{{ distpkg.poolurl }}>`_ [{{ ', '.join(distpkg.architecture) }}]
@@ -40,7 +103,12 @@ are available too.
 {% if loop.last %}
 .. seealso::
 
-  - Maintainer: {{ distpkg.maintainer }}
+  - Original Maintainer: {{ distpkg.maintainer }}
+
+    (if there is any chance that some problem is specific to the package
+    distributed through the NeuroDebian repository, please contact
+    pkg-exppsy-maintainers@lists.alioth.debian.org instead of the original
+    maintainer)
 {% endif %}
 {% else %}
 *There are no packages in the NeuroDebian repository.*
@@ -61,9 +129,6 @@ Debian
 
   - Maintainer: {{ distpkg.maintainer }}
   - Bug reports: `Debian bugtracking system <http://bugs.debian.org/src:{{ distpkg.source }}>`_
-{% if distpkg.popcon %}
-  - Reported installations: {{ distpkg.popcon.insts }} (`more info <http://qa.debian.org/popcon.php?package={{ pkg }}>`_)
-{% endif %}
 {% endif %}
 {% else %}
 *There are no official Debian packages available.*
@@ -80,7 +145,7 @@ for more information about its current status.
 Ubuntu
 ------
 
-{% for dist, distpkg in db.iteritems() if dist[1].startswith('ubuntu') %}
+{% for dist, distpkg in db|dictsort if dist[1].startswith('ubuntu') %}
 {% if loop.first %}
 {% endif %}
 {{ dist[0] }} [{{ distpkg.component }}]:
@@ -91,9 +156,6 @@ Ubuntu
 
   - Maintainer: {{ distpkg.maintainer }}
   - Bug reports: `Ubuntu Launchpad <https://bugs.launchpad.net/ubuntu/+source/{{ distpkg.source }}>`_
-{% if distpkg.popcon %}
-  - Reported installations: {{ distpkg.popcon.insts }}
-{% endif %}
 {% endif %}
 {% else %}
 *There are no official Ubuntu packages available.*