Update docs, depend on squashfs-lzma-tools

diff --git a/debian/changelog b/debian/changelog
index 66eb168..eaa2839 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-live (0.9.4) unstable; urgency=low
+
+  * Update docs, depend on squashfs-lzma-tools (but allow usage
+    of squashfs-tools as well).
+
+ -- Michael Prokop <mika@grml.org>  Sat, 27 Sep 2008 16:43:36 +0200
+
 grml-live (0.9.3) unstable; urgency=low
 
   * Improve the way deborphan works in

diff --git a/debian/control b/debian/control
index 8e4d0b7..d45df23 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://hg.grml.org/grml-live/
 
 Package: grml-live
 Architecture: all
-Depends: fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-tools, wget
+Depends: fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-lzma-tools | squashfs-tools, wget
 Suggests: fai-doc
 Description: build system for creating a grml (based) live-cd
  This package provides the build system for creating

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 8153444..a794030 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -413,27 +413,34 @@ Current state of grml-live with squashfs-tools and kernel
 ---------------------------------------------------------
 
 To make it easier to track problems this section documents current state of
-grml-live playing together with squashfs-tools (for building the compressed
-file) and the kernel version. Documentation of this section is up2date by 18th
-august 2008.
+grml-live playing together with squashfs-tools / squashfs-lzma-tools (for
+building the compressed file) and the kernel version. Documentation of this
+section is up2date by 27th of september 2008.
 
 System
 ~~~~~~
 
-* grml-live 0.9
+* grml-live, version 0.9.4
 
 * building grml-medium (Debian/unstable)
 
 * software versions used in the ISO (being installed automatically, recorded
 just as a reference):
 
-  ii  busybox                 1:1.10.2-1              Tiny utilities for small and embedded systems
-  ii  initramfs-tools         0.92f                   tools for generating an initramfs
-  ii  klibc-utils             1.5.12-2                small utilities built with klibc for early boot
-  ii  live-initramfs          1.136.3-2~grml.04       Debian Live initramfs hook
-  ii  lvm2                    2.02.39-2               The Linux Logical Volume Manager
-  ii  mdadm                   2.6.7-3                 tool to administer Linux MD arrays (software RAID)
-  ii  udev                    0.124-0grml3            /dev/ and hotplug management daemon
+  ii  busybox             1:1.10.2-2          Tiny utilities for small and embedded systems
+  ii  initramfs-tools     0.92f.grml01        tools for generating an initramfs
+  ii  klibc-utils         1.5.12-2            small utilities built with klibc for early boot
+  ii  live-initramfs      1.139.1-2grml.01    Debian Live initramfs hook
+  ii  lvm2                2.02.39-2           The Linux Logical Volume Manager
+  ii  mdadm               2.6.7-3.1           tool to administer Linux MD arrays (software RAID)
+  ii  udev                0.125-6grml0        /dev/ and hotplug management daemon
+
+Using squashfs-lzma-tools 3.3-1 on the build system
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+squashfs-lzma-tools from the grml repository supports kernel 2.6.26-grml
+(version >=grml.05) using both lzma and zlib (-nolzma) compression. It's the
+recommended package for building ISOs with grml-live currently.
 
 Using squashfs-tools 1:3.3-7 on the build system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -449,8 +456,9 @@ http://grml.org/squashfs/squashfs-tools_3.3-7_amd64.deb (for amd64) [both build
 on and for Debian/etch but working with testing and unstable as well].
 
 Please notice that squashfs-tools 1:3.3-7 does NOT support LZMA compression at
-all (yet). The -nolzma option of mksquashfs is not available therefore (even
-though grml-live will deactivate it for you automatically anyway).
+all. The -nolzma option of mksquashfs is not available therefore (even
+though grml-live will deactivate it for you automatically anyway). Please
+use squashfs-lzma-tools instead.
 
 * Kernel 2.6.23-grml: does NOT work, please use squashfs-tools 1:3.2r2-9exp1
                     instead if you still want to use kernel 2.6.23

diff --git a/grml-live b/grml-live
index 2dcdcf3..32afb5e 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -14,7 +14,7 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
-GRML_LIVE_VERSION='0.9.3'
+GRML_LIVE_VERSION='0.9.4'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"