Merge branches

diff --git a/debian/changelog b/debian/changelog
index 04f235f..398d51b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 grml-live (0.2) unstable; urgency=low
 
   * Update isolinux.bin to version 3.55-1.
-  * Add loop-aes-testsuite to GRML_FULL.
+  * Add new packages to GRML_FULL:
+    - auctex
+    - loop-aes-testsuite
+  * Add new packages to GRML_MEDIUM:
+    - atl2-modules-2.6.23-grml
+    - madwifi-modules-2.6.23-grml[64]
+    - madwifi-tools
   * Set 'confirm=1' in /etc/apt/listchanges.conf.
   * Add /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
     for providing default /etc/default/loadcpufreq configuration.

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 153fc64..6eaa469 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -249,6 +249,7 @@ atop
 atsar
 attr
 aub
+auctex
 aufs-tools
 aumix
 auto-apt

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index f4e4a0e..cce03ed 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -282,17 +282,21 @@ zip
 zsh
 
 PACKAGES aptitude I386 
+atl2-modules-2.6.23-grml
 aufs-modules-2.6.23-grml
 grml-kerneladdons-2.6.23
 linux-image-2.6.23-grml
 lzma-modules-2.6.23-grml
+madwifi-modules-2.6.23-grml madwifi-tools
 powernowd
 squashfs-modules-2.6.23-grml
 truecrypt-2.6.23-grml
 
 PACKAGES aptitude AMD64
+atl2-modules-2.6.23-grml64
 aufs-modules-2.6.23-grml64
 linux-image-2.6.23-grml64
 lzma-modules-2.6.23-grml64
+madwifi-modules-2.6.23-grml64 madwifi-tools
 squashfs-modules-2.6.23-grml64
 truecrypt-2.6.23-grml64