Merge lp:~ddecator/ubuntu/maverick/gdecrypt/call-python-20100715 into lp:ubuntu/maverick/gdecrypt

[Draycen DeCator]

Fixed issues with previous merge proposal (now aimed at maverick, and calls 'python' instead of 'python2.6')

[Stefano Rivera (stefanor)]

That's better. The changes should still be represented in a quilt patch. I'll do that, the package could use a spring-clean, anyway.

=== modified file 'createui.py'
--- createui.py	2008-06-03 17:33:56 +0000
+++ createui.py	2010-07-15 07:27:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- Mode: python; coding: utf-8 -*-
 
 import pygtk, gtk, gtk.glade, pango, gobject

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-29 22:54:33 +0000
+++ debian/changelog	2010-07-15 07:27:42 +0000
@@ -1,3 +1,11 @@
+gdecrypt (0.7.2.2-0ubuntu5) maverick; urgency=low
+
+  * Call python instead of python2.5 (LP: #574237)
+    - update createui.py
+    - update main.py
+
+ -- Draycen DeCator <[e-mail]>  Thu, 15 Jul 2010 03:12:39 -0400
+
 gdecrypt (0.7.2.2-0ubuntu4) lucid; urgency=low
 
   * debian/control: Depend on python-gksu2 rather than python-gnome2-extras

=== modified file 'main.py'
--- main.py	2008-03-03 17:54:59 +0000
+++ main.py	2010-07-15 07:27:42 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 # -*- Mode: python; coding: utf-8 -*-
 # 
 # Copyright (C) 2007  Kjell Braden