X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=6d8d2c4ca377a03df96f06a110d9c110eca2e0f9;hb=b1e13357e5629ed9e2f5d133eaf3c1b499f42cb7;hp=66b838879761cb60cedc2f7db8a01094fe620568;hpb=128f25cb2ec61743b3320ca5caa6a1abf4ab4999;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 66b8388..6d8d2c4 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends: debian.org,
 		git-svn,
 		subversion-tools,
 		mercurial,
+		cvs
 	,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	traceroute | not+gnu-linux,
@@ -59,8 +60,11 @@ Depends: debian.org,
 	dmidecode | not+i386,
 	dmidecode | not+ia64
 	,
+	ipython
+	,
 	mcelog | not+amd64 | not+gnu-linux,
-	mcelog | not+i386 | not+gnu-linux
+	mcelog | not+i386 | not+gnu-linux,
+	lsscsi
 	,
 	htop, psmisc,
 	lsof | not+gnu-linux,
@@ -74,6 +78,7 @@ Depends: debian.org,
 	mmv,
 	moreutils,
 	patchutils,
+	diffstat,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -215,13 +220,16 @@ Depends: debiandoc-sgml,
 	texlive-latex-base,
 	texlive-latex-extra,
 	texlive-latex-recommended,
+	tidy,
 	time,
 	ttf-arphic-uming,
+	ttf-malayalam-fonts,
 	wml,
 	xmlroff, dblatex,
 	xplanet,
 	xplanet-images,
-	xsltproc
+	xsltproc,
+	libjson-perl
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -249,8 +257,7 @@ Depends: edos-distcheck,
 	python-psycopg2,
 	python-mako,
 	python-nose,
-	python-sqlalchemy (>= 0.5),
-	python-sqlalchemy (<< 0.6),
+	python-sqlalchemy,
 	quinn-diff,
 	r-base-core,
 	r-cran-lattice,
@@ -310,6 +317,7 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
+	python-simplejson || python (>= 2.6),
 	python-yaml,
 	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
 	binutils-multiarch,
@@ -328,7 +336,6 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,
@@ -366,7 +373,8 @@ Depends: bittornado,
 	tofrodos,
 	zip,
 	zsync,
-	fakeroot
+	fakeroot,
+	dosfstools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.