X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=601294548154ca7edad0ed8d8e80c11ee547f8cc;hp=0479560a8cce9ef4ead7fe266b11834987bce2f6;hb=015c41ea901699323ac65c520d65a4ac5c93a628;hpb=da647ec3296db0f220222f49a462329ccebba8c3

diff --git a/debian/control b/debian/control
index 0479560..6012945 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
@@ -16,28 +16,36 @@ Description: DSA's host metapackage
  debian.org host, and conflicts with packages that should never be
  installed.
 
+Package: debian.org-recommended-linux
+Architecture: all
+Depends: vlan, ifenslave, bridge-utils, iproute,
+	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.
+
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
+	busybox-static,
+	debian.org-recommended-linux | not+gnu-linux,
 	molly-guard
 	,
-	acpid (>= 2.0) | not+amd64,
-	acpid (>= 2.0) | not+i386,
-	acpid (>= 2.0) | not+ia64,
-	,
 	man-db
 	,
-	vlan, ifenslave, bridge-utils
-	,
 	subversion, rcs, git-core, bzr,
 		git-svn,
 		subversion-tools,
 		mercurial,
+		cvs
 	,
-	mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
-	bind9-host, dnsutils, whois
+	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
+	traceroute | not+gnu-linux,
+	iputils-tracepath | not+gnu-linux,
+	bind9-host, dnsutils, whois, unbound-host
 	,
-	emacs22-nox | emacs22 | emacs21-nox | emacs21
+	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
 	at, uptimed,
 	puppet,
@@ -49,15 +57,18 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw,
+	lshw | not+gnu-linux,
 	dmidecode | not+amd64,
 	dmidecode | not+i386,
 	dmidecode | not+ia64
 	,
-	mcelog | not+amd64,
-	mcelog | not+i386
+	ipython
+	,
+	mcelog | not+amd64 | not+gnu-linux,
+	mcelog | not+i386 | not+gnu-linux,
 	,
-	htop, lsof, psmisc
+	htop, psmisc,
+	lsof | not+gnu-linux,
 	,
 	mc,
 		genisoimage,
@@ -68,6 +79,7 @@ Depends: debian.org,
 	mmv,
 	moreutils,
 	patchutils,
+	diffstat,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -78,9 +90,7 @@ Depends: debian.org,
 	,
 	bsd-mailx
 	,
-	timeout
-	,
-	strace
+	timeout | coreutils (>= 8.0-1)
 	,
 	wget, curl, lftp, ftp,
 	,
@@ -93,7 +103,8 @@ Depends: debian.org,
 	unzip
 	,
 	w3m,
-	elinks
+	elinks,
+	mutt
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.
@@ -164,44 +175,45 @@ Description: metapackages for packages.debian.org dependencies
 Package: debian.org-www-master.debian.org
 Architecture: all
 Depends: debiandoc-sgml,
-	dpkg-dev,
+	asciidoc,
+	cm-super,
+	debhelper,
+	docbook,
+	docbook-dsssl,
 	docbook-xsl,
+	dpkg-dev,
 	gettext,
 	ghostscript,
+	imagemagick,
+	iso-codes,
+	isoquery,
+	jadetex,
 	kcc,
-	xmlroff, dblatex,
-	locales, locales-all,
-	latex-cjk-chinese,
+	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,
+	maildrop,
+	openjade,
+	openjade1.3,
 	po4a,
 	poxml,
-	python-xml,
+	procmail,
 	python2.4,
+	python-xml,
 	texlive-fonts-recommended,
 	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese,
-	texlive-latex-base,
-	texlive-latex-extra,
-	texlive-latex-recommended,
-	time,
-	wml,
-	xplanet,
-	xplanet-images,
-	xsltproc,
-	procmail,
-	ldap-utils,
-	asciidoc,
-	libxml2-utils,
-	debhelper,
-	docbook,
-	jadetex,
-	openjade,
-	openjade1.3,
-	docbook-dsssl,
 	texlive-lang-czechslovak,
 	texlive-lang-finnish,
 	texlive-lang-french,
@@ -213,9 +225,20 @@ Depends: debiandoc-sgml,
 	texlive-lang-spanish,
 	texlive-lang-swedish,
 	texlive-lang-vietnamese,
