X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=7c7728a8836b094f541f04de0ea085dace050c38;hp=6d8d2c4ca377a03df96f06a110d9c110eca2e0f9;hb=24be1affa03c2548cae6317df258716b57c3a7d8;hpb=b1e13357e5629ed9e2f5d133eaf3c1b499f42cb7

diff --git a/debian/control b/debian/control
index 6d8d2c4..7c7728a 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,
@@ -189,6 +189,8 @@ Depends: debiandoc-sgml,
 	latex-cjk-all,
 	latex-cjk-chinese,
 	ldap-utils,
+	libintl-perl,
+	libsoap-lite-perl,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
@@ -261,7 +263,6 @@ Depends: edos-distcheck,
 	quinn-diff,
 	r-base-core,
 	r-cran-lattice,
-	postgresql-8.4, postgresql-8.4-debversion,
 	php5,
 	moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
@@ -286,10 +287,11 @@ Description: metapackages for patch-tracker.debian.org dependencies
 Package: debian.org-planet.debian.org
 Architecture: all
 Depends: libwww-perl,
-	timeout,
+	timeout | coreutils (>= 8.0-1),
 	debianutils,
 	python-django,
-	python
+	python,
+	libdbi-perl, libdate-manip-perl, libdbd-sqlite3-perl
 Description: metapackages for planet.debian.org dependencies
  This package depends on everything that is needed for a planet.debian.org.
 
@@ -307,6 +309,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,9 +320,9 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
-	python-simplejson || python (>= 2.6),
 	python-yaml,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+	python-rrdtool,
+	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -345,11 +348,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 +377,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
@@ -378,6 +400,12 @@ Depends: bittornado,
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
+Package: debian.org-cdimage-search.debian.org
+Architecture: all
+Depends: libconfigreader-simple-perl
+Description: metapackage for cdimage-search.debian.org
+ This package depends on all the packages that are needed for the CD/DVD search CGI website
+
 Package: debian.org-manpages.debian.org
 Architecture: all
 Depends: locales-all,
@@ -438,3 +466,34 @@ 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,
+	libmldbm-perl,
+	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.
+
+Package: debian.org-snapshot.debian.org
+Architecture: all
+Depends: ruby, libdbd-pg-ruby1.8, libbz2-ruby1.8, libbz2-ruby1.8, python-yaml, python-psycopg2, python-lockfile, fuse-utils, python-fuse, uuid-runtime,
+	python-dev, gcc,
+	python-pylons
+Description: metapackage for snapshot.debian.org
+ This package depends on all the packages that are needed for snapshot.debian.org setup.