X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=f78b9941de713ba677a180518abf447551e54a82;hb=65537b728e9f9fe12416f9ec9b0758adbb963f46;hp=480c45424d4f4c8697b7dfcfca185c35682ea9a0;hpb=89af3d343b14165e250576f234b3087492845bc8;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 480c454..f78b994 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,
@@ -77,6 +78,7 @@ Depends: debian.org,
 	mmv,
 	moreutils,
 	patchutils,
+	diffstat,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -187,6 +189,7 @@ Depends: debiandoc-sgml,
 	latex-cjk-all,
 	latex-cjk-chinese,
 	ldap-utils,
+	libintl-perl,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
@@ -227,8 +230,7 @@ Depends: debiandoc-sgml,
 	xplanet,
 	xplanet-images,
 	xsltproc,
-	libjson-perl,
-	libwww-perl
+	libjson-perl
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -256,12 +258,10 @@ 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,
-	postgresql-8.4, postgresql-8.4-debversion,
 	php5,
 	moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
@@ -317,8 +317,9 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
+	python-simplejson | python (>= 2.6),
 	python-yaml,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -335,7 +336,6 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,