X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=baf709f9d4921be488703765d9c5afb56d0be476;hp=2705e428a4a4a1abfb9778c41cd128316b428647;hb=91f79d12d24448f7c57d866288bca7a9737182fc;hpb=005e74b44eedd3933ef474f8009877db888da75b

diff --git a/debian/control b/debian/control
index 2705e42..baf709f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,16 +21,21 @@ Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
 	strace,
 	lsscsi,
-	ethtool
+	ethtool,
+	bwm-ng,
+	iputils-tracepath,
+	traceroute,
+	lshw,
+	lsof
 Description: metapackage to pull in recommended, but not essential tools for linux system
  This package depends on packages that are recommended to  be installed on
  every Linux debian.org host but are not essential.
 
 Package: debian.org-recommended
-Architecture: all
+Architecture: any
 Depends: debian.org,
 	busybox-static,
-	debian.org-recommended-linux | not+gnu-linux,
+	debian.org-recommended-linux [linux-any],
 	molly-guard
 	,
 	man-db
@@ -41,12 +46,11 @@ Depends: debian.org,
 		mercurial,
 		cvs
 	,
-	mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng,
-	traceroute | not+gnu-linux,
-	iputils-tracepath | not+gnu-linux,
+	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
 	bind9-host, dnsutils, whois, unbound-host
 	,
-	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
+	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
+	vim-scripts, vim-addon-manager
 	,
 	at, uptimed,
 	puppet,
@@ -58,18 +62,14 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw | not+gnu-linux,
-	dmidecode | not+amd64,
-	dmidecode | not+i386,
-	dmidecode | not+ia64
+	dmidecode [amd64 i386 ia64], 
+	sg3-utils
 	,
 	ipython
 	,
-	mcelog | not+amd64 | not+gnu-linux,
-	mcelog | not+i386 | not+gnu-linux,
+	mcelog [amd64 i386]
 	,
 	htop, psmisc,
-	lsof | not+gnu-linux
 	,
 	ncdu,
 	mc,
@@ -119,6 +119,7 @@ Package: debian.org-bugs.debian.org
 Architecture: all
 Depends: graphviz,
 	libcgi-simple-perl,
+	libgravatar-url-perl,
 	libio-stringy-perl,
 	liblist-moreutils-perl,
 	libmail-rfc822-address-perl,
@@ -132,6 +133,7 @@ Depends: graphviz,
 	libsoap-lite-perl,
 	libtext-iconv-perl,
 	libdbd-pg-perl,
+	libfile-libmagic-perl,
 	python-pyinotify,
 	python-yaml
 Description: metapackages for bugs.debian.org dependencies
@@ -153,6 +155,7 @@ Package: debian.org-bugs.debian.org-search
 Architecture: all
 Depends: debian.org-bugs.debian.org,
 	hyperestraier,
+	libdate-manip-perl,
 	libsearch-estraier-perl
 Description: metapackages for bugs-search.debian.org dependencies
  This package depends on everything that is needed for a
@@ -178,10 +181,24 @@ Description: metapackages for bugs.debian.org mail exchanger
  MX.
 
 
+Package: debian.org-packages-master.debian.org
+Architecture: all
+Depends: debian.org-packages.debian.org,
+	procmail,
+	gettext,
+	libhtml-template-perl,
+	libxml-rss-perl,
+	libtimedate-perl,
+	libio-stringy-perl,
+	freecdb
+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
+ debian.org-packages.debian.org package.
+
 Package: debian.org-packages.debian.org
 Architecture: all
-Depends: db4.6-util,
-	liblocale-maketext-lexicon-perl,
+Depends: liblocale-maketext-lexicon-perl,
 	libi18n-acceptlanguage-perl,
 	libnumber-format-perl,
 	libcompress-zlib-perl,
@@ -194,11 +211,14 @@ Depends: db4.6-util,
 	liblingua-stem-perl,
 	libsearch-xapian-perl,
 	libtimedate-perl,
-	libapache2-mod-perl2,
-	libapache2-reload-perl
+	libcgi-fast-perl,
+	libapache2-mod-fcgid,
+	dpkg-dev,
+	rsync
 Description: metapackages for packages.debian.org dependencies
  This package depends on everything that is needed for a packages.debian.org
