From: Michael Prokop <devnull@localhost>
Date: Sat, 27 Sep 2008 15:44:24 +0000 (+0200)
Subject: Update squashfs/lzma for new grml-kernel
X-Git-Tag: v0.9.4~20
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=b5c8bb5be1232d0a945c579dd013c27230f6ab73;ds=sidebyside

Update squashfs/lzma for new grml-kernel
---

diff --git a/debian/changelog b/debian/changelog
index eaa2839..0d80043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ grml-live (0.9.4) unstable; urgency=low
 
   * Update docs, depend on squashfs-lzma-tools (but allow usage
     of squashfs-tools as well).
+  * Use squashfs-lzma-tools instead of squashfs-tools.
+  * Drop lzma-modules-2.6.26-grml[64] and
+    squashfs-modules-2.6.26-grml[64] as we have it in-tree of
+    kernel 2.6.26-grml[64].
 
- -- Michael Prokop <mika@grml.org>  Sat, 27 Sep 2008 16:43:36 +0200
+ -- Michael Prokop <mika@grml.org>  Sat, 27 Sep 2008 17:41:13 +0200
 
 grml-live (0.9.3) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index c94003a..ea852fb 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -62,6 +62,7 @@ grml-desktop
 grml-docs
 grml-etc
 grml-etc-core
+grml-files
 grml-firefox
 grml-hwinfo
 grml-laptop
@@ -1612,7 +1613,7 @@ splint
 splitvt
 sqlite
 sqlite3
-squashfs-tools
+squashfs-lzma-tools
 squid
 squid-common
 squidview
@@ -2076,7 +2077,6 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-grml-files
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
@@ -2111,7 +2111,6 @@ rt2500-modules-2.6.26-grml
 rt73-modules-2.6.26-grml
 sl-modem-modules-2.6.26-grml
 speakup-modules-2.6.26-grml
-squashfs-modules-2.6.26-grml
 sysprof-module-2.6.26-grml
 tp-smapi-modules-2.6.26-grml
 truecrypt-2.6.26-grml
@@ -2125,7 +2124,6 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-grml-files64
 
 ## current kernel version 2.6.26-grml64:
 acx100-2.6.26-grml64
@@ -2149,7 +2147,6 @@ openafs-modules-2.6.26-grml64
 qc-usb-modules-2.6.26-grml64
 rt2400-modules-2.6.26-grml64
 rt2500-modules-2.6.26-grml64
-squashfs-modules-2.6.26-grml64
 sysprof-module-2.6.26-grml64
 truecrypt-2.6.26-grml64
 ## }}}
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 5f2f882..1fd453f 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -282,7 +282,7 @@ xterm
 zip
 zsh
 
-PACKAGES aptitude I386 
+PACKAGES aptitude I386
 
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
@@ -292,11 +292,9 @@ atl2-modules-2.6.26-grml
 aufs-modules-2.6.26-grml
 #grml-kerneladdons-2.6.26
 linux-image-2.6.26-grml
-lzma-modules-2.6.26-grml
 madwifi-modules-2.6.26-grml madwifi-tools
 powernowd
 rt2400-modules-2.6.26-grml rt2500-modules-2.6.26-grml rt73-module-2.6.26-grml firmware-ralink
-squashfs-modules-2.6.26-grml
 #truecrypt-2.6.26-grml
 virtualbox-ose-guest-utils
 
@@ -304,7 +302,5 @@ PACKAGES aptitude AMD64
 atl2-modules-2.6.26-grml64
 aufs-modules-2.6.26-grml64
 linux-image-2.6.26-grml64
-lzma-modules-2.6.26-grml64
 madwifi-modules-2.6.26-grml64 madwifi-tools
-squashfs-modules-2.6.26-grml64
-truecrypt-2.6.26-grml64
+#truecrypt-2.6.26-grml64
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index dc31313..d33bde2 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -191,4 +191,4 @@ PACKAGES aptitude I386
 linux-image-2.6.20-grml-small aufs-modules-2.6.20-grml-small
 
 PACKAGES aptitude AMD64
-linux-image-2.6.26-grml64 aufs-modules-2.6.26-grml64 squashfs-modules-2.6.26-grml64 lzma-modules-2.6.26-grml64
+linux-image-2.6.26-grml64 aufs-modules-2.6.26-grml64