-	ko.tex-base,
-	cm-super,
-	ttf-arphic-uming
+	texlive-latex-base,
+	texlive-latex-extra,
+	texlive-latex-recommended,
+	tidy,
+	time,
+	ttf-arphic-uming,
+	ttf-malayalam-fonts,
+	uni2ascii,
+	wml,
+	xmlroff, dblatex,
+	xplanet,
+	xplanet-images,
+	xsltproc,
+	libjson-perl
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -223,7 +246,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,
@@ -238,17 +260,16 @@ Depends: edos-distcheck,
 	python-apt,
 	python-contract,
 	python-coverage,
-	python-coverage-test-runner,
 	python-debian,
 	python-psycopg2,
+	python-mako,
 	python-nose,
-	python-sqlalchemy (>= 0.5), 
-	python-sqlalchemy (<< 0.6),
-	quinn-diff,
+	python-sqlalchemy,
 	r-base-core,
 	r-cran-lattice,
-	postgresql-8.4, postgresql-8.4-debversion,
-	php5
+	php5,
+	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.
 
@@ -271,10 +292,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.
 
@@ -292,8 +314,9 @@ Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
 	libapt-pkg-dev,
+	libemail-send-perl,
 	python-apt,
-	python-btsutils,
+	python-debianbts (>= 1.4~bpo50+1),
 	lintian,
 	python,
 	python-debian,
@@ -303,7 +326,8 @@ Depends: apt-utils,
 	python-pygresql,
 	python-pyrss2gen,
 	python-yaml,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+	python-rrdtool,
+	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -320,14 +344,53 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,
-	perforate
+	perforate,
+	wdiff,
+	xz-utils (>= 4.999.9beta+20100713-1~bpo50+1)
 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: edos-debcheck,
+	mutt,
+	subversion,
+	python2.5,
+	python2.5-dev,
+	python-dev,
+	devscripts,
+	wdiff,
+	python-pygresql,
+	python-libxslt1,
+	python-apt,
+	python-debian,
+	libapt-pkg-perl,
+	libapt-pkg-dev,
+	dpkg-dev,
+	procmail,
+	rrdtool
+Description: metapackage for release
+ This package depends on everything that is needed for a release.debian.org
+ setup.
+
 Package: debian.org-cdbuilder.debian.org
 Architecture: all
 Depends: bittornado,
@@ -339,10 +402,17 @@ Depends: bittornado,
 	tofrodos,
 	zip,
 	zsync,
-	fakeroot
+	fakeroot,
+	dosfstools
 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,
@@ -352,6 +422,151 @@ Description: metapackage for manpages
 
 Package: debian.org-nm.debian.org
 Architecture: all
-Depends: postgresql-8.4
-Description: metapackage for nm.debian.org 
- This package depends on all the packages that are needed for nm.debian.org setup. 
+Depends: libapache2-mod-php5, libapache2-mod-wsgi,
+	php5-cli,
+	php5-ldap, php5-pgsql,
+	wml,
+	mutt, mboxgrep,
+	python,
+	python-mako (>= 0.2.5), python-gnupginterface, python-ldap,
+	python-apt, python-beautifulsoup, python-debianbts, python-dns,
+	python-dnspython, python-egenix-mxdatetime, python-egenix-mxtools,
+	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-xapian,
+	python-dateutil,
+	perl,
+	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
+	procmail,
+	moreutils
+Description: metapackage for nm.debian.org
+ This package depends on all the packages that are needed for nm.debian.org setup.
+
+Package: debian.org-backports.debian.org
+Architecture: all
+Depends: debian.org-ftpmaster.debian.org,
+	libdbi-perl, libdbd-pg-perl
+Description: metapackage for backports.debian.org
+ This package depends on all the packages that are needed for backports.debian.org setup.
+
+Package: debian.org-qa.debian.org
+Architecture: all
+Depends: db4.8-util,
+	gnuplot-nox,
+	wml,
+	libapt-pkg-perl,
+		libdbd-pg-perl,
+		libdate-manip-perl,
+		libdpkg-perl,
+		libmailtools-perl,
+		libsoap-lite-perl,
+		libtemplate-perl,
+		libxml-simple-perl,
+		libmail-sendmail-perl,
+		libdate-calc-perl,
+		libnet-ldap-perl,
+	php5, php5-cgi, php5-cli,
+		php5-ldap, php5-pgsql,
+		libapache2-mod-fcgid,
+	python-apt, python-psycopg2,
+	libdbd-pg-ruby,
+	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.
+
+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,
+	fakeroot,
+	file,
+	gettext,
+	intltool-debian,
+	libapt-pkg-perl,
+	libclass-accessor-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
+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.