- mirror or (in the future) packages-master.
+ mirror.  For packages-master install the debian.org-packages-master.debian.org
+ package.
 
 Package: debian.org-www-master.debian.org
 Architecture: all
@@ -263,7 +283,9 @@ Description: metapackages for www-master.debian.org dependencies
 
 Package: debian.org-buildd.debian.org
 Architecture: all
-Depends: edos-distcheck,
+Depends:
+	dose-builddebcheck,
+	edos-distcheck,
 	ghostscript,
 	libcompress-bzip2-perl,
 	libcompress-zlib-perl,
@@ -285,9 +307,12 @@ Depends: edos-distcheck,
 	python-sqlalchemy,
 	r-base-core,
 	r-cran-lattice,
-	php5,
 	moreutils (>= 0.39~),
-	libdpkg-perl
+	libdpkg-perl,
+	php5,
+	php5-cgi,
+	php5-pgsql,
+	libapache2-mod-fcgid,
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -380,7 +405,6 @@ Depends: bicyclerepair,
 	pychecker,
 	pylint,
 	python-mode,
-	ruby-elisp,
 	gitstats,
 	colordiff
 Description: metapackage for ftpmaster extras
@@ -389,10 +413,12 @@ Description: metapackage for ftpmaster extras
 Package: debian.org-release.debian.org
 Architecture: all
 Depends: edos-debcheck,
+	dose-distcheck,
+	dose-builddebcheck,
 	mutt,
 	subversion,
-	python2.6,
-	python2.6-dev,
+	python2.7,
+	python2.7-dev,
 	python-dev,
 	devscripts,
 	wdiff,
@@ -405,14 +431,13 @@ Depends: edos-debcheck,
 	dpkg-dev,
 	procmail,
 	rrdtool,
-	python3.1,
-	python3.1-dev,
 	python3-apt,
 	picosat,
 	openjdk-6-jre-headless,
 	git-email,
 	python-networkx,
 	python-pygraphviz,
+	python-yaml,
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.
@@ -445,35 +470,32 @@ Description: metapackage for cdimage-search.debian.org
 Package: debian.org-manpages.debian.org
 Architecture: all
 Depends: locales-all,
-	gs-common
+	ghostscript
 Description: metapackage for manpages
  This package depends on all the packages that are needed for manpages.d.o setup.
 
 Package: debian.org-nm.debian.org
 Architecture: all
-Depends: libapache2-mod-php5, libapache2-mod-wsgi,
-	php5-cli,
-	php5-ldap, php5-pgsql,
-	wml,
+Depends: libapache2-mod-wsgi,
 	mutt, mboxgrep,
 	python,
 	python-mako (>= 0.2.5), python-gnupginterface, python-ldap,
 	python-apt, python-beautifulsoup, python-debianbts, python-dns,
 	python-dnspython, python-egenix-mxdatetime, python-egenix-mxtools,
 	python-elementtree | python (>= 2.6), python-flup, python-libxml2,
-	python-lxml, python-psycopg2, python-soappy, python-virtualenv,
-	python-sqlalchemy (>= 0.6), python (>= 2.5.4-5~) | python-simplejson,
-	python-flask (>= 0.6),
+	python-lxml, python-psycopg2, python-soappy,
 	python-xapian,
 	python-dateutil,
-	perl,
-	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
+	python-debian,
+	python-django,
+	python-django-south,
+	python-tz,
+	python-markdown,
+	python-lzma,
 	procmail,
 	moreutils,
-	python-flup
-# These are also needed, but they are currently not available in squeeze and
-# difficult to backport:
-# python-flaskext.wtf, python-wtforms
+	libjs-jquery,
+	postgresql-client
 Description: metapackage for nm.debian.org
  This package depends on all the packages that are needed for nm.debian.org setup.
 
@@ -501,12 +523,16 @@ Depends: db4.8-util,
 		libmail-sendmail-perl,
 		libdate-calc-perl,
 		libnet-ldap-perl,
+		libjson-perl,
 	php5, php5-cgi, php5-cli,
 		php5-ldap, php5-pgsql,
 		libapache2-mod-fcgid,
