X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=2617996a9ab85b1a5fb08f0284ac192c5bab124c;hb=1d7196d01d0cff827b3158c9dcaf5939f7f8d04a;hp=0abc804fab34ad7371cda99d32d3c713fc6ba1c9;hpb=826155b9b3a2c2e3727faa5391bbd806c94972a6;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 0abc804..2617996 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>, Stephen Gran <sgran@debian.org>
 Build-Depends: debhelper (>= 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
+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,49 +16,73 @@ 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
 	,
 	man-db
 	,
-	vlan, ifenslave, bridge-utils
-	,
 	subversion, rcs, git-core, bzr,
 		git-svn,
-		subversion-tools
+		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, irqbalance,
+	at, uptimed,
 	puppet,
+		libaugeas-ruby,
+		libaugeas-ruby1.8,
+		libaugeas0,
+		augeas-lenses (>= 0.7),
 	locate, dlocate
 	,
 	dsa-nagios-checks
 	,
-	lshw,
+	lshw | not+gnu-linux,
 	dmidecode | not+amd64,
 	dmidecode | not+i386,
 	dmidecode | not+ia64
 	,
-	mcelog | not+amd64,
-	mcelog | not+i386
+	ipython
 	,
-	htop, lsof, psmisc
+	mcelog | not+amd64 | not+gnu-linux,
+	mcelog | not+i386 | not+gnu-linux,
 	,
+	htop, psmisc,
+	lsof | not+gnu-linux,
+	,
+	ncdu,
 	mc,
 		genisoimage,
-	less
+	less,
 	rsync,
 	screen,
+	tmux,
 	ldap-utils, ldapvi,
 	mmv,
 	moreutils,
 	patchutils,
+	diffstat,
+	bc,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -69,11 +93,9 @@ Depends: debian.org,
 	,
 	bsd-mailx
 	,
-	timeout
-	,
-	strace
+	timeout | coreutils (>= 8.0-1)
 	,
-	wget, curl, lftp
+	wget, curl, lftp, ftp,
 	,
 	dput
 	,
@@ -84,7 +106,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.
@@ -102,7 +125,10 @@ Depends: graphviz,
 	libtext-template-perl,
 	liburi-perl,
 	libhtml-tree-perl,
-	libsoap-lite-perl
+	libsoap-lite-perl,
+	libdbd-pg-perl,
+	python-pyinotify,
+	python-yaml
 Description: metapackages for bugs.debian.org dependencies
  This package depends on everything that is needed for a bugs.debian.org
  mirror or (in the future) bugs-master.
@@ -142,6 +168,7 @@ Depends: db4.6-util,
 	libtemplate-perl,
 	liblingua-stem-perl,
 	libsearch-xapian-perl,
+	libtimedate-perl,
 	libapache2-mod-perl2,
 	libapache2-reload-perl
 Description: metapackages for packages.debian.org dependencies
@@ -151,59 +178,89 @@ 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,
-	locales, locales-all
+	ko.tex-base,
+	latex-cjk-all,
 	latex-cjk-chinese,
-        latex-cjk-all,
+	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,
-	python-xml,
-	python2.4,
+	procmail,
 	texlive-fonts-recommended,
-	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese
+	texlive-lang-all,
+	latex-cjk-japanese,
 	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,
-	procmail,
-	ldap-utils,
-	asciidoc,
-	libxml2-utils
+	libjson-perl
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
 
 Package: debian.org-buildd.debian.org
 Architecture: all
-Depends: edos-debcheck,
-	db4.7-util,
+Depends: edos-distcheck,
 	ghostscript,
 	libcompress-bzip2-perl,
 	libcompress-zlib-perl,
+	libhash-merge-perl,
 	libmailtools-perl,
-	libmldbm-perl,
+	libdbi-perl,
+	libdbd-pg-perl,
+	libfile-spec-perl,
+	libstring-escape-perl,
+	libstring-format-perl,
+	libyaml-tiny-perl,
 	python-apt,
 	python-contract,
 	python-coverage,
-	python-coverage-test-runner
 	python-debian,
 	python-psycopg2,
-	quinn-diff,
+	python-mako,
+	python-nose,
+	python-sqlalchemy,
 	r-base-core,
-	r-cran-lattice
+	r-cran-lattice,
+	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.
 
@@ -225,10 +282,14 @@ Description: metapackages for patch-tracker.debian.org dependencies
 
 Package: debian.org-planet.debian.org
 Architecture: all
-Depends: libwww-perl
+Depends: libwww-perl,
+	timeout | coreutils (>= 8.0-1),
+	debianutils,
+	python-django,
+	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.
- Note: This package is very incomplete.
 
 Package: debian.org-testing-security.debian.org
 Architecture: all
@@ -239,3 +300,302 @@ Depends: libdbd-sqlite3-perl,
 	python-apt
 Description: metapackages for testing-security.debian.org dependencies
  This package depends on everything that is needed for a testing-security.debian.org.
+
+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,
+	python,
+	python-debian,
+	python-gnupginterface,
+	python-ldap,
+	python-psycopg2,
+	python-pygresql,
+	python-pyrss2gen,
+	python-yaml,
+	python-rrdtool,
+	python-sqlalchemy,
+	binutils-multiarch,
+	build-essential,
+	devscripts,
+	graphviz,
+	ikiwiki,
+	libdbd-pg-ruby,
+	python-epydoc,
+	python-numpy,
+	python-soappy,
+	r-base,
+	symlinks,
+	python-magic,
+	unp,
+	procmail,
+	cvs,
+	ruby,
+	lynx,
+	libxml-rss-perl,
+	ghostscript,
+	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.6,
+	python2.6-dev,
+	python-dev,
+	devscripts,
+	wdiff,
+	python-pygresql,
+	python-libxslt1,
+	python-apt,
+	python-debian,
+	libapt-pkg-perl,
+	libapt-pkg-dev,
+	dpkg-dev,
+	procmail,
+	rrdtool,
+	python3.1,
+	python3.1-dev,
+	python3-apt,
+	picosat,
+	openjdk-6-jre-headless
+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,
+	build-essential,
+	debhelper,
+	debian-cd,
+	jigit,
+	m4,
+	tofrodos,
+	zip,
+	zsync,
+	fakeroot,
+	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,
+	gs-common
+Description: metapackage for manpages
+ This package depends on all the packages that are needed for manpages.d.o setup.
+
+Package: debian.org-nm.debian.org
+Architecture: all
+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-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,
+	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.
+
+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.