Add conky to GRML_FULL

diff --git a/debian/changelog b/debian/changelog
index 156e66a..02be88b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ grml-live (0.0.15) unstable; urgency=low
   * Use /usr/bin/vim.tiny as alternativ for vi.
   * Add new packages to GRML_FULL:
     - at76-usb-modules-2.6.23-grml64
+    - conky (thanks, shehu)
     - epdfview
     - gfs2-tools
     - sslscan

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 41be11b..0728489 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -397,6 +397,7 @@ colorgcc
 compartment
 concalc
 configure-debian
+conky
 connect-proxy
 conntrack
 console-common