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

[Chris Lamb]

The following commit has been merged in the master branch:
commit cc8e229e4656da83cd734a4b565d97d57f2b11cf
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Jan 12 10:09:47 2009 +0000

    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.

diff --git a/LiveMagic/__init__.py b/LiveMagic/__init__.py
index 65d0f4b..c8b9e0b 100644
--- a/LiveMagic/__init__.py
+++ b/LiveMagic/__init__.py
@@ -16,9 +16,9 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import gtk
 import pygtk
 pygtk.require('2.0')
+import gtk
 import gtk.glade
 
 import locale
diff --git a/debian/changelog b/debian/changelog
index 9bba585..6dc71b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Chris Lamb <lamby at debian.org>  Mon, 12 Jan 2009 10:05:48 +0000
+
 live-magic (1.4) unstable; urgency=low
 
   * Update DebianLive/spec.py:

-- 
GUI front-end for Debian Live.