X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=cc3e3b6d76ad70187ab3ee61d1d1db3cb16dc37b;hp=480acf54b82307b6de9a76e1305b2c7c965d723c;hb=c5fd1c6d19e50d3970066aa9e38a893b7533208f;hpb=158d52d2ffe298f70ca044a342ad1f69cee25061

diff --git a/debian/control b/debian/control
index 480acf5..cc3e3b6 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,12 @@ Depends: debian.org,
 	,
 	emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
-	at, uptimed, irqbalance,
+	at, uptimed,
 	puppet,
+		libaugeas-ruby,
+		libaugeas-ruby1.8,
+		libaugeas0,
+		augeas-lenses (>= 0.7),
 	locate, dlocate
 	,
 	dsa-nagios-checks
@@ -102,7 +106,10 @@ Depends: graphviz,
 	libtext-template-perl,
 	liburi-perl,
 	libhtml-tree-perl,
-	libsoap-lite-perl
+	libsoap-lite-perl,
+	libdbd-pg-perl,
+	python-pyinotify,
+	python-yaml
 Description: metapackages for bugs.debian.org dependencies
  This package depends on everything that is needed for a bugs.debian.org
  mirror or (in the future) bugs-master.
@@ -157,10 +164,10 @@ Depends: debiandoc-sgml,
 	gettext,
 	ghostscript,
 	kcc,
-        xmlroff, dblatex,
+	xmlroff, dblatex,
 	locales, locales-all,
 	latex-cjk-chinese,
-        latex-cjk-all,
+	latex-cjk-all,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
@@ -203,29 +210,39 @@ Depends: debiandoc-sgml,
 	texlive-lang-vietnamese,
 	ko.tex-base,
 	cm-super,
-        ttf-arphic-uming
+	ttf-arphic-uming
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
 
 Package: debian.org-buildd.debian.org
 Architecture: all
-Depends: edos-debcheck,
-	db4.7-util,
+Depends: edos-distcheck,
+	db4.8-util,
 	ghostscript,
 	libcompress-bzip2-perl,
 	libcompress-zlib-perl,
+	libhash-merge-perl,
 	libmailtools-perl,
-	libmldbm-perl,
+	libdbi-perl,
+	libdbd-pg-perl,
+	libfile-spec-perl,
+	libstring-escape-perl,
+	libstring-format-perl,
+	libyaml-tiny-perl,
 	python-apt,
 	python-contract,
 	python-coverage,
 	python-coverage-test-runner,
 	python-debian,
 	python-psycopg2,
+	python-nose,
+	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
 	quinn-diff,
 	r-base-core,
-	r-cran-lattice
+	r-cran-lattice,
+	postgresql-8.4, postgresql-8.4-debversion,
+	php5
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -272,7 +289,7 @@ Depends: apt-utils,
 	python-apt,
 	python-btsutils,
 	lintian,
-	python2.4,
+	python,
 	python-debian,
 	python-gnupginterface,
 	python-ldap,
@@ -297,14 +314,28 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
-	bicyclerepair,
-	debian-el,
-	dpkg-dev-el,
-	easypg,
-	emacs-goodies-el,
-	pymacs,
-	python-mode,
-	ruby-elisp
+	irb
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
+
+Package: debian.org-cdbuilder.debian.org
+Architecture: all
+Depends: bittornado,
+	build-essential,
+	debhelper,
+	debian-cd,
+	jigit,
+	m4,
+	tofrodos,
+	zip,
+	zsync,
+	fakeroot
+Description: metapackage for cdbuilder
+ This package depends on all the packages that are needed for a cdbuilder setup.
+
+Package: debian.org-manpages.debian.org
+Architecture: all
+Depends: locales-all,
+	gs-common
+Description: metapackage for manpages
+ This package depends on all the packages that are needed for manpages.d.o setup.