updated template, fixed up control, updated patch, added custom series for quilt...

[neurodebian.git] / debian / control

diff --git a/debian/control b/debian/control
index 74bbc2bf649456d6bfde123edc9d56d9d2d70636..82ac7bc1df84345ee5508ee89f5a17c0739282c9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,40 +3,24 @@ Section: science
 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.2
+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: ${misc:Depends}, neurodebian-repository
-Recommends: neurodebian-desktop, neurodebian-popularity-contest
+Pre-depends: python, wget
+Depends: neurodebian-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 meta-package depends on packages needed for a typical
- NeuroDebian deployment, e.g. enabling the complementary NeuroDebian
- repository of package backports and perspective packages not yet
- available from stock Debian/Ubuntu.
-
-
-Package: neurodebian-repository
-Architecture: all
-Pre-depends: python-minimal, wget
-Depends: neurodebian-keyring, ${misc:Depends}
-Recommends: netselect
-Description: NeuroDebian APT repository installer
- Besides making (neuro)scientific software available on stock Debian
- systems, neuro.debian.net (and mirrors around the globe) provides
- a repository with backport builds of the NeuroDebian-maintained
- packages for all supported Debian and Ubuntu releases.
- .
  This package enables NeuroDebian repository on top of the stock
  Debian or Ubuntu system.
 
@@ -94,14 +78,16 @@ 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},
+                virtualbox-guest-utils,
+                virtualbox-guest-x11,
+                virtualbox-guest-dkms,
          sudo,
          neurodebian-desktop,
-         gdm | lightdm,
+         lightdm | x-display-manager,
                 zenity,
-Recommends: chromium-browser,
-            update-manager-gnome, update-notifier,
+Recommends: chromium,
+            update-notifier,
 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.