X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=23d9a1d3d06afe4539d0a1f7194b34d847daed11;hb=8c20b4c3a151bf7500cdaca7328b078ddaa1be9f;hp=3aac2990cd9e94e31d0e1acedb1df2c1ef9d29c8;hpb=5aadef1beb17043fe135f1ae91c750cfa8f8cec9;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index 3aac299..23d9a1d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>, Stephen Gran <sgran@debian.org>
 Build-Depends: debhelper (>= 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
+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)
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -21,6 +21,10 @@ Architecture: all
 Depends: debian.org,
 	molly-guard
 	,
+	acpid (>= 2.0) | not+amd64,
+	acpid (>= 2.0) | not+i386,
+	acpid (>= 2.0) | not+ia64,
+	,
 	man-db
 	,
 	vlan, ifenslave, bridge-utils
@@ -89,7 +93,8 @@ Depends: debian.org,
 	unzip
 	,
 	w3m,
-	elinks
+	elinks,
+	mutt
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.
@@ -237,13 +242,16 @@ Depends: edos-distcheck,
 	python-coverage-test-runner,
 	python-debian,
 	python-psycopg2,
+	python-mako,
 	python-nose,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
+	python-sqlalchemy (>= 0.5), 
+	python-sqlalchemy (<< 0.6),
 	quinn-diff,
 	r-base-core,
 	r-cran-lattice,
 	postgresql-8.4, postgresql-8.4-debversion,
-	php5
+	php5,
+	moreutils (>= 0.39)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -298,7 +306,7 @@ Depends: apt-utils,
 	python-pygresql,
 	python-pyrss2gen,
 	python-yaml,
-	python-sqlalchemy,
+	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -315,10 +323,32 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb
+	irb,
+	lynx,
+	libxml-rss-perl,
+	ghostscript,
+	perforate,
+	wdiff
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-release.debian.org
+Architecture: all
+Depends: mutt,
+	subversion,
+	python2.5,
+	devscripts,
+	wdiff,
+	python-pygresql,
+	python-libxslt1,
+	python-apt,
+	python-debian,
+	libapt-pkg-perl,
+	procmail
+Description: metapackage for release
+ This package depends on everything that is needed for a release.debian.org
+ setup.
+
 Package: debian.org-cdbuilder.debian.org
 Architecture: all
 Depends: bittornado,
@@ -340,3 +370,24 @@ Depends: locales-all,
 	gs-common
 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,
+	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, python-simplejson,
+	perl,
+	libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl, 
+	procmail,
+	moreutils
+Description: metapackage for nm.debian.org 
+ This package depends on all the packages that are needed for nm.debian.org setup.