Replace diff with diffutils and move it to GRMLBASE; drop dhcp3-common + ddccontrol-db

diff --git a/debian/changelog b/debian/changelog
index 84ff6bf..c89a3f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ grml-live (0.9.23) unstable; urgency=low
       2.6.28-grml[64] to 2.6.31-grml[64].
     - Drop ash from GRML_FULL (unrelevant for Grml).
     - Drop crack-common from GRML_FULL (it's a dependency of crack*).
+    - Drop ddccontrol-db from GRML_FULL (it's a dependency of ddccontrol).
+    - Drop dhcp3-common from GRML_FULL (it's a dependency of dhcp3*).
     - Drop libpam-krb5 from GRML_FULL (related to #545824).
     - Drop replicator from GRML_FULL (orphaned, see #474131).
     - Drop rt2400-modules-2.6.31-grml, rt2500-modules-2.6.31-grml and
@@ -12,6 +14,7 @@ grml-live (0.9.23) unstable; urgency=low
     - Drop rt2400-modules-2.6.31-grml, rt73-modules-2.6.31-grml and
       rt2400-modules-2.6.31-grml64 from GRML_FULL.
     - Drop version specific dependency on -mysql-client-5.0.
+    - Replace diff with diffutils and move it to GRMLBASE.
     - Add febootstrap to GRML_FULL.
     - Add guymager to GRML_FORENSIC.
     - Add extract and libextractor-plugins to GRML_FORENSIC (thanks to
@@ -30,7 +33,7 @@ grml-live (0.9.23) unstable; urgency=low
   * Add missing test call in $FORCE_ISO_REBUILD code.
   * scripts/GRMLBASE/15-initsetup: assume safe GRML_NAME default.
 
- -- Michael Prokop <mika@grml.org>  Tue, 06 Oct 2009 10:26:58 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 06 Oct 2009 10:45:05 +0200
 
 grml-live (0.9.22) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index e1a601b..b957059 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -5,6 +5,7 @@ bzip2
 console-common
 cron
 deborphan
+diffutils
 dmidecode
 eject
 file

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index eb71bb5..7e096e8 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -440,7 +440,6 @@ dconf
 dcraw
 dctrl-tools
 ddccontrol
-ddccontrol-db
 ddclient
 ddrescue
 dds2tar
@@ -469,7 +468,6 @@ devio
 devscripts
 devtodo
 dhcp3-client
-dhcp3-common
 dhcp3-server
 dhcpdump
 dhcping
@@ -484,7 +482,6 @@ diction
 dictionaries-common
 dietlibc
 dietlibc-dev
-diff
 diffstat
 ding
 dir2ogg

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 1f71359..61b9038 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -42,7 +42,6 @@ debootstrap
 deborphan
 dhcp3-client
 dialog
-diff
 dmraid
 dmsetup
 dns2tcp

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index cd474ac..89bd155 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -33,7 +33,6 @@ debianutils
 deborphan
 dhcp3-client
 dialog
-diff
 dmraid
 dmsetup
 dosfstools