X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=3e74f4a8b1a015b43fc16a4ef4e8bc8b8c895f13;hb=db8037ba401055705ef9df4f840185eb80d616e4;hp=a3101c17e7fdc96e64aeac4c293850ec1a4af87a;hpb=1b69b1fd74020dff178377a2923f547fda5c47ab;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index a3101c1..3e74f4a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Description: DSA's host metapackage
 Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
-	strace
+	strace,
+	lsscsi
 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.
@@ -64,7 +65,6 @@ Depends: debian.org,
 	,
 	mcelog | not+amd64 | not+gnu-linux,
 	mcelog | not+i386 | not+gnu-linux,
-	lsscsi
 	,
 	htop, psmisc,
 	lsof | not+gnu-linux,
@@ -189,6 +189,7 @@ Depends: debiandoc-sgml,
 	latex-cjk-all,
 	latex-cjk-chinese,
 	ldap-utils,
+	libintl-perl,
 	libnet-ldap-perl,
 	libtimedate-perl,
 	libwww-perl,
@@ -261,7 +262,6 @@ Depends: edos-distcheck,
 	quinn-diff,
 	r-base-core,
 	r-cran-lattice,
-	postgresql-8.4, postgresql-8.4-debversion,
 	php5,
 	moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
@@ -307,6 +307,7 @@ Package: debian.org-ftpmaster.debian.org
 Architecture: all
 Depends: apt-utils,
 	libapt-pkg-dev,
+	libemail-send-perl,
 	python-apt,
 	python-debianbts (>= 1.4~bpo50+1),
 	lintian,
@@ -317,9 +318,10 @@ Depends: apt-utils,
 	python-psycopg2,
 	python-pygresql,
 	python-pyrss2gen,
-	python-simplejson || python (>= 2.6),
+	python-simplejson | python (>= 2.6),
 	python-yaml,
-	python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+	python-rrdtool,
+	python-sqlalchemy,
 	binutils-multiarch,
 	build-essential,
 	devscripts,
@@ -336,7 +338,6 @@ Depends: apt-utils,
 	procmail,
 	cvs,
 	ruby,
-	irb,
 	lynx,
 	libxml-rss-perl,
 	ghostscript,
@@ -346,11 +347,26 @@ Depends: apt-utils,
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-ftpmaster.debian.org-poneys
+Architecture: all
+Depends: bicyclerepair,
+	dpkg-dev-el,
+	easypg,
+	emacs-goodies-el,
+	pychecker,
+	pylint,
+	python-mode,
+	ruby-elisp
+Description: metapackage for ftpmaster extras
+ Things not really needed needed.
+
 Package: debian.org-release.debian.org
 Architecture: all
-Depends: mutt,
+Depends: edos-distcheck,
+	mutt,
 	subversion,
 	python2.5,
+	python2.5-dev,
 	devscripts,
 	wdiff,
 	python-pygresql,
@@ -358,6 +374,8 @@ Depends: mutt,
 	python-apt,
 	python-debian,
 	libapt-pkg-perl,
+	libapt-pkg-dev,
+	dpkg-dev,
 	procmail
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org