X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=31d6f4084a80185b619ca6880363e1129b08f83b;hp=322f4b626efc9489f6c7e41834e1be85954191ab;hb=5bce21cd96e89c41d4164c16c73718f6ec43b089;hpb=0fbe2318e822a89b973a73d9ee9822816cee269a

diff --git a/debian/control b/debian/control
index 322f4b6..31d6f40 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
+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
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -28,7 +28,7 @@ Depends: debian.org,
 	,
 	emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
-	at, uptimed,
+	at, uptimed, irqbalance,
 	puppet,
 	locate, dlocate
 	,
@@ -52,13 +52,17 @@ Depends: debian.org,
 	mmv,
 	moreutils,
 	patchutils,
-	psutils
+	netcat-openbsd, socat, telnet
 	,
-	deborphan, dialog
+	deborphan
 	,
 	bsd-mailx
 	,
 	timeout
+	,
+	strace
+	,
+	wget, curl
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.
@@ -103,3 +107,35 @@ Description: metapackages for packages.debian.org dependencies
  This package depends on everything that is needed for a packages.debian.org
  mirror or (in the future) packages-master.
 
+Package: debian.org-www-master.debian.org
+Architecture: all
+Depends: debiandoc-sgml,
+	dpkg-dev,
+	docbook-xsl,
+	gettext,
+	ghostscript,
+	kcc,
+	latex-cjk-chinese,
+	libnet-ldap-perl,
+	libtimedate-perl,
+	libwww-perl,
+	libxml-rss-perl,
+	littlex,
+	po4a,
+	poxml,
+	python-xml,
+	python2.4,
+	texlive-fonts-recommended,
+	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese
+	texlive-latex-base,
+	texlive-latex-extra,
+	texlive-latex-recommended,
+	time,
+	w3m,
+	wml,
+	xplanet,
+	xplanet-images,
+	xsltproc
+Description: metapackages for www-master.debian.org dependencies
+ This package depends on everything that is needed for a www-master.debian.org.
+