X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=fdedf209d486f0af88f0f8af7fd19e92b84ad8ed;hp=701ff2a7a2e6037d3a583b54cf806f205725e27d;hb=a01be3704e555d9e6b87b33441ae4391b6af0dcc;hpb=2e5b577bd56b68c8087cc61f10aaeaba7ff820ae

diff --git a/debian/control b/debian/control
index 701ff2a..fdedf20 100644
--- a/debian/control
+++ b/debian/control
@@ -16,28 +16,32 @@ Description: DSA's host metapackage
  debian.org host, and conflicts with packages that should never be
  installed.
 
+Package: debian.org-recommended-linux
+Architecture: all
+Depends: vlan, ifenslave, bridge-utils, iproute,
+	strace
+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
 Depends: debian.org,
+	debian.org-recommended-linux | not+gnu-linux,
 	molly-guard
 	,
-	acpid (>= 2.0) | not+amd64,
-	acpid (>= 2.0) | not+i386,
-	acpid (>= 2.0) | not+ia64,
-	,
 	man-db
 	,
-	vlan, ifenslave, bridge-utils
-	,
 	subversion, rcs, git-core, bzr,
 		git-svn,
 		subversion-tools,
 		mercurial,
 	,
-	mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
+	mtr-tiny, tcpdump, tcptraceroute, ndisc6,
+	traceroute | not+gnu-linux,
 	bind9-host, dnsutils, whois
 	,
-	emacs22-nox | emacs22 | emacs21-nox | emacs21
+	emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
 	at, uptimed,
 	puppet,
@@ -49,15 +53,16 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw,
+	lshw | not+gnu-linux,
 	dmidecode | not+amd64,
 	dmidecode | not+i386,
 	dmidecode | not+ia64
 	,
-	mcelog | not+amd64,
-	mcelog | not+i386
+	mcelog | not+amd64 | not+gnu-linux,
+	mcelog | not+i386 | not+gnu-linux
 	,
-	htop, lsof, psmisc
+	htop, psmisc,
+	lsof | not+gnu-linux,
 	,
 	mc,
 		genisoimage,
@@ -78,9 +83,7 @@ Depends: debian.org,
 	,
 	bsd-mailx
 	,
-	timeout
-	,
-	strace
+	timeout | coreutils (>= 8.0-1)
 	,
 	wget, curl, lftp, ftp,
 	,
@@ -165,44 +168,38 @@ Description: metapackages for packages.debian.org dependencies
 Package: debian.org-www-master.debian.org
 Architecture: all
 Depends: debiandoc-sgml,
-	dpkg-dev,
+	asciidoc,
+	cm-super,
+	debhelper,
+	docbook,
+	docbook-dsssl,
 	docbook-xsl,
+	dpkg-dev,
 	gettext,
 	ghostscript,
+	jadetex,
 	kcc,
-	xmlroff, dblatex,
-	locales, locales-all,
-	latex-cjk-chinese,
+	ko.tex-base,
 	latex-cjk-all,
+	latex-cjk-chinese,
+	ldap-utils,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
+	libxml2-utils,
 	libxml-rss-perl,
 	littex,
+	locales, locales-all,
+	maildrop,
+	openjade,
+	openjade1.3,
 	po4a,
 	poxml,
-	python-xml,
+	procmail,
 	python2.4,
+	python-xml,
 	texlive-fonts-recommended,
 	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese,
-	texlive-latex-base,
-	texlive-latex-extra,
-	texlive-latex-recommended,
-	time,
-	wml,
-	xplanet,
-	xplanet-images,
-	xsltproc,
-	procmail,
-	ldap-utils,
-	asciidoc,
-	libxml2-utils,
-	debhelper,
-	docbook,
-	jadetex,
-	openjade,
-	openjade1.3,
-	docbook-dsssl,
 	texlive-lang-czechslovak,
 	texlive-lang-finnish,
 	texlive-lang-french,
@@ -214,9 +211,16 @@ Depends: debiandoc-sgml,
 	texlive-lang-spanish,
 	texlive-lang-swedish,
 	texlive-lang-vietnamese,
-	ko.tex-base,
-	cm-super,
-	ttf-arphic-uming
+	texlive-latex-base,
+	texlive-latex-extra,
+	texlive-latex-recommended,
+	time,
+	ttf-arphic-uming,
+	wml,
+	xmlroff, dblatex,
+	xplanet,
+	xplanet-images,
+	xsltproc
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -251,7 +255,7 @@ Depends: edos-distcheck,
 	r-cran-lattice,
 	postgresql-8.4, postgresql-8.4-debversion,
 	php5,
-	moreutils (>= 0.39)
+	moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -296,7 +300,7 @@ Architecture: all
 Depends: apt-utils,
 	libapt-pkg-dev,
 	python-apt,
-	python-btsutils,
+	python-debianbts (>= 1.4~bpo50+1),
 	lintian,
 	python,
 	python-debian,
@@ -328,7 +332,8 @@ Depends: apt-utils,
 	libxml-rss-perl,
 	ghostscript,
 	perforate,
-	wdiff
+	wdiff,
+	xz-utils (>= 4.999.9beta+20100713-1~bpo50+1)
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
@@ -398,3 +403,27 @@ Depends: debian.org-ftpmaster.debian.org,
 	libdbi-perl, libdbd-pg-perl
 Description: metapackage for backports.debian.org
  This package depends on all the packages that are needed for backports.debian.org setup.
+
+Package: debian.org-qa.debian.org
+Architecture: all
+Depends: db4.8-util,
+	gnuplot-nox,
+	wml,
+	libapt-pkg-perl,
+		libdbd-pg-perl,
+		libdate-manip-perl,
+		libdpkg-perl,
+		libmailtools-perl,
+		libsoap-lite-perl,
+		libtemplate-perl,
+		libxml-simple-perl,
+		libmail-sendmail-perl,
+		libdate-calc-perl,
+		libnet-ldap-perl,
+	php5, php5-cgi, php5-cli,
+		php5-ldap, php5-pgsql,
+		libapache2-mod-fcgid,
+	python-apt, python-psycopg2,
+	libdbd-pg-ruby
+Description: metapackage for qa.debian.org
+ This package depends on all the packages that are needed for qa.debian.org setup.