diff -u tilecache-2.03/debian/changelog tilecache-2.03/debian/changelog
--- tilecache-2.03/debian/changelog
+++ tilecache-2.03/debian/changelog
@@ -1,3 +1,12 @@
+tilecache (2.03-1.1ubuntu1) karmic; urgency=low
+
+  * tests/Service.txt: Don't include python-generated attributes in list
+    of expected attributes.  Fixes FTBFS, LP: #
+  * debian/rules: Add --install-layout=deb to fix installation dirs and
+    fix a couple hardcoded site-packages references
+
+ -- Michael Terry <michael.terry@canonical.com>  Fri, 18 Sep 2009 08:56:36 -0400
+
 tilecache (2.03-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u tilecache-2.03/debian/rules tilecache-2.03/debian/rules
--- tilecache-2.03/debian/rules
+++ tilecache-2.03/debian/rules
@@ -33,7 +33,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tilecache.
-	python ./setup.py install --debian --no-compile --root=$(PREFIX)
+	python ./setup.py install --debian --no-compile --root=$(PREFIX) --install-layout=deb
     
 	# eliminates script-not-executable warning from lintian
 
@@ -55,9 +55,9 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	chmod +x $(PREFIX)/usr/lib/python*/site-packages/TileCache/Service.py
-	chmod +x $(PREFIX)/usr/lib/python*/site-packages/TileCache/Client.py
-	rm $(PREFIX)/usr/lib/python*/site-packages/TileCache/Caches/S3.py # Suggests python-boto instead.
+	chmod +x $(PREFIX)/usr/lib/python*/*-packages/TileCache/Service.py
+	chmod +x $(PREFIX)/usr/lib/python*/*-packages/TileCache/Client.py
+	rm $(PREFIX)/usr/lib/python*/*-packages/TileCache/Caches/S3.py # Suggests python-boto instead.
 	dh_pysupport
 	dh_installdeb
 	dh_gencontrol
only in patch2:
unchanged:
--- tilecache-2.03.orig/tests/Service.txt
+++ tilecache-2.03/tests/Service.txt
@@ -2,8 +2,8 @@
 (wsgi, cgi, mod_python) feed into it. You can see the properties::
 
     >>> import TileCache.Service
-    >>> dir(TileCache.Service)
-    ['__class__', '__delattr__', '__doc__', '__getattribute__', '__hash__', '__init__', '__module__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__slots__', '__str__', '_load', '_loadFromSection', 'cache', 'config', 'dispatchRequest', 'expireTile', 'files', 'generate_crossdomain_xml', 'layers', 'load', 'loadFromSection', 'metadata', 'renderTile', 'tilecache_options']
+    >>> [x for x in dir(TileCache.Service) if not x.startswith('__')]
+    ['_load', '_loadFromSection', 'cache', 'config', 'dispatchRequest', 'expireTile', 'files', 'generate_crossdomain_xml', 'layers', 'load', 'loadFromSection', 'metadata', 'renderTile', 'tilecache_options']
 
 Or you can create one. In general, this is generated via the config file,
 but you can build one manually as well::