X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=3f2ac760000dd98200b5284012bab1e2262e6011;hb=25380761a5914b813e101fc70e7069978e6c971e;hp=fc55ebe4ff92c55d10362658437976064c8a5dad;hpb=a764b6521e44419790a27047a712c9ce53a63c13;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index fc55ebe..3f2ac76 100644
--- a/debian/control
+++ b/debian/control
@@ -215,17 +215,23 @@ 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,
 	python-coverage-test-runner,
 	python-debian,
 	python-psycopg2,
+        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,
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -267,13 +273,12 @@ Description: metapackages for testing-security.debian.org dependencies
 
 Package: debian.org-ftpmaster.debian.org
 Architecture: all
-Depends: debian.orgapt-utils,
-	gpgv,
+Depends: apt-utils,
 	libapt-pkg-dev,
 	python-apt,
 	python-btsutils,
 	lintian,
-	python2.4,
+	python,
 	python-debian,
 	python-gnupginterface,
 	python-ldap,
@@ -296,17 +301,22 @@ Depends: debian.orgapt-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.