X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=2e271ad5ad8b01541c250e636ef8d433e6ed0cb1;hb=a78dcb31ed13a0500a3e6c6f6a8e6c83c6c6280c;hp=a1a9c7e664314e676a6b95ecb1d3274cd0f760e1;hpb=2f564c3584d60c0a8760a9b220f9f1d0bcb33ca4;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index a1a9c7e..2e271ad 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), 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
@@ -41,7 +41,7 @@ Depends: debian.org,
 		mercurial,
 		cvs
 	,
-	mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng
+	mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng,
 	traceroute | not+gnu-linux,
 	iputils-tracepath | not+gnu-linux,
 	bind9-host, dnsutils, whois, unbound-host
@@ -69,7 +69,7 @@ Depends: debian.org,
 	mcelog | not+i386 | not+gnu-linux,
 	,
 	htop, psmisc,
-	lsof | not+gnu-linux,
+	lsof | not+gnu-linux
 	,
 	ncdu,
 	mc,
@@ -130,6 +130,7 @@ Depends: graphviz,
 	liburi-perl,
 	libhtml-tree-perl,
 	libsoap-lite-perl,
+	libtext-iconv-perl,
 	libdbd-pg-perl,
 	python-pyinotify,
 	python-yaml
@@ -142,6 +143,7 @@ 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
@@ -409,6 +411,8 @@ Depends: edos-debcheck,
 	picosat,
 	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.
@@ -428,7 +432,7 @@ Depends: bittornado,
 	dosfstools,
 	libsoap-lite-perl,
 	devscripts,
-    mtools
+	mtools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
@@ -502,7 +506,8 @@ Depends: db4.8-util,
 		libapache2-mod-fcgid,
 	python-apt, python-psycopg2,
 	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.
 
@@ -579,9 +584,11 @@ Depends:   binutils,
 	diffstat,
 	dpkg-dev,
 	debhelper,
+	devscripts,
 	fakeroot,
 	file,
 	gettext,
+	gnuplot-nox | gnuplot,
 	intltool-debian,
 	libapt-pkg-perl,
 	libarchive-zip-perl,
@@ -600,6 +607,7 @@ Depends:   binutils,
 	locales,
 	man-db,
 	perl,
+	t1utils,
 	unzip,
 	xz-utils
 	,
@@ -740,3 +748,36 @@ Depends: gettext,
 	rrdtool
 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
+Architecture: all
+Depends: asciidoc,
+	git,
+	xmlto,
+	debootstrap,
+	debsums,
+	lsb-release,
+	lsof,
+	python-debian,
+	python-debianbts,
+	apache2,
+	ghostscript,
+	python-rpy,
+	r-base-dev,
+	r-recommended,
+	tango-icon-theme,
+	screen,
+	python-apt
+Description: metapackage for piuparts.debian.org
+ This package depends on all the packages that are needed for 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