X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=ca9a0aafbd5fcd467651510c7d373c16dc9bada5;hp=8cf7429a573805f25dc6b86de0ed648d616f0577;hb=f580e5d0f9b00a0a3a4c81a69e10d1256f820672;hpb=b5b94712ed8ccf13a69ef42627d87c2ba67e379d

diff --git a/debian/control b/debian/control
index 8cf7429..ca9a0aa 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,
@@ -62,6 +62,8 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
+	munin-plugins-extra
+	,
 	dmidecode [amd64 i386 ia64],
 	edac-utils,
 	sg3-utils
@@ -79,6 +81,7 @@ Depends: debian.org,
 	rsync,
 	screen,
 	tmux,
+	mosh,
 	ldap-utils, ldapvi,
 	mmv,
 	moreutils,
@@ -105,6 +108,7 @@ Depends: debian.org,
 	,
 	finger
 	,
+	pigz,
 	unzip
 	,
 	w3m,
@@ -316,6 +320,7 @@ Depends:
 	php5-cgi,
 	php5-pgsql,
 	libapache2-mod-fcgid,
+	libgmp10,
 	libyaml-libyaml-perl
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
@@ -538,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.
 
@@ -565,16 +571,18 @@ Depends:
 # Runtime
 	libapache2-mod-wsgi,
 	python-apt,
-	python-beautifulsoup,
+	python-bs4,
 	python-debian,
-	python-django (>= 1.5),
+	python-django (>= 1.6),
 	python-django-jsonfield,
 	python-django-south,
 	python-gpgme,
+	python-ldap,
 	python-lzma,
-	python-requests,
+	python-requests (>= 2),
 	python-soappy,
 	python-yaml,
+	dpkg-dev,
 # Database access
 	python-psycopg2,
 	postgresql-client,
@@ -858,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
@@ -1028,3 +1036,38 @@ Depends: icinga
 Description: metapackages for nagios.debian.org master dependencies
  This package depends on everything that is needed for the service and
  also provides the dpkg-diverts for the REMOTE_USER hack
+
+Package: debian.org-derivs-census-patch-generation
+Architecture: all
+Depends: python,
+         python-apt,
+         python-debian,
+         python-psycopg2,
+         python-simplejson,
+         python-yaml,
+         dpkg-dev,
+         devscripts,
+         patchutils,
+         rsync,
+         curl,
+         make,
+         lzip,
+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.