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

diff --git a/debian/control b/debian/control
index f78b994..82a5585 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.
@@ -41,7 +42,8 @@ Depends: debian.org,
 	,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	traceroute | not+gnu-linux,
-	bind9-host, dnsutils, whois
+	iputils-tracepath | not+gnu-linux,
+	bind9-host, dnsutils, whois, unbound-host
 	,
 	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
@@ -64,21 +66,23 @@ Depends: debian.org,
 	,
 	mcelog | not+amd64 | not+gnu-linux,
 	mcelog | not+i386 | not+gnu-linux,
-	lsscsi
 	,
 	htop, psmisc,
 	lsof | not+gnu-linux,
 	,
+	ncdu,
 	mc,
 		genisoimage,
 	less,
 	rsync,
 	screen,
+	tmux,
 	ldap-utils, ldapvi,
 	mmv,
 	moreutils,
 	patchutils,
 	diffstat,
+	bc,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -183,41 +187,35 @@ Depends: debiandoc-sgml,
 	dpkg-dev,
 	gettext,
 	ghostscript,
+	imagemagick,
+	iso-codes,
+	isoquery,
 	jadetex,
 	kcc,
 	ko.tex-base,
 	latex-cjk-all,
 	latex-cjk-chinese,
 	ldap-utils,
+	libemail-address-perl,
 	libintl-perl,
+	libmime-lite-perl,
 	libnet-ldap-perl,
+	libsoap-lite-perl,
 	libtimedate-perl,
 	libwww-perl,
 	libxml2-utils,
 	libxml-rss-perl,
-	littex,
 	locales, locales-all,
+	lmodern,
 	maildrop,
 	openjade,
 	openjade1.3,
 	po4a,
 	poxml,
 	procmail,
-	python2.4,
-	python-xml,
 	texlive-fonts-recommended,
-	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese,
-	texlive-lang-czechslovak,
-	texlive-lang-finnish,
-	texlive-lang-french,
-	texlive-lang-german,
-	texlive-lang-greek,
-	texlive-lang-italian,
-	texlive-lang-other,
-	texlive-lang-portuguese,
-	texlive-lang-spanish,
-	texlive-lang-swedish,
-	texlive-lang-vietnamese,
+	texlive-lang-all,
+	latex-cjk-japanese,
 	texlive-latex-base,
 	texlive-latex-extra,
 	texlive-latex-recommended,
@@ -225,6 +223,7 @@ Depends: debiandoc-sgml,
 	time,
 	ttf-arphic-uming,
 	ttf-malayalam-fonts,
+	uni2ascii,
 	wml,
 	xmlroff, dblatex,
 	xplanet,
@@ -238,7 +237,6 @@ Description: metapackages for www-master.debian.org dependencies
 Package: debian.org-buildd.debian.org
 Architecture: all
 Depends: edos-distcheck,
-	db4.8-util,
 	ghostscript,
 	libcompress-bzip2-perl,
 	libcompress-zlib-perl,
@@ -253,17 +251,16 @@ Depends: edos-distcheck,
 	python-apt,
 	python-contract,
 	python-coverage,
-	python-coverage-test-runner,
 	python-debian,
 	python-psycopg2,
 	python-mako,
 	python-nose,
 	python-sqlalchemy,
-	quinn-diff,
 	r-base-core,
 	r-cran-lattice,
 	php5,
-	moreutils (>= 0.39~)
+	moreutils (>= 0.39~),
+	libdpkg-perl
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -286,10 +283,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 +305,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 +316,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 +344,29 @@ 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,
+	colordiff
+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.6,
+	python2.6-dev,
+	python-dev,
 	devscripts,
 	wdiff,
 	python-pygresql,
@@ -357,7 +374,16 @@ Depends: mutt,
 	python-apt,
 	python-debian,
 	libapt-pkg-perl,
-	procmail
+	libapt-pkg-dev,
+	dpkg-dev,
+	procmail,
+	rrdtool,
+	python3.1,
+	python3.1-dev,
+	python3-apt,
+	picosat,
+	openjdk-6-jre-headless,
+	git-email,
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.
@@ -374,10 +400,18 @@ Depends: bittornado,
 	zip,
 	zsync,
 	fakeroot,
-	dosfstools
+	dosfstools,
+	libsoap-lite-perl,
+	devscripts
 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,
@@ -399,11 +433,17 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
 	python-elementtree | python (>= 2.6), python-flup, python-libxml2,
 	python-lxml, python-psycopg2, python-soappy, python-virtualenv,
 	python-sqlalchemy (>= 0.6), python (>= 2.5.4-5~) | python-simplejson,
-	python-flask (>= 0.6), python-flaskext.wtf, python-wtforms,
+	python-flask (>= 0.6),
+	python-xapian,
+	python-dateutil,
 	perl,
 	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
 	procmail,
-	moreutils
+	moreutils,
+	python-flup
+# These are also needed, but they are currently not available in squeeze and
+# difficult to backport:
+# python-flaskext.wtf, python-wtforms
 Description: metapackage for nm.debian.org
  This package depends on all the packages that are needed for nm.debian.org setup.
 
@@ -417,6 +457,7 @@ Description: metapackage for backports.debian.org
 Package: debian.org-qa.debian.org
 Architecture: all
 Depends: db4.8-util,
+	devscripts,
 	gnuplot-nox,
 	wml,
 	libapt-pkg-perl,
