diff -pruN 1.1.1-2/debian/changelog 1.1.1-2ubuntu1/debian/changelog
--- 1.1.1-2/debian/changelog	2011-10-27 15:23:36.000000000 +0000
+++ 1.1.1-2ubuntu1/debian/changelog	2011-10-27 15:23:36.000000000 +0000
@@ -1,3 +1,12 @@
+turbogears (1.1.1-2ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    + Add python-tgmochikit to python-turbogears Recommends
+    + Remove ez_setup calls from setup.py so ez_setup doesn't try to download
+      packages during build
+
+ -- Stephan Adig <sh@sourcecode.de>  Thu, 27 Oct 2011 12:04:19 +0000
+
 turbogears (1.1.1-2) unstable; urgency=low
 
   * Team upload.
@@ -5,6 +14,15 @@ turbogears (1.1.1-2) unstable; urgency=l
 
  -- Piotr Ożarowski <piotr@debian.org>  Sun, 08 May 2011 16:45:48 +0200
 
+turbogears (1.1.1-1ubuntu1) lucid; urgency=low
+
+  * Update from Debian Unstable for Python 2.6 compatibility fixes
+  * Add python-tgmochikit to python-turbogears Recommends
+  * Remove ez_setup calls from setup.py so ez_setup doesn't try to download
+    packages during build
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 07 Apr 2010 21:48:13 -0400
+
 turbogears (1.1.1-1) unstable; urgency=low
 
   * New upstream release: 18 bugfixes, 6 new features.
@@ -383,3 +401,4 @@ turbogears (0.8.9-1) UNRELEASED; urgency
   * Initial Release (Closes: #338676)
 
  -- Gustavo Noronha Silva <kov@debian.org>  Wed,  3 May 2006 22:52:25 -0300
+
diff -pruN 1.1.1-2/debian/control 1.1.1-2ubuntu1/debian/control
--- 1.1.1-2/debian/control	2011-10-27 15:23:36.000000000 +0000
+++ 1.1.1-2ubuntu1/debian/control	2011-10-27 15:23:36.000000000 +0000
@@ -1,7 +1,8 @@
 Source: turbogears
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Federico Ceratto <federico.ceratto@gmail.com>, Enrico Zini <enrico@debian.org>
 Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~), python-support, python, python-cheetah, python-cherrypy (<< 3.0.0), python-configobj, python-decoratortools, python-formencode, python-kid, python-nose, python-paste, python-pastedeploy, python-pastescript, python-setuptools, python-simplejson, python-sqlalchemy, python-sqlobject, python-turbokid, python-turbojson
 Standards-Version: 3.8.4
@@ -12,7 +13,7 @@ Vcs-Svn: svn://svn.debian.org/python-mod
 Package: python-turbogears
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python, python-cheetah, python-cherrypy (<< 3.0.0), python-configobj, python-decoratortools, python-formencode, python-kid, python-nose, python-paste, python-pastedeploy, python-pastescript, python-pkg-resources, python-simplejson, python-sqlalchemy | python-sqlobject, python-turbokid, python-turbojson, python-markdown
-Recommends: python-elixir, python-pysqlite2, python-myghty, python-genshi
+Recommends: python-elixir, python-pysqlite2, python-myghty, python-genshi, python-tgmochikit
 XB-Python-Version: ${python:Versions}
 Description: Python-based web framework
  TurboGears takes the best components available and combines them into one
diff -pruN 1.1.1-2/setup.py 1.1.1-2ubuntu1/setup.py
--- 1.1.1-2/setup.py	2010-03-21 15:38:48.000000000 +0000
+++ 1.1.1-2ubuntu1/setup.py	2011-10-27 15:23:36.000000000 +0000
@@ -3,8 +3,6 @@
 import os
 import sys
 
-from ez_setup import use_setuptools
-use_setuptools()
 from setuptools import setup, find_packages
 
 if sys.version_info < (2, 4):