-	python-apt, python-psycopg2,
+	python-apt, python-psycopg2, python-gpgme,
+	python3, python3-psycopg2,
+	postgresql-client,
 	libdbd-pg-ruby,
-	rrdtool
+	rrdtool,
+	raptor-utils | raptor2-utils
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
 
@@ -527,6 +553,31 @@ Depends: db4.7-util,
 Description: metapackage for packages.qa.debian.org
  This package depends on all the packages that are needed for packages.qa.debian.org setup.
 
+Package: debian.org-tracker.debian.org
+Architecture: all
+Depends:
+# Runtime
+	libapache2-mod-wsgi,
+	python-apt,
+	python-beautifulsoup,
+	python-debian,
+	python-django (>= 1.5),
+	python-django-jsonfield,
+	python-django-south,
+	python-gpgme,
+	python-lzma,
+	python-requests,
+	python-soappy,
+	python-yaml,
+# Database access
+	python-psycopg2,
+	postgresql-client,
+# Test suite and docs
+	python-mock,
+	python-sphinx,
+Description: metapackage for tracker.debian.org
+ This package depends on all the packages that are needed for tracker.debian.org.
+
 Package: debian.org-udd.debian.org
 Architecture: all
 Depends: curl,
@@ -588,6 +639,7 @@ Depends:   binutils,
 	file,
 	gettext,
 	gnuplot-nox | gnuplot,
+	hardening-includes (>= 2.2~),
 	intltool-debian,
 	libapt-pkg-perl,
 	libarchive-zip-perl,
@@ -596,9 +648,12 @@ Depends:   binutils,
 	libdigest-sha-perl,
 	libdpkg-perl,
 	libemail-valid-perl,
+	libfile-basedir-perl,
 	libhtml-parser-perl,
 	libipc-run-perl,
+	liblist-moreutils-perl,
 	libparse-debianchangelog-perl,
+	libperlio-gzip-perl,
 	libtimedate-perl,
 	libtext-levenshtein-perl,
 	libtext-template-perl,
@@ -606,6 +661,7 @@ Depends:   binutils,
 	locales,
 	man-db,
 	perl,
+	perl (>= 5.14~) | libautodie-perl (>= 2.10~),
 	t1utils,
 	unzip,
 	xz-utils
@@ -613,7 +669,6 @@ Depends:   binutils,
 	docbook-utils,
 	docbook-xml
 	,
-	hardening-includes (>= 2.0)
 Description: metapackages for lintian.debian.org dependencies
  This package depends on everything that is needed for lintian.debian.org.
 
@@ -748,28 +803,45 @@ Depends: gettext,
 Description: metapackages for l10n.debian.org dependencies
  This package depends on everything that is needed for l10n.debian.org.
 
-Package: debian.org-piuparts.debian.org
+Package: debian.org-piuparts-master.debian.org
 Architecture: all
-Depends: asciidoc,
+Depends: debhelper,
+	asciidoc,
 	git,
 	xmlto,
-	debootstrap,
-	debsums,
-	lsb-release,
-	lsof,
-	python-debian,
 	python-debianbts,
 	apache2,
 	ghostscript,
-	python-rpy,
+	python-rpy2,
 	r-base-dev,
 	r-recommended,
 	tango-icon-theme,
 	screen,
-	python-apt
-Description: metapackage for piuparts.debian.org
+	python-apt,
+	xz-utils,
+	python-yaml,
+	devscripts, libsoap-lite-perl
+Description: metapackage for piuparts-master.debian.org
+ This package depends on all the packages that are needed for the
+ master in the piuparts.debian.org setup.
+
+Package: debian.org-piuparts-slave.debian.org
+Architecture: all
+Depends: debhelper,
+	asciidoc,
+	git,
+	xmlto,
+	debootstrap,
+	debsums,
+	lsb-release,
+	lsof,
+	screen,
+	python-debian,
+	python-apt,
+	adequate
+Description: metapackage for piuparts-slave.debian.org
  This package depends on all the packages that are needed for the
- piuparts.debian.org setup.
+ slaves in the piuparts.debian.org setup.
 
 Package: debian.org-wiki.debian.org
 Architecture: all