@@ -438,3 +479,219 @@ 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-packages.qa.debian.org
+Architecture: all
+Depends: db4.7-util,
+	libmailtools-perl,
+	libmime-tools-perl,
+	libmail-verp-perl,
+	xsltproc,
+	mhonarc,
+	python,
+	python-lxml,
+	python-soappy,
+	python-debian,
+	python-yaml,
+	python-zsi
+Description: metapackage for packages.qa.debian.org
+ This package depends on all the packages that are needed for packages.qa.debian.org setup.
+
+Package: debian.org-udd.debian.org
+Architecture: all
+Depends: dpkg-dev,
+	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-launchpadlib,
+	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.
+
+Package: debian.org-women.debian.org
+Architecture: all
+Depends: wml
+Description: metapackages for women.debian.org dependencies
+ This package depends on everything that is needed for women.debian.org.
+
+
+Package: debian.org-lintian.debian.org
+Architecture: all
+Depends:   binutils,
+	binutils-multiarch,
+	bzip2,
+	diffstat,
+	dpkg-dev,
+	debhelper,
+	fakeroot,
+	file,
+	gettext,
+	intltool-debian,
+	libapt-pkg-perl,
+	libclass-accessor-perl,
+	libclone-perl,
+	libdigest-sha-perl,
+	libdpkg-perl,
+	libemail-valid-perl,
+	libhtml-parser-perl,
+	libipc-run-perl,
+	libparse-debianchangelog-perl,
+	libtimedate-perl,
+	libtext-template-perl,
+	liburi-perl,
+	locales,
+	man-db,
+	perl,
+	unzip,
+	xz-utils
+	,
+	docbook-utils,
+	docbook-xml
+	,
+	hardening-includes (>= 2.0)
+Description: metapackages for lintian.debian.org dependencies
+ This package depends on everything that is needed for lintian.debian.org.
+
+Package: debian.org-popcon.debian.org
+Architecture: all
+Depends:  libchart-perl
+Description: metapackages for popcon.debian.org dependencies
+ This package depends on everything that is needed for popcon.debian.org.
+
+Package: debian.org-dde.debian.net
+Architecture: all
+Depends: python-apt,
+	python-debian,
+	python-debianbts,
+	python-feedparser,
+	python-flup,
+	python-nose,
+	python-paste,
+	python-psycopg2,
+	python-pyrss2gen,
+	python-soappy,
+	python-werkzeug,
+	python-xapian,
+	python-yaml
+Description: metapackages for dde.debian.net dependencies
+ This package depends on everything that is needed for dde.debian.net.
+
+Package: debian.org-debtags.debian.net
+Architecture: all
+Depends: python-apt,
+	python-debian,
+	python-django,
+	python-django-registration,
+	python-xapian (>= 1.2.7-1~bpo60+1),
+	python-psycopg2
+Description: metapackages for debtags.debian.net dependencies
+ This package depends on everything that is needed for debtags.debian.net.
+
+Package: debian.org-sso.debian.org
+Architecture: all
+Depends: libcatalyst-modules-perl,
+	libcatalyst-engine-apache-perl,
+	libapache2-mod-perl2,
+	libapache2-reload-perl,
+	libcatalyst-devel-perl,
+	libhtml-mason-perl
+Description: metapackages for sso.debian.org dependencies
+ This package depends on everything that is needed for sso.debian.org.
+
+Package: debian.org-lists.debian.org
+Architecture: all
+Depends: xapian-tools,
+	xapian-omega,
+	smartlist,
+	procmail,
+	gnuplot,
+	rrdtool,
+	libdpkg-perl,
+	gettext,
+	grepmail,
+	libcompress-raw-zlib-perl,
+	amavisd-new,
+	amavis-lists,
+	zoo,
+	lha,
+	p7zip,
+	unrar-free,
+	ripole,
+	pfqueue,
+	pyzor,
+	razor,
+	mrtgutils,
+	pax,
+	pwgen,
+	rbldnsd,
+	rng-tools,
+	speedy-cgi-perl,
+	ccze
+Description: metapackages for lists.debian.org dependencies
+ This package depends on everything that is needed for lists.debian.org.
+
+Package: debian.org-ddtp.debian.org
+Architecture: all
+Depends: libalgorithm-diff-xs-perl,
+	libdbd-pg-perl,
+	libdbi-perl,
+	libmail-sender-perl,
+	libmime-tools-perl,
+	libtext-diff-perl,
+	libtext-iconv-perl
+	,
+	gnuplot
+	,
+	tig
+Description: metapackages for ddtp.debian.org dependencies
+ This package depends on everything that is needed for ddtp.debian.org.
+
+Package: debian.org-i18n.debian.org
+Architecture: all
+Depends: gettext,
+	po-debconf
+	,
+	liblocale-gettext-perl,
+	libmailtools-perl,
+	libsoap-lite-perl,
+	libtimedate-perl
+	,
+	tig
+Description: metapackages for i18n.debian.org dependencies
+ This package depends on everything that is needed for i18n.debian.org.
+
+Package: debian.org-l10n.debian.org
+Architecture: all
+Depends: gettext,
+	po-debconf
+	,
+	liblocale-gettext-perl,
+	libmailtools-perl,
+	libsoap-lite-perl,
+	libtimedate-perl
+	,
+	tig
+Description: metapackages for l10n.debian.org dependencies
+ This package depends on everything that is needed for l10n.debian.org.