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

diff --git a/debian/control b/debian/control
index fdedf20..f78b994 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Description: metapackage to pull in recommended, but not essential tools for lin
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
+	busybox-static,
 	debian.org-recommended-linux | not+gnu-linux,
 	molly-guard
 	,
@@ -36,6 +37,7 @@ Depends: debian.org,
 		git-svn,
 		subversion-tools,
 		mercurial,
+		cvs
 	,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	traceroute | not+gnu-linux,
@@ -58,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,
@@ -73,6 +78,7 @@ Depends: debian.org,
 	mmv,
 	moreutils,
 	patchutils,
+	diffstat,
 	netcat-openbsd, socat, telnet
 	,
 	deborphan
@@ -183,6 +189,7 @@ Depends: debiandoc-sgml,
 	latex-cjk-all,
 	latex-cjk-chinese,
 	ldap-utils,
+	libintl-perl,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
@@ -214,13 +221,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.
 
@@ -248,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
@@ -309,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,
@@ -327,7 +336,6 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,
@@ -365,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.
 
@@ -389,7 +398,8 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
 	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, python-simplejson,
+	python-sqlalchemy (>= 0.6), python (>= 2.5.4-5~) | python-simplejson,
+	python-flask (>= 0.6), python-flaskext.wtf, python-wtforms,
 	perl,
 	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
 	procmail,
@@ -424,6 +434,7 @@ Depends: db4.8-util,
 		php5-ldap, php5-pgsql,
 		libapache2-mod-fcgid,
 	python-apt, python-psycopg2,
-	libdbd-pg-ruby
+	libdbd-pg-ruby,
+	rrdtool
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.