Merge remote-tracking branch 'neurohydra/master'

[neurodebian.git] / debian / control

diff --git a/debian/control b/debian/control
index f8014a777c9372068d356f21927f14e23a68c14a..4456894f66e759a5afb4dc4c829df895ef052f4f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: neurodebian
 Section: science
 Priority: optional
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
 Section: science
 Priority: optional
 Maintainer: NeuroDebian Team <team@neuro.debian.net>

-Uploaders: Michael Hanke <michael.hanke@gmail.com>, Yaroslav Halchenko <debian@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), xcftools, help2man, inkscape, imagemagick
+Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
+Build-Depends: debhelper (>= 7.0.50~), xcftools, help2man, inkscape, imagemagick, python-html5lib

 Standards-Version: 3.9.1
 Homepage: http://neuro.debian.net
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
 Standards-Version: 3.9.1
 Homepage: http://neuro.debian.net
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/neurodebian.git


@@ -14,18 +14,24 @@ XS-DM-Upload-Allowed: yes
 Package: neurodebian-dev
 Architecture: all
 Depends: ${misc:Depends}, devscripts, cowbuilder, python, neurodebian-keyring
 Package: neurodebian-dev
 Architecture: all
 Depends: ${misc:Depends}, devscripts, cowbuilder, python, neurodebian-keyring

-Recommends: virtualbox-ose, virtualbox-ose-fuse, zerofree
+Recommends: zerofree, moreutils, time
+Suggests: virtualbox-ose, virtualbox-ose-fuse

 Suggests:
 Description: NeuroDebian development tools
 Suggests:
 Description: NeuroDebian development tools

- Pacifier
+ neuro.debian.net sphinx website sources and development tools used by
+ NeuroDebian to provide backports for a range of Debian/Ubuntu
+ releases.

 
 
 Package: neurodebian-desktop
 Architecture: all
 
 
 Package: neurodebian-desktop
 Architecture: all

-Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme
+Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme,
+         neurodebian-popularity-contest

 Suggests:
 Description: neuroscience research environment
 Suggests:
 Description: neuroscience research environment

- Pacifier
+ This package contains NeuroDebian artwork (icons, background image)
+ and a NeuroDebian menu featuring most popular neuroscience tools
+ automatically installed upon initial invocation.

 
 
 Package: neurodebian-keyring
 
 
 Package: neurodebian-keyring


@@ -35,13 +41,34 @@ Description: GnuPG archive keys of the NeuroDebian archive
  The NeuroDebian project digitally signs its Release files. This package
  contains the archive keys used for that.
 
  The NeuroDebian project digitally signs its Release files. This package
  contains the archive keys used for that.
 

+Package: neurodebian-popularity-contest
+Architecture: all
+Depends: ${misc:Depends}, popularity-contest
+Description: Helper for NeuroDebian popularity contest submissions
+ This package is a complement to the generic popularity-contest
+ package to enable anonymous submission of usage statistics to
+ NeuroDebian in addition to the popcon submissions to the underlying
+ distribution (e.g. Debian or Ubuntu) popcon server.
+ .
+ Your participation in popcon is important for following reasons:
+  - Popular packages receive more attention from developers, bugs are
+    fixed faster and updates are provided quicker.
+  - Assure that we do not drop support for a previous release of Debian
+    or Ubuntu while are active users.
+  - User statistics could be used by upstream research software
+    developers to acquire funding for continued development.
+ .
+ It has an effect only if you have decided to participate in the
+ Popularity Contest of your distribution, i.e. Debian or Ubuntu.
+ You can always enable or disable your participation in popcon by
+ running 'dpkg-reconfigure popularity-contest' as root.

 
 Package: neurodebian-guest-additions
 Architecture: all
 
 Package: neurodebian-guest-additions
 Architecture: all

-Depends: ${misc:Depends}, sudo, virtualbox-ose-guest-utils, virtualbox-ose-guest-x11, virtualbox-ose-guest-dkms, neurodebian-desktop, gdm, update-manager-gnome, update-notifier
+Pre-Depends: virtualbox-ose-guest-utils, virtualbox-ose-guest-x11, virtualbox-ose-guest-dkms
+Depends: ${misc:Depends}, sudo, neurodebian-desktop, gdm, update-manager-gnome, update-notifier

 Recommends: chromium-browser
 Recommends: chromium-browser

-Suggests:
-Description: add-ons and configuration for the NeuroDebian virtual machine
+Description: NeuroDebian guest additions (DO NOT INSTALL OUTSIDE VIRTUALBOX)

  This package configures a Debian installation as a guest operating system
  in a VirtualBox-based virtual machine for NeuroDebian.
  .
  This package configures a Debian installation as a guest operating system
  in a VirtualBox-based virtual machine for NeuroDebian.
  .