X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=965e681f6ae06a76c6dd33ba571acaaf98461463;hb=03fc6c044251127104900365d432ae75dde1adce;hp=0d2777bec97e5755f746a248a857d2f29b5ffe1e;hpb=195d46d4f6f218521895f6d0db2f532b94b8d08c;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 0d2777b..965e681 100644
--- a/debian/control
+++ b/debian/control
@@ -215,8 +215,12 @@ Depends: edos-debcheck,
 	ghostscript,
 	libcompress-bzip2-perl,
 	libcompress-zlib-perl,
+	libhash-merge-perl,
 	libmailtools-perl,
 	libmldbm-perl,
+	libstring-escape-perl,
+	libstring-format-perl,
+	libyaml-tiny-perl,
 	python-apt,
 	python-contract,
 	python-coverage,
@@ -225,7 +229,8 @@ Depends: edos-debcheck,
 	python-psycopg2,
 	quinn-diff,
 	r-base-core,
-	r-cran-lattice
+	r-cran-lattice,
+        postgresql-8.4, postgresql-8.4-debversion
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -268,12 +273,11 @@ Description: metapackages for testing-security.debian.org dependencies
 Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
-	gpgv,
 	libapt-pkg-dev,
 	python-apt,
 	python-btsutils,
 	lintian,
-	python2.4,
+	python,
 	python-debian,
 	python-gnupginterface,
 	python-ldap,
@@ -296,17 +300,22 @@ Depends: apt-utils,
 	python-magic,
 	unp,
 	procmail,
-	mc,
 	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,
+	zsync,
+	fakeroot
+Description: metapackage for cdbuilder
+ This package depends on all the packages that are needed for a cdbuilder setup.