X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=057861ec602856355cbcc7b2bba4a19edd7ebeee;hp=8f31704d2c738c8d640aa921942e458e76622e65;hb=9becd0d8ebfdd8d3c1ec6ebf8ceb546d93692bf6;hpb=e484feb67ff6ad0dbfebcf9a014ced8fd7205879

diff --git a/debian/control b/debian/control
index 8f31704..057861e 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Depends: debian.org,
 	,
 	man-db
 	,
-	subversion, rcs, git-core, bzr,
+	subversion, rcs, git, bzr,
 		git-svn,
 		subversion-tools,
 		mercurial,
@@ -49,7 +49,7 @@ Depends: debian.org,
 	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	bind9-host, dnsutils, whois, unbound-host
 	,
-	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
+	emacs24-nox | emacs24 | emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
 	vim-scripts, vim-addon-manager
 	,
 	at, uptimed,
@@ -107,13 +107,15 @@ Depends: debian.org,
 	,
 	finger
 	,
+	pigz,
 	unzip
 	,
 	w3m,
 	elinks,
 	mutt
 	,
-	ccze
+	ccze,
+	multitail
 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.
@@ -541,7 +543,8 @@ Depends: db4.8-util,
 	postgresql-client,
 	libdbd-pg-ruby,
 	rrdtool,
-	raptor-utils | raptor2-utils
+	raptor-utils | raptor2-utils,
+	dose-distcheck, dose-builddebcheck, python3-yaml, python3-debian
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
 
@@ -846,7 +849,7 @@ Depends: debhelper,
 	asciidoc,
 	git,
 	xmlto,
-	debootstrap,
+	debootstrap (>= 1.0.60~bpo70),
 	debsums,
 	lsb-release,
 	lsof,
@@ -863,7 +866,7 @@ Package: debian.org-wiki.debian.org
 Architecture: all
 Depends: libapache2-mod-wsgi,
 	libjson-perl,
-	python-moinmoin,
+	python-moinmoin (>= 1.9.7-2~bpo7+1),
 	python-launchpadlib,
 	libsoap-lite-perl
 Description: metapackage for wiki.debian.org
@@ -1052,3 +1055,26 @@ Depends: python,
 Homepage: https://wiki.debian.org/Derivatives/Integration#Patches
 Description: metapackage for the derivatives census patch generation
  This package depends on everything that is needed for the service
+
+Package: debian.org-httpredir.debian.org
+Architecture: all
+Depends: inoticoming,
+         libanyevent-perl,
+         libanyevent-http-perl,
+         libev-perl,
+         libtimedate-perl,
+         libgeo-ip-perl,
+         libwww-perl,
+         liburi-perl,
+         libplack-perl,
+         starman
+Description: metapackage for http-redirector dependencies
+ This package depends on everything that is needed for an instance of
+ the http-redirector.
+
+Package: debian.org-search.debian.org
+Architecture: all
+Depends: xapian-omega
+Description: metapackage for search.debian.org dependencies
+ This package depends on everything that is needed for an instance of
+ the www search engine (aka search.debian.org).