X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=078b6c2210aaafb52a6eb509536df898734bfbf4;hp=4e3961c975ad65895109a234954b86d816eb1e53;hb=cb21b3701f8fd3222a8c4b56835a7e430ae255cf;hpb=ffd31b614f0538a7f7d9ec007574c3f4acf856a8

diff --git a/debian/control b/debian/control
index 4e3961c..078b6c2 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
@@ -21,17 +21,19 @@ Architecture: all
 Depends: debian.org,
 	molly-guard
 	,
-	subversion, rcs, git-core
+	subversion, rcs, git-core, bzr
 	,
-	mtr-tiny, tcpdump, iproute,
+	mtr-tiny, tcpdump, iproute, tcptraceroute,
 	bind9-host, dnsutils
 	,
 	emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
-	at, uptimed,
+	at, uptimed, irqbalance,
 	puppet,
 	locate, dlocate
 	,
+	dsa-nagios-checks
+	,
 	lshw,
 	dmidecode | not+amd64,
 	dmidecode | not+i386,
@@ -46,12 +48,27 @@ Depends: debian.org,
 	less
 	rsync,
 	screen,
-	ldap-utils, ldapvi
+	ldap-utils, ldapvi,
+	mmv,
+	moreutils,
+	patchutils,
+	netcat-openbsd, socat, telnet
+	,
+	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.
 
 Package: debian.org-bugs.debian.org
+Architecture: all
 Depends: graphviz,
 	libcgi-simple-perl,
 	libio-stringy-perl,
@@ -70,6 +87,7 @@ Description: metapackages for bugs.debian.org dependencies
 
 
 Package: debian.org-packages.debian.org
+Architecture: all
 Depends: db4.6-util,
 	liblocale-maketext-lexicon-perl,
 	libi18n-acceptlanguage-perl,
@@ -89,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.
+