X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=8fd7f24f1f0eab23163016dec54fe9eb9072249c;hb=435bf253e3054ae92fd70af4a8f105a2e5481427;hp=f78b9941de713ba677a180518abf447551e54a82;hpb=108e45b9384458f471ad9f672759eec3cdcb6642;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index f78b994..8fd7f24 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1)
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -19,7 +19,8 @@ Description: DSA's host metapackage
 Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
-	strace
+	strace,
+	lsscsi
 Description: metapackage to pull in recommended, but not essential tools for linux system
  This package depends on packages that are recommended to  be installed on
  every Linux debian.org host but are not essential.
@@ -64,7 +65,6 @@ Depends: debian.org,
 	,
 	mcelog | not+amd64 | not+gnu-linux,
 	mcelog | not+i386 | not+gnu-linux,
-	lsscsi
 	,
 	htop, psmisc,
 	lsof | not+gnu-linux,
@@ -307,6 +307,7 @@ Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
 	libapt-pkg-dev,
+	libemail-send-perl,
 	python-apt,
 	python-debianbts (>= 1.4~bpo50+1),
 	lintian,
@@ -317,8 +318,8 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
-	python-simplejson | python (>= 2.6),
 	python-yaml,
+	python-rrdtool,
 	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
@@ -345,11 +346,28 @@ Depends: apt-utils,
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-ftpmaster.debian.org-poneys
+Architecture: all
+Depends: bicyclerepair,
+	dpkg-dev-el,
+	easypg,
+	emacs-goodies-el,
+	pychecker,
+	pylint,
+	python-mode,
+	ruby-elisp,
+	gitstats
+Description: metapackage for ftpmaster extras
+ Things not really needed needed.
+
 Package: debian.org-release.debian.org
 Architecture: all
-Depends: mutt,
+Depends: edos-debcheck,
+	mutt,
 	subversion,
 	python2.5,
+	python2.5-dev,
+	python-dev,
 	devscripts,
 	wdiff,
 	python-pygresql,
@@ -357,6 +375,8 @@ Depends: mutt,
 	python-apt,
 	python-debian,
 	libapt-pkg-perl,
+	libapt-pkg-dev,
+	dpkg-dev,
 	procmail
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
@@ -438,3 +458,25 @@ Depends: db4.8-util,
 	rrdtool
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
+
+Package: debian.org-udd.debian.org
+Architecture: all
+Depends: graphviz,
+	libapt-pkg-dev,
+	libcgi-simple-perl,
+	libdbd-pg-ruby,
+	libdbi-ruby,
+	libjson-ruby,
+	liblist-moreutils-perl,
+	libmime-tools-perl,
+	libparams-validate-perl,
+	libperl-dev,
+	libsafe-hole-perl,
+	libtext-template-perl,
+	libyaml-syck-perl,
+	python-debian,
+	python-dev,
+	python-psycopg2,
+	python-yaml
+Description: metapackage for udd.debian.org
+ This package depends on all the packages that are needed for udd.debian.org setup.