diff -u quickly-11.04/debian/control quickly-11.04/debian/control
--- quickly-11.04/debian/control
+++ quickly-11.04/debian/control
@@ -3,6 +3,7 @@
 Priority: extra
 Build-Depends: cdbs (>= 0.4.43),
  debhelper (>= 6),
+ quilt,
  python,
  python-central (>= 0.6.11),
  python-distutils-extra (>= 2.18),
diff -u quickly-11.04/debian/rules quickly-11.04/debian/rules
--- quickly-11.04/debian/rules
+++ quickly-11.04/debian/rules
@@ -5,6 +5,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/langpack.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 binary-post-install/python-quickly-core::
 	rm debian/python-quickly-core/usr/share/pyshared/quickly/__init__.py
diff -u quickly-11.04/debian/changelog quickly-11.04/debian/changelog
--- quickly-11.04/debian/changelog
+++ quickly-11.04/debian/changelog
@@ -1,3 +1,13 @@
+quickly (11.04-0ubuntu1.1) natty-proposed; urgency=low
+
+  * debian/patches/edit-10.10-wrapper-scripts.patch:
+    - Patch from upstream to make sure that 10.10-era projects have their
+      wrapper script opened by 'quickly edit' (LP: #770294)
+  * debian/control, debian/rules:
+    - Add quilt patch system
+
+ -- Michael Terry <mterry@ubuntu.com>  Wed, 27 Apr 2011 11:35:27 -0400
+
 quickly (11.04-0ubuntu1) natty; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- quickly-11.04.orig/debian/patches/edit-10.10-wrapper-scripts.patch
+++ quickly-11.04/debian/patches/edit-10.10-wrapper-scripts.patch
@@ -0,0 +1,16 @@
+--- a/data/templates/ubuntu-application/edit.py
++++ b/data/templates/ubuntu-application/edit.py
+@@ -56,8 +56,11 @@
+ if not configurationhandler.project_config:
+     configurationhandler.loadConfig()
+ 
+-# add launcher which does not end with .py
+-# filelist.append('bin/' + configurationhandler.project_config['project'])
++# add launcher which does not end with .py for older projects (pre-lib split)
++project_name = configurationhandler.project_config['project']
++libdir = os.path.join(templatetools.python_name(project_name) + '_lib')
++if not os.path.exists(libdir):
++    filelist.append('bin/' + configurationhandler.project_config['project'])
+ 
+ # add helpfile sources
+ filelist.extend(glob.glob('help/C/*.page'))
only in patch2:
unchanged:
--- quickly-11.04.orig/debian/patches/series
+++ quickly-11.04/debian/patches/series
@@ -0,0 +1 @@
+edit-10.10-wrapper-scripts.patch