X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=3f655f0a940513e30d4bfbf9e6bf33c260d4da94;hp=b98c2d770c5596ef0ca864e84e883ea681404a7f;hb=bcf32b8ba794205914b7ae567a64ccbc1edb269a;hpb=8d9842fd18137b5912beb9b4d72a7b65ec410921 diff --git a/debian/control b/debian/control index b98c2d7..3f655f0 100644 --- a/debian/control +++ b/debian/control @@ -16,28 +16,34 @@ 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, + busybox-static, + 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, + cvs , - 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 +55,19 @@ 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 + ipython + , + mcelog | not+amd64 | not+gnu-linux, + mcelog | not+i386 | not+gnu-linux, + lsscsi , - htop, lsof, psmisc + htop, psmisc, + lsof | not+gnu-linux, , mc, genisoimage, @@ -68,6 +78,7 @@ Depends: debian.org, mmv, moreutils, patchutils, + diffstat, netcat-openbsd, socat, telnet , deborphan @@ -78,9 +89,7 @@ Depends: debian.org, , bsd-mailx , - timeout - , - strace + timeout | coreutils (>= 8.0-1) , wget, curl, lftp, ftp, , @@ -165,44 +174,39 @@ 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, + libintl-perl, 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 +218,19 @@ 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, + tidy, + time, + ttf-arphic-uming, + ttf-malayalam-fonts, + wml, + xmlroff, dblatex, + xplanet, + xplanet-images, + xsltproc, + libjson-perl Description: metapackages for www-master.debian.org dependencies This package depends on everything that is needed for a www-master.debian.org. @@ -244,14 +258,14 @@ Depends: edos-distcheck, python-psycopg2, python-mako, python-nose, - python-sqlalchemy (>= 0.5), + python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6), quinn-diff, r-base-core, 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 +310,7 @@ Architecture: all Depends: apt-utils, libapt-pkg-dev, python-apt, - python-btsutils, + python-debianbts (>= 1.4~bpo50+1), lintian, python, python-debian, @@ -305,6 +319,7 @@ Depends: apt-utils, python-psycopg2, python-pygresql, python-pyrss2gen, + python-simplejson || python (>= 2.6), python-yaml, python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6), binutils-multiarch, @@ -328,7 +343,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. @@ -360,7 +376,8 @@ Depends: bittornado, tofrodos, zip, zsync, - fakeroot + fakeroot, + dosfstools Description: metapackage for cdbuilder This package depends on all the packages that are needed for a cdbuilder setup. @@ -384,13 +401,14 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi, 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, + python-sqlalchemy (>= 0.6), python (>= 2.5.4-5~) | python-simplejson, + python-flask (>= 0.6), python-flaskext.wtf, python-wtforms, perl, - libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-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. +Description: metapackage for nm.debian.org + This package depends on all the packages that are needed for nm.debian.org setup. Package: debian.org-backports.debian.org Architecture: all @@ -398,3 +416,28 @@ 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, + rrdtool +Description: metapackage for qa.debian.org + This package depends on all the packages that are needed for qa.debian.org setup.