Add dzen2 to GRML_FULL, move detox from grml to Debian section

diff --git a/debian/changelog b/debian/changelog
index b4db83c..bf0020e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ grml-live (0.0.8) unstable; urgency=low
   * Add new packages to GRML_FULL:
     - acx100-2.6.23-grml
     - bcm5700-module-2.6.23-grml
+    - dzen2
     - drbd8-module-2.6.23-grml
     - exmap-modules-2.6.23-grml
     - fglrx-kernel-2.6.23-grml

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 5f5f698..3eb20d7 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -61,7 +61,6 @@ ctris
 dd-rhelp
 ded
 deletemail
-detox
 dired
 dupmerge
 dupseek
@@ -521,6 +520,7 @@ debsums
 defoma
 defrag
 detachtty
+detox
 devio
 devscripts
 devtodo
@@ -605,6 +605,7 @@ dviutils
 dwm
 dwm-tools
 dynafont
+dzen2
 e2fslibs
 e2fsprogs
 e2tools