@@ -780,3 +852,138 @@ Depends: libapache2-mod-wsgi,
 	libsoap-lite-perl
 Description: metapackage for wiki.debian.org
  This package depends on all the packages that are needed for the Debian wiki
+
+Package: debian.org-vote.debian.org
+Architecture: all
+Depends: libparse-recdescent-perl,
+	libmime-tools-perl,
+	libnet-ldap-perl,
+	libgnupg-interface-perl,
+	libmail-gnupg-perl,
+	graphviz
+Description: metapackage for vote.debian.org
+ This package depends on all the packages that are needed for DeVoteE
+
+Package: debian.org-bits.debian.org
+Architecture: all
+Depends: python-unidecode,
+	python-jinja2,
+	python-pygments,
+	python-docutils,
+	python-markdown,
+	python-tz,
+	python-typogrify,
+	python-six
+# Also needed, to add when they are available in Debian and can be backported:
+# feedgenerator (#702229), blinker (#702231), pelican (#702222)
+Description: metapackage for bits.debian.org
+ This package depends on all the packages that are needed for the Debian
+ blog bits.debian.org
+
+Package: debian.org-d-i.debian.org
+Architecture: all
+Depends: gnuplot,
+	libemail-mime-perl,
+	libemail-sender-perl,
+	libfile-slurp-perl,
+	liblist-moreutils-perl,
+	libsort-versions-perl,
+	mr,
+	gettext,
+	graphviz,
+	edos-distcheck,
+	devscripts,
+	liburi-perl,
+	edos-distcheck,
+	aspell,
+	libunicode-string-perl,
+# Taken from d-i's manual (src:installation-guide)'s build-deps:
+	docbook,
+	docbook-xml,
+	docbook-xsl,
+	xsltproc,
+	gawk,
+	libhtml-parser-perl,
+	w3m,
+	poxml,
+	jadetex,
+	openjade | openjade1.3,
+	docbook-dsssl,
+	ghostscript,
+	texlive-lang-cyrillic,
+	texlive-lang-czechslovak,
+	texlive-lang-french,
+	texlive-lang-german,
+	texlive-lang-greek,
+	texlive-lang-italian,
+	texlive-lang-other,
+	texlive-lang-portuguese,
+	texlive-lang-spanish,
+	ko.tex-base,
+	cm-super,
+	po-debconf
+Description: metapackage for d-i.debian.org
+ This package depends on all the packages that are needed for the
+ d-i.debian.org setup.
+
+Package: debian.org-codesearch.debian.org
+Architecture: all
+Depends: dpkg-dev,
+	postgresql-client
+Description: metapackage for codesearch.debian.org
+ This package depends on all the packages that are needed for the codesearch
+ setup.
+
+Package: debian.org-dedup.debian.net
+Architecture: all
+Depends: curl,
+	devscripts,
+	python,
+	python-concurrent.futures,
+	python-debian,
+	python-imaging,
+	python-jinja2,
+	python-lzma,
+	python-pkg-resources,
+	python-werkzeug,
+	python-yaml,
+	sqlite3
+Description: metapackage for dedup.debian.net
+ This package depends on all packages that are required for operating the
+ Debian duplication detector. The recommended packages are useful for debuging.
+
+Package: debian.org-wnpp-by-tags.debian.net
+Architecture: all
+Depends: debtags, python-debian, python-beautifulsoup
+Description: metapackage for wnpp-by-tags.debian.net
+ This package depends on all the packages that are needed for the wnpp-by-tags
+ setup.
+
+Package: debian.org-blends.debian.org
+Architecture: all
+Depends: python-genshi,
+ python-markdown,
+ python-docutils,
+ python-debian,
+ python-psutil,
+ python-psycopg2,
+ python-apt,
+ postgresql-client
+Description: metapackage for blends.debian.org
+ This package depends on all the packages that are needed for the
+ blends.debian.org setup.
+
+Package: debian.org-pet.debian.net
+Architecture: all
+Depends: python-argparse,
+         python-debian,
+         python-debianbts,
+         python-inotifyx,
+         python-paste,
+         python-psycopg2,
+         python-pyramid,
+         python-sqlalchemy,
+         python-subversion
+Description: metapackages for pet.debian.net dependencies
+ This package depends on everything that is needed for the PET setup.
+