X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=a4a01133131825525cb169c81cd2244dba28a050;hp=f2c80b57b8946a866a4349adbbc4a0605fd1c7b8;hb=2c93ede4b4e8b991270a25a9a0a596972174ba29;hpb=4222294d7ed807f28c9b9b25be5d88ffc76ba011

diff --git a/debian/control b/debian/control
index f2c80b5..a4a0113 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>, Stephen Gran <sgran@debian.org>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>, Stephen Gran <sgran@debian.org>, Luca Filipozzi <lfilipoz@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, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, nano, 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
@@ -20,16 +20,22 @@ Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
 	strace,
-	lsscsi
+	lsscsi,
+	ethtool,
+	bwm-ng,
+	iputils-tracepath,
+	traceroute,
+	lshw,
+	lsof
 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
+Architecture: any
 Depends: debian.org,
 	busybox-static,
-	debian.org-recommended-linux | not+gnu-linux,
+	debian.org-recommended-linux [linux-any],
 	molly-guard
 	,
 	man-db
@@ -41,11 +47,10 @@ Depends: debian.org,
 		cvs
 	,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
-	traceroute | not+gnu-linux,
-	iputils-tracepath | not+gnu-linux,
 	bind9-host, dnsutils, whois, unbound-host
 	,
-	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
+	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
+	vim-scripts, vim-addon-manager
 	,
 	at, uptimed,
 	puppet,
@@ -57,18 +62,14 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw | not+gnu-linux,
-	dmidecode | not+amd64,
-	dmidecode | not+i386,
-	dmidecode | not+ia64
+	dmidecode [amd64 i386 ia64], 
+	sg3-utils
 	,
 	ipython
 	,
-	mcelog | not+amd64 | not+gnu-linux,
-	mcelog | not+i386 | not+gnu-linux,
+	mcelog [amd64 i386]
 	,
 	htop, psmisc,
-	lsof | not+gnu-linux,
 	,
 	ncdu,
 	mc,
@@ -82,6 +83,7 @@ Depends: debian.org,
 	moreutils,
 	patchutils,
 	diffstat,
+	bc,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -107,6 +109,8 @@ Depends: debian.org,
 	w3m,
 	elinks,
 	mutt
+	,
+	ccze
 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.
@@ -115,8 +119,10 @@ Package: debian.org-bugs.debian.org
 Architecture: all
 Depends: graphviz,
 	libcgi-simple-perl,
+	libgravatar-url-perl,
 	libio-stringy-perl,
 	liblist-moreutils-perl,
+	libmail-rfc822-address-perl,
 	libmime-tools-perl,
 	libmldbm-perl,
 	libparams-validate-perl,
@@ -125,6 +131,7 @@ Depends: graphviz,
 	liburi-perl,
 	libhtml-tree-perl,
 	libsoap-lite-perl,
+	libtext-iconv-perl,
 	libdbd-pg-perl,
 	python-pyinotify,
 	python-yaml
@@ -132,6 +139,27 @@ 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.
 
+Package: debian.org-bugs.debian.org-master
+Architecture: all
+Depends: debian.org-bugs.debian.org,
+	gnuplot,
+	ttf-liberation,
+	kgb-client-git,
+	lynx	
+Description: metapackages for bugs-master.debian.org dependencies
+ This package depends on everything that is needed for a
+ bugs-master.debian.org
+
+Package: debian.org-bugs.debian.org-search
+Architecture: all
+Depends: debian.org-bugs.debian.org,
+	hyperestraier,
+	libdate-manip-perl,
+	libsearch-estraier-perl
+Description: metapackages for bugs-search.debian.org dependencies
+ This package depends on everything that is needed for a
+ bugs-search.debian.org
+
 Package: debian.org-bugs.debian.org-mx
 Architecture: all
 Depends: debian.org-bugs.debian.org,
@@ -152,10 +180,24 @@ Description: metapackages for bugs.debian.org mail exchanger
  MX.
 
 
+Package: debian.org-packages-master.debian.org
+Architecture: all
+Depends: debian.org-packages.debian.org,
+	procmail,
+	gettext,
+	libhtml-template-perl,
+	libxml-rss-perl,
+	libtimedate-perl,
+	libio-stringy-perl,
+	freecdb
+Description: metapackages for packages.debian.org dependencies
+ This package depends on everything that is needed for a
+ packages-master.debian.org server.  For the mirrors all you need is the
+ debian.org-packages.debian.org package.
+
 Package: debian.org-packages.debian.org
 Architecture: all
