X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=70c5c1c169379ac2bb4cddd0567fd2b7c0062174;hb=5c029b676550056b6f68333330acc4a8632394e5;hp=2deb3a1eab464c68012bab4db9e3d9074c6f292c;hpb=cbe9469bd6e0188048dc96a24da1b2d89a755676;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 2deb3a1..70c5c1c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, nano, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -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,13 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw | not+gnu-linux,
-	dmidecode | not+amd64,
-	dmidecode | not+i386,
-	dmidecode | not+ia64
+	dmidecode [amd64 i386 ia64]
 	,
 	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 +118,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,
@@ -504,9 +504,10 @@ Depends: db4.8-util,
 	php5, php5-cgi, php5-cli,
 		php5-ldap, php5-pgsql,
 		libapache2-mod-fcgid,
-	python-apt, python-psycopg2,
+	python-apt, python-psycopg2, python-gpgme,
 	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.
 
@@ -780,3 +781,30 @@ 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