Add conkeror to GRML_FULL

diff --git a/debian/changelog b/debian/changelog
index 600e37c..3d1558a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ grml-live (0.9.19) UNRELEASED; urgency=low
 
   * Software related changes in GRML_FULL:
     - add btrfs-tools
+    - add conkeror (thanks to Axel Beckert) [Closes: issue698]
     - add gptsync
     - add nfswatch
     - add pigz
@@ -18,7 +19,7 @@ grml-live (0.9.19) UNRELEASED; urgency=low
    - Add class LATEX which provides all the LaTeX (related) packages
      that have been removed from GRML_FULL.
 
- -- Michael Prokop <mika@grml.org>  Mon, 06 Jul 2009 23:29:06 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 06 Jul 2009 23:31:07 +0200
 
 grml-live (0.9.18) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 5149383..d750e34 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -386,6 +386,7 @@ colorgcc
 compartment
 concalc
 configure-debian
+conkeror
 conky
 connect-proxy
 conntrack