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=5d56b461c058eee0980c15ca1001c2deaa41c27f;hb=2c93ede4b4e8b991270a25a9a0a596972174ba29;hpb=4dd29a79a49170b5bbe4c6cee0c7307cc29b87b8

diff --git a/debian/control b/debian/control
index 5d56b46..a4a0113 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,8 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	dmidecode [amd64 i386 ia64]
+	dmidecode [amd64 i386 ia64], 
+	sg3-utils
 	,
 	ipython
 	,
@@ -398,7 +399,6 @@ Depends: bicyclerepair,
 	pychecker,
 	pylint,
 	python-mode,
-	ruby-elisp,
 	gitstats,
 	colordiff
 Description: metapackage for ftpmaster extras
@@ -423,8 +423,6 @@ Depends: edos-debcheck,
 	dpkg-dev,
 	procmail,
 	rrdtool,
-	python3.1,
-	python3.1-dev,
 	python3-apt,
 	picosat,
 	openjdk-6-jre-headless,
@@ -470,28 +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-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,
-	python-flup
-# These are also needed, but they are currently not available in squeeze and
-# difficult to backport:
-# python-flaskext.wtf, python-wtforms
+	libjs-jquery
 Description: metapackage for nm.debian.org
  This package depends on all the packages that are needed for nm.debian.org setup.
 
@@ -621,6 +612,7 @@ Depends:   binutils,
 	libipc-run-perl,
 	liblist-moreutils-perl,
 	libparse-debianchangelog-perl,
+	libperlio-gzip-perl,
 	libtimedate-perl,
 	libtext-levenshtein-perl,
 	libtext-template-perl,
@@ -770,28 +762,45 @@ Depends: gettext,
 Description: metapackages for l10n.debian.org dependencies
  This package depends on everything that is needed for l10n.debian.org.
 
-Package: debian.org-piuparts.debian.org
+Package: debian.org-piuparts-master.debian.org
 Architecture: all
-Depends: asciidoc,
+Depends: debhelper,
+	asciidoc,
 	git,
 	xmlto,
-	debootstrap,
-	debsums,
-	lsb-release,
-	lsof,
-	python-debian,
 	python-debianbts,
 	apache2,
 	ghostscript,
-	python-rpy,
+	python-rpy2,
 	r-base-dev,
 	r-recommended,
 	tango-icon-theme,
 	screen,
-	python-apt
-Description: metapackage for piuparts.debian.org
+	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
- piuparts.debian.org setup.
+ 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
@@ -829,3 +838,24 @@ Depends: python-unidecode,
 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.