diff -u distribute-0.6.8/debian/control distribute-0.6.8/debian/control
--- distribute-0.6.8/debian/control
+++ distribute-0.6.8/debian/control
@@ -1,7 +1,8 @@
 Source: distribute
 Section: python
 Priority: optional
-Maintainer: Matthias Klose <doko@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
 #Build-Depends-Indep: python-all-dev, python2.5-dev, python2.6-dev, python3-all-dev, python-central (>= 0.6.11), python-sphinx
 Build-Depends-Indep: python2.5-dev, python-all-dev, python-central (>= 0.6.11), python-sphinx
 Build-Depends: debhelper (>= 5.0.37.1)
diff -u distribute-0.6.8/debian/changelog distribute-0.6.8/debian/changelog
--- distribute-0.6.8/debian/changelog
+++ distribute-0.6.8/debian/changelog
@@ -1,3 +1,10 @@
+distribute (0.6.8-1ubuntu2) lucid; urgency=low
+
+  * python-setuptools.preinst (lp: #490731):
+    Remove old .egg-info directories so we can transition to symlinks.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 05 Dec 2009 13:20:47 +0100
+
 distribute (0.6.8-1ubuntu1) lucid; urgency=low
 
   * Build for python2.5 and python2.6.
only in patch2:
unchanged:
--- distribute-0.6.8.orig/debian/python-setuptools.preinst
+++ distribute-0.6.8/debian/python-setuptools.preinst
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in upgrade)
+	if dpkg --compare-versions "$2" lt "0.6.8-1ubuntu2"; then
+		# Remove the old .egg-info directories so we can transition to symlinks
+		for dir in /usr/lib/python2.5/site-packages/setuptools.egg-info /usr/lib/python2.6/dist-packages/setuptools.egg-info; do
+			[ -d "$dir" -a ! -L "$dir" ] && rm -rf "$dir";
+		done
+	fi
+	;;
+esac
+
+#DEBHELPER#