X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=c5c3a6ce7bfd23fac274e095a9114432848134f6;hp=2e271ad5ad8b01541c250e636ef8d433e6ed0cb1;hb=cec42575d7621e62d5b9039717b3e898786a76d3;hpb=a78dcb31ed13a0500a3e6c6f6a8e6c83c6c6280c

diff --git a/debian/control b/debian/control
index 2e271ad..c5c3a6c 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,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,
@@ -180,11 +180,9 @@ Description: metapackages for bugs.debian.org mail exchanger
 
 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,
 	libhtml-parser-perl,
 	libmldbm-perl,
 	libtext-iconv-perl,
@@ -195,7 +193,8 @@ Depends: db4.6-util,
 	libsearch-xapian-perl,
 	libtimedate-perl,
 	libapache2-mod-perl2,
-	libapache2-reload-perl
+	libapache2-reload-perl,
+	dpkg-dev
 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.
@@ -504,7 +503,7 @@ 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,
 	raptor-utils | raptor2-utils
@@ -589,6 +588,7 @@ Depends:   binutils,
 	file,
 	gettext,
 	gnuplot-nox | gnuplot,
+	hardening-includes (>= 2.2~),
 	intltool-debian,
 	libapt-pkg-perl,
 	libarchive-zip-perl,
@@ -597,8 +597,10 @@ 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,
 	libtimedate-perl,
 	libtext-levenshtein-perl,
@@ -607,6 +609,7 @@ Depends:   binutils,
 	locales,
 	man-db,
 	perl,
+	perl (>= 5.14~) | libautodie-perl (>= 2.10~),
 	t1utils,
 	unzip,
 	xz-utils
@@ -614,7 +617,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.
 
@@ -781,3 +783,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