[SCM] GUI front-end for Debian Live. branch, master, updated. 01bfe15e9de19d2543322586f63218907a764f82

[Chris Lamb]

The following commit has been merged in the master branch:
commit c43e6ef3f91239a8caa444e7b72f5f955b7e8dc2
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 9 05:59:08 2008 +0100

    Default to lenny.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 97391bb..eb9aa03 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -119,7 +119,7 @@ class WizardView(object):
         data = {
             'packages_lists' : get_active('radio_desktop_gnome'),
             'binary_images' : get_active('radio_media_iso'),
-            'distribution' : get_active('radio_distribution_etch'),
+            'distribution' : get_active('radio_distribution_lenny'),
             'debian_installer' : get_active('radio_installer_disabled'),
             'mirror' : self['combobox_mirror'].get_active_text()
         }
diff --git a/debian/changelog b/debian/changelog
index bee2b16..8349b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 live-magic (1.0) unstable; urgency=low
 
   * 1.0 release for Lenny.
+  * Set default distribution to Lenny.
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 09 Aug 2008 02:41:53 +0100
 
diff --git a/misc/live-magic.glade b/misc/live-magic.glade
index aebf017..c2029ca 100644
--- a/misc/live-magic.glade
+++ b/misc/live-magic.glade
@@ -592,7 +592,7 @@ of building your own Debian Live system.</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;What distribution of Debian would you like to build?&lt;/b&gt;
 
-If unsure, select "&lt;i&gt;Stable (etch)&lt;/i&gt;".</property>
+If unsure, select "&lt;i&gt;Testing (lenny)&lt;/i&gt;".</property>
                         <property name="use_markup">True</property>
                       </widget>
                       <packing>
@@ -620,8 +620,8 @@ If unsure, select "&lt;i&gt;Stable (etch)&lt;/i&gt;".</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Stable (etch) - well-tested and rarely changes.</property>
                         <property name="response_id">0</property>
-                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
+                        <property name="group">radio_distribution_lenny</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -641,7 +641,6 @@ If unsure, select "&lt;i&gt;Stable (etch)&lt;/i&gt;".</property>
                         <property name="response_id">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radio_distribution_etch</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -660,9 +659,8 @@ If unsure, select "&lt;i&gt;Stable (etch)&lt;/i&gt;".</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Unstable (sid) - untested and frequently changing</property>
                         <property name="response_id">0</property>
-                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radio_distribution_etch</property>
+                        <property name="group">radio_distribution_lenny</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>

-- 
GUI front-end for Debian Live.