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

diff --git a/debian/control b/debian/control
index 480acf5..6642e51 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,
@@ -272,7 +276,7 @@ Depends: apt-utils,
 	python-apt,
 	python-btsutils,
 	lintian,
-	python2.4,
+	python,
 	python-debian,
 	python-gnupginterface,
 	python-ldap,
@@ -297,14 +301,20 @@ 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,
+	zsync,
+	fakeroot
+Description: metapackage for cdbuilder
+ This package depends on all the packages that are needed for a cdbuilder setup.