-Depends: db4.6-util,
-	liblocale-maketext-lexicon-perl,
+Depends: liblocale-maketext-lexicon-perl,
 	libi18n-acceptlanguage-perl,
 	libnumber-format-perl,
 	libcompress-zlib-perl,
@@ -169,10 +211,13 @@ Depends: db4.6-util,
 	libsearch-xapian-perl,
 	libtimedate-perl,
 	libapache2-mod-perl2,
-	libapache2-reload-perl
+	libapache2-reload-perl,
+	dpkg-dev,
+	rsync
 Description: metapackages for packages.debian.org dependencies
  This package depends on everything that is needed for a packages.debian.org
- mirror or (in the future) packages-master.
+ mirror.  For packages-master install the debian.org-packages-master.debian.org
+ package.
 
 Package: debian.org-www-master.debian.org
 Architecture: all
@@ -184,6 +229,7 @@ Depends: debiandoc-sgml,
 	docbook-dsssl,
 	docbook-xsl,
 	dpkg-dev,
+	gawk (>= 1:4.0.1),
 	gettext,
 	ghostscript,
 	imagemagick,
@@ -207,6 +253,7 @@ Depends: debiandoc-sgml,
 	locales, locales-all,
 	lmodern,
 	maildrop,
+	opencc,
 	openjade,
 	openjade1.3,
 	po4a,
@@ -352,7 +399,6 @@ Depends: bicyclerepair,
 	pychecker,
 	pylint,
 	python-mode,
-	ruby-elisp,
 	gitstats,
 	colordiff
 Description: metapackage for ftpmaster extras
@@ -363,8 +409,8 @@ Architecture: all
 Depends: edos-debcheck,
 	mutt,
 	subversion,
-	python2.5,
-	python2.5-dev,
+	python2.6,
+	python2.6-dev,
 	python-dev,
 	devscripts,
 	wdiff,
@@ -377,11 +423,12 @@ Depends: edos-debcheck,
 	dpkg-dev,
 	procmail,
 	rrdtool,
-	python3.1,
-	python3.1-dev,
 	python3-apt,
 	picosat,
-	openjdk-6-jre-headless
+	openjdk-6-jre-headless,
+	git-email,
+	python-networkx,
+	python-pygraphviz,
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.
@@ -400,7 +447,8 @@ Depends: bittornado,
 	fakeroot,
 	dosfstools,
 	libsoap-lite-perl,
-	devscripts
+	devscripts,
+	mtools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
@@ -420,24 +468,21 @@ Description: metapackage for manpages
 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-lxml, python-psycopg2, python-soappy,
 	python-xapian,
 	python-dateutil,
-	perl,
-	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
+	python-debian,
+	python-django,
+	python-tz,
 	procmail,
-	moreutils
+	moreutils,
+	libjs-jquery
 Description: metapackage for nm.debian.org
  This package depends on all the packages that are needed for nm.debian.org setup.
 
@@ -451,6 +496,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,
@@ -467,30 +513,58 @@ Depends: db4.8-util,
 	php5, php5-cgi, php5-cli,
 		php5-ldap, php5-pgsql,
 		libapache2-mod-fcgid,
-	python-apt, python-psycopg2,
+	python-apt, python-psycopg2, python-gpgme,
 	libdbd-pg-ruby,
-	rrdtool
+	rrdtool,
+	raptor-utils | raptor2-utils
 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: graphviz,
+Depends: curl,
+	dpkg-dev,
+	graphviz,
 	libapt-pkg-dev,
+	libcrypt-ssleay-perl,
 	libcgi-simple-perl,
+	libdbd-pg-perl,
 	libdbd-pg-ruby,
+	libdbi-perl,
 	libdbi-ruby,
+	libdpkg-ruby,
+	libio-stringy-perl,
 	libjson-ruby,
 	liblist-moreutils-perl,
 	libmime-tools-perl,
+	libmldbm-perl,
 	libparams-validate-perl,
 	libperl-dev,
-	libmldbm-perl,
 	libsafe-hole-perl,
 	libtext-template-perl,
 	libyaml-syck-perl,
+	postgresql-autodoc,
+	python-dateutil,
 	python-debian,
 	python-dev,
+	python-launchpadlib,
 	python-psycopg2,
 	python-yaml
 Description: metapackage for udd.debian.org
