X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=e7befd326b276e8929cb0cf2bd8c921b8e3dcb7a;hp=b33478d5d189f9c56f06b314f2c17acec1b61a71;hb=4c859754120fffdb811d102c78002459d22e551d;hpb=d296c2f23e0ee0d817364a713af3ec6b24ea56e2

diff --git a/debian/control b/debian/control
index b33478d..e7befd3 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,10 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	dmidecode [amd64 i386 ia64], 
+	munin-plugins-extra
+	,
+	dmidecode [amd64 i386 ia64],
+	edac-utils,
 	sg3-utils
 	,
 	ipython
@@ -190,7 +193,8 @@ Depends: debian.org-packages.debian.org,
 	libxml-rss-perl,
 	libtimedate-perl,
 	libio-stringy-perl,
-	freecdb
+	freecdb,
+	tig
 Description: metapackages for packages.debian.org dependencies
  This package depends on everything that is needed for a
  packages-master.debian.org server.  For the mirrors all you need is the
@@ -285,6 +289,7 @@ Package: debian.org-buildd.debian.org
 Architecture: all
 Depends:
 	dose-builddebcheck,
+	dose-distcheck,
 	edos-distcheck,
 	ghostscript,
 	libcompress-bzip2-perl,
@@ -313,6 +318,7 @@ Depends:
 	php5-cgi,
 	php5-pgsql,
 	libapache2-mod-fcgid,
+	libyaml-libyaml-perl
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -487,11 +493,13 @@ Depends: libapache2-mod-wsgi,
 	python-xapian,
 	python-dateutil,
 	python-debian,
-	python-django,
+	python-django (>= 1.5),
 	python-django-south,
+	python-debiancontributors,
 	python-tz,
 	python-markdown,
 	python-lzma,
+	python-requests (>= 2.0.0),
 	procmail,
 	moreutils,
 	libjs-jquery,
@@ -561,14 +569,16 @@ Depends:
 	python-apt,
 	python-beautifulsoup,
 	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,
@@ -607,7 +617,8 @@ Depends: curl,
 	python-dev,
 	python-launchpadlib,
 	python-psycopg2,
-	python-yaml
+	python-yaml,
+	ruby-oj
 Description: metapackage for udd.debian.org
  This package depends on all the packages that are needed for udd.debian.org setup.
 
@@ -714,7 +725,9 @@ Depends: libcatalyst-modules-perl,
 	libapache2-mod-perl2,
 	libapache2-reload-perl,
 	libcatalyst-devel-perl,
-	libhtml-mason-perl
+	libhtml-mason-perl,
+	python-django (>= 1.5),
+	python-django-south
 Description: metapackages for sso.debian.org dependencies
  This package depends on everything that is needed for sso.debian.org.
 
@@ -818,6 +831,7 @@ Depends: debhelper,
 	tango-icon-theme,
 	screen,
 	python-apt,
+	python-distro-info,
 	xz-utils,
 	python-yaml,
 	devscripts, libsoap-lite-perl
@@ -838,6 +852,7 @@ Depends: debhelper,
 	screen,
 	python-debian,
 	python-apt,
+	python-distro-info,
 	adequate
 Description: metapackage for piuparts-slave.debian.org
  This package depends on all the packages that are needed for the
@@ -883,14 +898,18 @@ Description: metapackage for bits.debian.org
 Package: debian.org-d-i.debian.org
 Architecture: all
 Depends: gnuplot,
+	libdate-manip-perl,
 	libemail-mime-perl,
 	libemail-sender-perl,
 	libfile-slurp-perl,
+	libgd-graph-perl,
+	libhtml-template-perl,
 	liblist-moreutils-perl,
 	libsort-versions-perl,
 	mr,
 	gettext,
 	graphviz,
+	fonts-liberation,
 	edos-distcheck,
 	devscripts,
 	liburi-perl,
@@ -988,3 +1007,47 @@ Depends: python-apt,
 Description: metapackages for pet.debian.net dependencies
  This package depends on everything that is needed for the PET setup.
 
+Package: debian.org-dsa.debian.org
+Architecture: all
+Depends: ikiwiki, libtext-wikicreole-perl, libtext-wikiformat-perl, libtext-multimarkdown-perl
+Description: metapackages for dsa.debian.org master dependencies
+ This package depends on everything that is needed for the service
+
+Package: debian.org-dns.debian.org
+Architecture: all
+Depends: perl-doc,
+	nagios-nrpe-plugin,
+	sqlite3,
+	libdata-compare-perl,
+	libnet-dns-perl,
+	libnet-dns-sec-perl,
+	python-dnspython,
+	python-yaml
+Description: metapackages for dns.debian.org master dependencies
+ This package depends on everything that is needed for the service
+
+Package: debian.org-nagios.debian.org
+Architecture: all
+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