Merge lp:~mterry/quickly/853692 into lp:quickly

[Michael Terry]

[Didier Roche-Tolomelli (didrocks)]

looks good, thanks Michael!

review: Approve

=== modified file 'data/templates/ubuntu-application/upgrade.py'
--- data/templates/ubuntu-application/upgrade.py	2011-07-29 19:02:32 +0000
+++ data/templates/ubuntu-application/upgrade.py	2011-09-23 14:19:35 +0000
@@ -201,5 +201,13 @@
         except templatetools.CantUpdateFile, e:
             print _("WARNING: can't update your project to support /opt. This doesn't matter if you don't plan to submit your project to the application review board. Cause is: %s" % e)
 
+### 11.09 update
+if project_version < '11.09':
+    filename = './%s_lib/Builder.py' % python_name
+    with open(filename) as fileobj:
+        contents = fileobj.read()
+    contents = contents.replace('from gi.repository import GObject', 'import gobject')
+    contents = contents.replace('GObject.', 'gobject.')
+    templatetools.set_file_contents(filename, contents)
 
 sys.exit(0)