Merge branch 'master' into newdesign

[neurodebian.git] / debian / control

diff --git a/debian/control b/debian/control
index 746ea0d4eb4a9e6ab843205c13da9f6389df0e24..a60791af8287fc368c9391744a6fb636bfd45e4b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
 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
+Standards-Version: 3.9.2
 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
@@ -13,9 +13,9 @@ XS-DM-Upload-Allowed: yes
 
 Package: neurodebian-dev
 Architecture: all
-Depends: ${misc:Depends}, devscripts, cowbuilder, python, neurodebian-keyring
-Recommends: virtualbox-ose, virtualbox-ose-fuse, zerofree, moreutils
-Suggests:
+Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-keyring
+Recommends: python, zerofree, moreutils, time, ubuntu-keyring, debian-archive-keyring
+Suggests: virtualbox-ose, virtualbox-ose-fuse
 Description: NeuroDebian development tools
  neuro.debian.net sphinx website sources and development tools used by
  NeuroDebian to provide backports for a range of Debian/Ubuntu
@@ -65,7 +65,7 @@ Description: Helper for NeuroDebian popularity contest submissions
 Package: neurodebian-guest-additions
 Architecture: all
 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
+Depends: ${misc:Depends}, sudo, neurodebian-desktop, gdm | gdm3, update-manager-gnome, update-notifier
 Recommends: chromium-browser
 Description: NeuroDebian guest additions (DO NOT INSTALL OUTSIDE VIRTUALBOX)
  This package configures a Debian installation as a guest operating system