@@ -519,29 +593,41 @@ Depends:   binutils,
 	diffstat,
 	dpkg-dev,
 	debhelper,
+	devscripts,
 	fakeroot,
 	file,
 	gettext,
+	gnuplot-nox | gnuplot,
+	hardening-includes (>= 2.2~),
 	intltool-debian,
 	libapt-pkg-perl,
+	libarchive-zip-perl,
 	libclass-accessor-perl,
+	libclone-perl,
 	libdigest-sha-perl,
 	libdpkg-perl,
 	libemail-valid-perl,
+	libfile-basedir-perl,
 	libhtml-parser-perl,
 	libipc-run-perl,
+	liblist-moreutils-perl,
 	libparse-debianchangelog-perl,
+	libperlio-gzip-perl,
 	libtimedate-perl,
+	libtext-levenshtein-perl,
 	libtext-template-perl,
 	liburi-perl,
 	locales,
 	man-db,
 	perl,
+	perl (>= 5.14~) | libautodie-perl (>= 2.10~),
+	t1utils,
 	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.
 
@@ -568,3 +654,208 @@ Depends: python-apt,
 	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
+	,
+	libapache2-mod-wsgi,
+	python-setuptools,
+	python-psycopg2,
+	python-django,
+	python-sqlalchemy
+	,
+	tig,
+	postgresql-client-9.1
+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,
+	rrdtool
+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,
+	rrdtool
+Description: metapackages for l10n.debian.org dependencies
+ This package depends on everything that is needed for l10n.debian.org.
+
+Package: debian.org-piuparts-master.debian.org
+Architecture: all
+Depends: debhelper,
+	asciidoc,
+	git,
+	xmlto,
+	python-debianbts,
+	apache2,
+	ghostscript,
+	python-rpy2,
+	r-base-dev,
+	r-recommended,
+	tango-icon-theme,
+	screen,
+	python-apt,
+	xz-utils,
+	python-yaml,
+	devscripts, libsoap-lite-perl
+Description: metapackage for piuparts-master.debian.org
+ This package depends on all the packages that are needed for the
+ master in the piuparts.debian.org setup.
+
+Package: debian.org-piuparts-slave.debian.org
+Architecture: all
+Depends: debhelper,
+	asciidoc,
+	git,
+	xmlto,
+	debootstrap,
+	debsums,
+	lsb-release,
+	lsof,
+	screen,
+	python-debian,
+	python-apt,
+	adequate
+Description: metapackage for piuparts-slave.debian.org
+ This package depends on all the packages that are needed for the
+ slaves in the piuparts.debian.org setup.
+
+Package: debian.org-wiki.debian.org
+Architecture: all
+Depends: libapache2-mod-wsgi,
+	libjson-perl,
+	python-moinmoin,
+	python-launchpadlib,
+	libsoap-lite-perl
+Description: metapackage for wiki.debian.org
+ This package depends on all the packages that are needed for the Debian wiki
+
+Package: debian.org-vote.debian.org
+Architecture: all
+Depends: libparse-recdescent-perl,
+	libmime-tools-perl,
+	libnet-ldap-perl,
+	libgnupg-interface-perl,
+	libmail-gnupg-perl,
+	graphviz
+Description: metapackage for vote.debian.org
+ This package depends on all the packages that are needed for DeVoteE
+
+Package: debian.org-bits.debian.org
+Architecture: all
+Depends: python-unidecode,
+	python-jinja2,
+	python-pygments,
+	python-docutils,
+	python-markdown,
+	python-tz,
+	python-typogrify,
+	python-six
+# Also needed, to add when they are available in Debian and can be backported:
+# feedgenerator (#702229), blinker (#702231), pelican (#702222)
+Description: metapackage for bits.debian.org
+ This package depends on all the packages that are needed for the Debian
+ blog bits.debian.org
+
+Package: debian.org-d-i.debian.org
+Architecture: all
+Depends: gnuplot,
+	libemail-mime-perl,
+	libemail-sender-perl,
+	liblist-moreutils-perl,
+	libsort-versions-perl,
+	devscripts,
+	liburi-perl
+Description: metapackage for d-i.debian.org
+ This package depends on all the packages that are needed for the
+ d-i.debian.org setup.
+
+Package: debian.org-codesearch.debian.org
+Architecture: all
+Depends: dpkg-dev,
+	postgresql-client
+Description: metapackage for codesearch.debian.org
+ This package depends on all the packages that are needed for the codesearch
+ setup.