[SCM] GUI front-end for Debian Live. branch, master, updated. 08faf0d678877236b2a81da93a8c822d69ad49d1

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9370ff8f75a86dc2a8b0e1c7d16ebb039da0451d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Apr 4 14:56:29 2008 +0100

    Prefer cebootstrap if available and add to Recommends
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index 09e95ee..c579040 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -1,4 +1,5 @@
 import gtk
+import os.path
 
 from DebianLive import Config, utils
 
@@ -16,6 +17,11 @@ class WizardController(object):
         self.model.bootstrap['LH_MIRROR_BOOTSTRAP'] = data['mirror']
         self.model.chroot['LH_PACKAGES_LISTS'] = data['desktop']
         self.model.bootstrap['LH_ARCHITECTURE'] = data['arch']
+
+        # Use cdebootstrap if available
+        if os.path.exists('/usr/bin/cdebootstrap'):
+            self.model.common['LH_BOOTSTRAP'] = 'cdebootstrap'
+
         self.model.save()
 
         self.view.do_dim_wizard()
diff --git a/debian/changelog b/debian/changelog
index 66dd07f..4022746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ live-magic (0.4) UNRELEASED; urgency=low
 
   * Don't include "-num" in version.
   * Update live-helper dependency to 1.0~a42.
+  * Prefer cebootstrap if available and add to Recommends.
   * Use LIVE_ not LH_ (Closes: #443124)
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Mon, 14 Jan 2008 18:36:43 +0000
diff --git a/debian/control b/debian/control
index e9a508a..09456b8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=users/lamby-guest/live-magic.git
 Package: live-magic
 Architecture: all
 Depends: live-helper (>= 1.0~a42), python-glade2 (>= 2.10), python-gtk2, python-vte, ${python:Depends}
-Recommends: python-gnome2-desktop
+Recommends: python-gnome2-desktop, cdebootstrap
 Description: Debian Live helper programs (GUI frontend)
  Live-helper is a collection of programs that can be used to build Debian Live
  system images. The philosophy behind live-helper is to provide a collection of

-- 
GUI front-end for Debian Live.