Drop memtest86+ from Depends.

diff --git a/debian/changelog b/debian/changelog
index a2d1f30..2f845a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ grml-live (0.9.33) UNRELEASED; urgency=low
   * Support configuration variable EXIT_ON_MISSING_PACKAGES to exit
     with returncode != 0 if a requested package isn't available on the
     resulting ISO.
+  * Drop memtest86+ from Depends as it's shipped by grml-live-addons
+    nowadays (see issue717). Instead be more verbose in the warning
+    message if neither the one from grml-live-addons nor memtest86+
+    can be found.
   * Software related changes:
     - Add iscsitarget-module-2.6.31-grml64 to GRML_FULL.
     - Add nbd-server + nbd-client to GRML_FULL (thanks to Xuân Baldauf).
@@ -42,7 +46,7 @@ grml-live (0.9.33) UNRELEASED; urgency=low
   [ Thorsten Glaser ]
   * Update MirOS bsd4grml to 20091115.
 
- -- Michael Prokop <mika@grml.org>  Sun, 13 Dec 2009 14:25:05 +0100
+ -- Michael Prokop <mika@grml.org>  Sun, 13 Dec 2009 23:15:30 +0100
 
 grml-live (0.9.32) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 853d769..f8e2d59 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-live.git
 
 Package: grml-live
 Architecture: all
-Depends: ${misc:Depends}, bc, fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, mksh, moreutils, squashfs-lzma-tools | squashfs-tools, wget
+Depends: ${misc:Depends}, bc, fai-client (>= 3.2.4), fai-server (>= 3.2.4), mkisofs | genisoimage, mksh, moreutils, squashfs-lzma-tools | squashfs-tools, wget
 Recommends: grml-live-addons
 Suggests: fai-doc
 Description: build system for creating a Grml (based) Linux live system

diff --git a/grml-live b/grml-live
index aaaf48f..9408249 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -614,8 +614,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             log "Installing /boot/memtest86+.bin"
             cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
          else
-            ewarn "No memtest binary found, skipping."
-            log "No memtest binary found, skipping."
+            ewarn "No memtest binary found (either install package grml-live-addons or memtest86+), skipping."
+            log "No memtest binary found (either install package grml-live-addons or memtest86+), skipping."
             eend 0
          fi
       fi