X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=572d717301ce339a38abc4bc27d22422e090f238;hp=c7f0357fd2ceb77a8434fef16e0f991275859687;hb=4f201586a79c50a1673535c2ff0847b0fb6312b7;hpb=a0f4780aa533be6d620d7c254505f4ea34e84b19

diff --git a/debian/control b/debian/control
index c7f0357..572d717 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Description: DSA's host metapackage
 Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
-	strace
+	strace,
+	lsscsi
 Description: metapackage to pull in recommended, but not essential tools for linux system
  This package depends on packages that are recommended to  be installed on
  every Linux debian.org host but are not essential.
@@ -27,6 +28,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 +38,7 @@ Depends: debian.org,
 		git-svn,
 		subversion-tools,
 		mercurial,
+		cvs
 	,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	traceroute | not+gnu-linux,
@@ -58,8 +61,10 @@ 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,
 	,
 	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
@@ -299,6 +307,7 @@ Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
 	libapt-pkg-dev,
+	libemail-send-perl,
 	python-apt,
 	python-debianbts (>= 1.4~bpo50+1),
 	lintian,
@@ -310,7 +319,8 @@ Depends: apt-utils,
 	python-pygresql,
 	python-pyrss2gen,
 	python-yaml,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+	python-rrdtool,
+	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -327,7 +337,6 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,
@@ -337,11 +346,26 @@ Depends: apt-utils,
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-ftpmaster.debian.org-poneys
+Architecture: all
+Depends: bicyclerepair,
+	dpkg-dev-el,
+	easypg,
+	emacs-goodies-el,
+	pychecker,
+	pylint,
+	python-mode,
+	ruby-elisp
+Description: metapackage for ftpmaster extras
+ Things not really needed needed.
+
 Package: debian.org-release.debian.org
 Architecture: all
-Depends: mutt,
+Depends: edos-distcheck,
+	mutt,
 	subversion,
 	python2.5,
+	python2.5-dev,
 	devscripts,
 	wdiff,
 	python-pygresql,
@@ -349,6 +373,8 @@ Depends: mutt,
 	python-apt,
 	python-debian,
 	libapt-pkg-perl,
+	libapt-pkg-dev,
+	dpkg-dev,
 	procmail
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
@@ -365,7 +391,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 +416,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,
@@ -418,11 +446,13 @@ Depends: db4.8-util,
 		libtemplate-perl,
 		libxml-simple-perl,
 		libmail-sendmail-perl,
-		libdate-calc-perl
+		libdate-calc-perl,
+		libnet-ldap-perl,
 	php5, php5-cgi, php5-cli,
 		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.