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

diff --git a/debian/control b/debian/control
index 46f3861..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,
@@ -506,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.
 
@@ -774,10 +775,9 @@ Description: metapackage for piuparts.debian.org
 Package: debian.org-wiki.debian.org
 Architecture: all
 Depends: libapache2-mod-wsgi,
-	 libjson-perl,
-	 python-moinmoin,
-	 python-launchpadlib,
-	 libsoap-lite-perl
+	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
-