Drop nufw, add iotiop, gnuit and keynav to GRML_FULL

diff --git a/debian/changelog b/debian/changelog
index 9a5be60..a501d35 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,14 @@ grml-live (0.7) unstable; urgency=low
     from http://home.arcor.de/mschierlm/bootdisk/
     Thanks, Michael Schierl.
   * Add packages to GRML_FULL:
+    - gnuit
     - i2c-tools [thanks to Mario Holbe]
+    - iotop
+    - keynav
   * Remove packages from GRML_FULL:
-    - sound-recorder (#288211)
     - emelfm (#364442)
+    - nufw (#468245)
+    - sound-recorder (#288211)
   * Readd libewf to GRML_FULL.
   * buildd: use RELEASE-class in all build scripts
   * Mention noquick bootoption in bootsplash and cheatcode file.

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index d1761b6..9b75a48 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -769,6 +769,7 @@ glark
 gmailfs
 gmrun
 gnuhtml2latex
+gnuit
 gnupg
 gnupg-agent
 gnupg-pkcs11-scd
@@ -891,6 +892,7 @@ inotify-tools
 input-utils
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -956,6 +958,7 @@ kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
 klibc-utils
@@ -1225,7 +1228,6 @@ ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
 num-utils
 nutcpc