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

[Chris Lamb]

The following commit has been merged in the master branch:
commit c82a491d9f6107afb3fa791e63ad9c35706e240a
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Jan 10 04:02:26 2009 +0000

    Add missing 'ignore-system-defaults' and 'color' constructor arguments.

diff --git a/DebianLive/spec.py b/DebianLive/spec.py
index d3de2eb..f537add 100644
--- a/DebianLive/spec.py
+++ b/DebianLive/spec.py
@@ -142,11 +142,11 @@ constructor_args = ('apt', 'apt-ftp-proxy', 'apt-http-proxy', 'apt-pdiffs',
     'binary-indices', 'bootappend-install', 'bootappend-live', 'bootloader',
     'bootstrap', 'bootstrap-config', 'bootstrap-flavour', 'bootstrap-keyring',
     'breakpoints', 'cache', 'cache-indices', 'cache-packages', 'cache-stages',
-    'checksums', 'chroot-build', 'chroot-filesystem', 'conffile', 'debconf-frontend',
+    'checksums', 'chroot-build', 'chroot-filesystem', 'color', 'conffile', 'debconf-frontend',
     'debconf-nowarnings', 'debconf-priority', 'debian-installer',
     'debian-installer-distribution', 'debian-installer-preseedfile',
     'distribution', 'encryption', 'fdisk', 'genisoimage',
-    'grub-splash', 'hooks', 'hostname', 'includes', 'initramfs', 'interactive',
+    'grub-splash', 'hooks', 'hostname', 'ignore-system-defaults', 'includes', 'initramfs', 'interactive',
     'iso-application', 'iso-preparer', 'iso-publisher', 'iso-volume',
     'jffs2-eraseblock', 'keyring-packages', 'language', 'linux-flavours',
     'linux-packages', 'losetup', 'memtest', 'mirror', 'mirror-binary-security',
diff --git a/debian/changelog b/debian/changelog
index 6dc71b3..190e208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ live-magic (1.5) unstable; urgency=low
   * Re-order import of GTK and PyGTK as GTK requires that PyGTK is imported
     first. This is required for compatibility with python-gtk2 2.13 (currently
     in experimental). Thanks to Michael Vogt.
+  * Add missing 'ignore-system-defaults' and 'color' constructor arguments.
 
- -- Chris Lamb <lamby at debian.org>  Mon, 12 Jan 2009 10:05:48 +0000
+ -- Chris Lamb <lamby at debian.org>  Sat, 10 Jan 2009 04:01:59 +0000
 
 live-magic (1.4) unstable; urgency=low
 

-- 
GUI front-end for Debian Live.