debian-*: Update packages.

These are a bunch of changes I forgot to commit before, probably mostly
updates to the squeeze base system packages, as well as some other
additions and tweaks.

diff --git a/sources/equivs/debian-base-minimal b/sources/equivs/debian-base-minimal
index 6c30a8fc5004c0b9552cea6258a0a0a8e2f8bcee..7ccf5a2e9f62d9acf816460bbffd682bf1b24e37 100644 (file)
--- a/sources/equivs/debian-base-minimal
+++ b/sources/equivs/debian-base-minimal
@@ -1,16 +1,12 @@
 Package: debian-base-minimal
-Version: 4
-Depends: aptitude, info, 
- iputils-ping, locales, logrotate, man-db, manpages, netbase,
- netcat-traditional, passwd, procps, system-log-daemon,
- traceroute, whiptail, wget, apt-utils
-Description: Dummy package depending on useful packages from the base system
- Depends on all useful packages from the base system (some are excluded by
- hand).
+Version: 6
+Depends: aptitude, info, iputils-ping, locales, logrotate, man-db,
+ manpages, netbase, netcat-traditional, passwd, procps,
+ system-log-daemon, traceroute, whiptail, wget, apt-utils,
+ popularity-contest, patch
+Description: Dummy package depending on a minimal set of useful packages from the base system
+ This is the subset of packages from the base system that should be
+ present on every install, including chroot / vserver installs.
 
- This package depends on the base system installed by debootstrap (which is
- less than what debian-installer gives you).
-  
- Packages removed are: vim-tiny, dmidecode, ed, cpio, libconsole,
- module-init-tools, nano, tasksel, tcpd, update-inetd, dhcp3-client, iproute,
- iptables, adduser, linux-kernel-log-daemon.
+ The term base system used here is what debian-installer gives you when
+ not installing anything else (so not even the "standard system" task).

diff --git a/sources/equivs/debian-base-normal b/sources/equivs/debian-base-normal
index 1d38e27b6f2491e22e075367a0c0c737af913f9c..a55590079fbd169feb57fe25a51642c8f88e57f4 100644 (file)
--- a/sources/equivs/debian-base-normal
+++ b/sources/equivs/debian-base-normal
@@ -1,11 +1,14 @@
 Package: debian-base-normal
-Version: 6
-Depends: debian-base-minimal, bzip2, console-common, console-data,
- console-tools, usbutils, grub, dhcp3-client, iptables, iproute, adduser,
- linux-kernel-log-daemon, at, bc, dc, dnsutils, doc-debian, nano, patch, time,
- w3m
+Version: 9
+Depends: debian-base-minimal, acpi, acpid, console-setup,
+ usbutils, grub-pc, isc-dhcp-client, iptables, iproute, adduser,
+ linux-kernel-log-daemon
 Description: Dummy package depending on useful packages from the base system
- Depends on all useful packages from the base system (some are excluded by
- hand).
+ This is the subset of packages from the base system that should be
+ installed on every physical system.
   
- This package depends on the base system installed by debian-installer.
+ The term base system used here is what debian-installer gives you when
+ not installing anything else (so not even the "standard system" task).
+
+ Packages removed are: dmidecode, discover, installation-report,
+ laptop-detect, tasksel, util-linux-locales

diff --git a/sources/equivs/debian-useful-minimal b/sources/equivs/debian-useful-minimal
index 9978c34afbefd421a73540d195b133cfa3daf3bd..b8985ee27b9f52c5f6155ddced5f34bcf05fb9db 100644 (file)
--- a/sources/equivs/debian-useful-minimal
+++ b/sources/equivs/debian-useful-minimal
@@ -1,7 +1,8 @@
 Package: debian-useful-minimal
-Version: 5
-Depends: debian-base-minimal, host, less, ssh, sudo, vim, wget, reportbug,
-         lsof, screen, whois, bash-completion, bzip2
+Version: 7
+Depends: debian-base-minimal, host, less, openssh-client,
+ openssh-server, sudo, vim, wget, reportbug, lsof, screen, whois,
+ bash-completion, bzip2, at, bc, time, dnsutils, python
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Description: Package depending on some useful packages
  These packages were selected by Matthijs and should be installed on any

diff --git a/sources/equivs/debian-useful-normal b/sources/equivs/debian-useful-normal
index f43afaae1265ce4dbf5715d923ce7b7cf269205c..2c70038b30baedf6932f316861d76f86f56ac411 100644 (file)
--- a/sources/equivs/debian-useful-normal
+++ b/sources/equivs/debian-useful-normal
@@ -1,7 +1,7 @@
 Package: debian-useful-normal
-Version: 7
+Version: 8
 Depends: debian-base-normal, debian-useful-minimal (>= 2), acpid, ifplugd,
-         lvm2, pciutils, tcpdump, nmap, openntpd
+         lvm2, pciutils, tcpdump, nmap, ntp, w3m
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Description: Package depending on some useful packages
  These packages were selected by Matthijs and should be installed on any