Move packages from base-minimal to base-normal.

These are mostly kernel-related packages that we would like to keep out
of virtual servers.

diff --git a/sources/debian-base-minimal b/sources/debian-base-minimal
index 4da795b0b1a818dca989339e25ed82807491f119..6c30a8fc5004c0b9552cea6258a0a0a8e2f8bcee 100644 (file)
--- a/sources/debian-base-minimal
+++ b/sources/debian-base-minimal
@@ -1,9 +1,9 @@
 Package: debian-base-minimal
 Package: debian-base-minimal

-Version: 2
-Depends: adduser, aptitude, dhcp3-client, info, iptables, iproute,
+Version: 4
+Depends: aptitude, info, 

  iputils-ping, locales, logrotate, man-db, manpages, netbase,
  netcat-traditional, passwd, procps, system-log-daemon,
  iputils-ping, locales, logrotate, man-db, manpages, netbase,
  netcat-traditional, passwd, procps, system-log-daemon,

- linux-kernel-log-daemon, traceroute, whiptail, wget, apt-utils
+ 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).
 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).


@@ -12,4 +12,5 @@ Description: Dummy package depending on useful packages from the base system
  less than what debian-installer gives you).
   
  Packages removed are: vim-tiny, dmidecode, ed, cpio, libconsole,
  less than what debian-installer gives you).
   
  Packages removed are: vim-tiny, dmidecode, ed, cpio, libconsole,

- module-init-tools, nano, tasksel, tcpd, update-inetd
+ module-init-tools, nano, tasksel, tcpd, update-inetd, dhcp3-client, iproute,
+ iptables, adduser, linux-kernel-log-daemon.

diff --git a/sources/debian-base-normal b/sources/debian-base-normal
index 9d07cc9cf56e68e08d9562a459c3094b0c2bb5a1..f5f3da3f8e55d7af4e08f445134135e71b2330ce 100644 (file)
--- a/sources/debian-base-normal
+++ b/sources/debian-base-normal
@@ -1,7 +1,8 @@
 Package: debian-base-normal
 Package: debian-base-normal

-Version: 2
+Version: 4

 Depends: debian-base-minimal, bzip2, console-common, console-data,
 Depends: debian-base-minimal, bzip2, console-common, console-data,

- console-tools, klogd, system-log-daemon, usbutils, grub
+ console-tools, usbutils, grub, dhcp3-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).
 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).