[SCM] live-magic branch, master, updated. 1.11-14-gfcb6f4d

[Chris Lamb]

The following commit has been merged in the master branch:
commit fcb6f4d114513a1a4af51e807d8d0821c7320576
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Aug 2 02:05:08 2010 -0400

    Pass --debian-installer=false over =disabled.

diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 14087a7..36368fa 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -180,7 +180,7 @@ class WizardView(object):
             'packages_lists': get_active('radio_desktop_standard'),
             'binary_images': get_active('radio_media_iso'),
             'distribution': get_active('radio_distribution_lenny'),
-            'debian_installer': get_active('radio_installer_disabled'),
+            'debian_installer': get_active('radio_installer_false'),
             'mirror_bootstrap': self['combobox_mirror'].get_active_text(),
         }
 
diff --git a/debian/changelog b/debian/changelog
index 3bfb8ca..d066286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ live-magic (1.12) UNRELEASED; urgency=low
 
   * Update to live-helper 2.x (Closes: #578071):
     - Pass {true,false} instead of {True,False} to lh config.
+    - Pass --debian-installer=false over =disabled.
   * Make live.debian.net the canonical Git repo for live-magic.
   * Remove a bunch of unused imports.
   * Update copyright years from 2007-2008 => 2007-2010.
diff --git a/misc/live-magic.glade b/misc/live-magic.glade
index 9d75ab1..25873a8 100644
--- a/misc/live-magic.glade
+++ b/misc/live-magic.glade
@@ -1495,7 +1495,7 @@ If unsure, select "&lt;i&gt;no&lt;/i&gt;".</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radio_installer_disabled</property>
+                        <property name="group">radio_installer_false</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1518,7 +1518,7 @@ If unsure, select "&lt;i&gt;no&lt;/i&gt;".</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="radio_installer_disabled">
+                      <widget class="GtkRadioButton" id="radio_installer_false">
                         <property name="label" translatable="yes">No, do not integrate the Debian Installer.</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>

-- 
live-magic