diff -Nru quickly-11.04/debian/changelog quickly-11.04/debian/changelog
--- quickly-11.04/debian/changelog	2011-06-08 16:17:50.000000000 +0000
+++ quickly-11.04/debian/changelog	2011-06-08 16:17:51.000000000 +0000
@@ -1,3 +1,12 @@
+quickly (11.04-0ubuntu1.2) natty-proposed; urgency=low
+
+  * debian/patches/fix-cli-package.patch:
+    - Patch from upstream to prevent the 'quickly package' command in
+      ubuntu-cli templates from generating a .deb that didn't work.
+      LP: #790011
+
+ -- Michael Terry <mterry@ubuntu.com>  Wed, 08 Jun 2011 12:01:10 -0400
+
 quickly (11.04-0ubuntu1.1) natty-proposed; urgency=low
 
   * debian/patches/edit-10.10-wrapper-scripts.patch:
diff -Nru quickly-11.04/debian/patches/fix-cli-package.patch quickly-11.04/debian/patches/fix-cli-package.patch
--- quickly-11.04/debian/patches/fix-cli-package.patch	1970-01-01 00:00:00.000000000 +0000
+++ quickly-11.04/debian/patches/fix-cli-package.patch	2011-06-08 16:17:51.000000000 +0000
@@ -0,0 +1,15 @@
+Index: quickly-11.04/data/templates/ubuntu-cli/project_root/setup.py
+===================================================================
+--- quickly-11.04.orig/data/templates/ubuntu-cli/project_root/setup.py	2011-06-08 12:00:24.453054793 -0400
++++ quickly-11.04/data/templates/ubuntu-cli/project_root/setup.py	2011-06-08 12:00:35.897054792 -0400
+@@ -42,8 +42,8 @@
+ 
+ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
+     def run(self):
+-        values = {'__python_name_data_directory__': self.prefix + '/share/project_name/',
+-                  '__version__': self.distribution.get_version()}
++        values = {'__python_name_data_directory__': "'%s'" % (self.prefix + '/share/project_name/'),
++                  '__version__': "'%s'" % (self.distribution.get_version())}
+         previous_values = update_config(values)
+         DistUtilsExtra.auto.install_auto.run(self)
+         update_config(previous_values)
diff -Nru quickly-11.04/debian/patches/series quickly-11.04/debian/patches/series
--- quickly-11.04/debian/patches/series	2011-06-08 16:17:50.000000000 +0000
+++ quickly-11.04/debian/patches/series	2011-06-08 16:17:51.000000000 +0000
@@ -1 +1,2 @@
 edit-10.10-wrapper-scripts.patch
+fix-cli-package.patch