X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=c606f1242198eb81cf998ae479f316055016cbd6;hb=4c4b1760c09072038d391b7d9fa5cc1b824ce1a4;hp=1b82a223a1397c1f8a7161bc8f883ac263eac832;hpb=7e081ae72240a367c76271a162d26dcd4cc9a06e;p=neurodebian.git

diff --git a/debian/control b/debian/control
index 1b82a22..c606f12 100644
--- a/debian/control
+++ b/debian/control
@@ -2,48 +2,78 @@ Source: neurodebian
 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
-Standards-Version: 3.9.1
+Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
+Build-Depends: debhelper (>= 7.0.50~), xcftools, help2man, inkscape, imagemagick, python-html5lib, po-debconf
+Standards-Version: 3.9.5
 Homepage: http://neuro.debian.net
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
 Vcs-Git: git://git.debian.org/git/pkg-exppsy/neurodebian.git
-XS-DM-Upload-Allowed: yes
+
+Package: neurodebian
+Architecture: all
+Depends: python, wget, neurodebian-archive-keyring, ${misc:Depends}
+Recommends: netselect
+Suggests: neurodebian-desktop, neurodebian-popularity-contest
+Description: turnkey platform for the neuroscience
+ The NeuroDebian project integrates and maintain a variety of
+ neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
+ generic computational (such as condor, pandas, etc.) software projects
+ within Debian.
+ .
+ This package enables NeuroDebian repository on top of the stock
+ Debian or Ubuntu system.
 
 
 Package: neurodebian-dev
 Architecture: all
-Depends: ${misc:Depends}, devscripts, cowbuilder, python
-Recommends: virtualbox-ose, virtualbox-ose-fuse, zerofree
-Suggests:
+Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-archive-keyring
+Recommends: python, zerofree, moreutils, time, ubuntu-keyring, debian-archive-keyring, apt-utils
+Suggests: virtualbox-ose, virtualbox-ose-fuse
 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
-Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-themes
+Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme,
+         neurodebian-popularity-contest
 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-archive-keyring
 Architecture: all
 Depends: ${misc:Depends}
+Replaces: neurodebian-keyring (<< 0.34~)
+Breaks: neurodebian-keyring (<< 0.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.
 
-
-Package: neurodebian-guest-additions
+Package: neurodebian-popularity-contest
 Architecture: all
-Depends: ${misc:Depends}, sudo, virtualbox-ose-guest-utils, virtualbox-ose-guest-x11, virtualbox-ose-guest-dkms, neurodebian-desktop, gdm
-Recommends: chromium-browser
-Suggests:
-Description: add-ons and configuration for the NeuroDebian virtual machine
- This package configures a Debian installation as a guest operating system
- in a VirtualBox-based virtual machine for NeuroDebian.
+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.
  .
- Do not install this package unless you know what you are doing! For example,
- installation of this package relaxes several security mechanisms.
+ 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.
+