Merge lp:~jtaylor/ubuntu/natty/foolscap/foolscap-fix-782414 into lp:ubuntu/natty/foolscap

[Julian Taylor]

see bug 782414

[Micah Gersten (micahg)]

Thank you for contributing to Ubuntu development.

I commented on the bug regarding the install failure, but I'll comment here about the tweaks to the proposal. These are mostly cosmetic things to keep in mind for the future, I made these changes locally. You needn't bother reproposing unless something else is required.

Version should be 0.6.1-1ubuntu0.1 since it's an SRU
You should run update-maintainer (This might be a special case since you're the Debian uploader, but something to keep in mind in general for Ubuntu)

[lp:~jtaylor/ubuntu/natty/foolscap/foolscap-fix-782414]

9. By Julian Taylor on 2011-05-26

remove old egg symlinks in a preinst to ensure a correct upgrade

10. By Julian Taylor on 2011-05-26

pydist-override twisted -> python-twisted-core

[Martin Pitt (pitti)]

This looks fine to me now, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-01 23:42:14 +0000
+++ debian/changelog	2011-05-26 13:23:25 +0000
@@ -1,3 +1,11 @@
+foolscap (0.6.1-1ubuntu0.1) natty-proposed; urgency=low
+
+  * add build dependency python-setup to create proper egg (LP: #782414)
+    - remove old egg symlinks in a preinst to ensure a correct upgrade
+    - pydist-override twisted -> python-twisted-core
+
+ -- Julian Taylor <[e-mail]>  Thu, 19 May 2011 10:41:24 +0200
+
 foolscap (0.6.1-1) unstable; urgency=low
 
   [ Julian Taylor ]
 
=== modified file 'debian/control'
--- debian/control	2011-03-01 23:42:14 +0000
+++ debian/control	2011-05-26 13:23:25 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Stephan Peijnik <[e-mail]>, Julian Taylor <[e-mail]>
-Build-Depends-Indep: python-all (>= 2.6.6-3), python-openssl, python-twisted-core, python-twisted-web, debhelper (>= 7.0.50~)
+Build-Depends-Indep: python-all (>= 2.6.6-3), python-openssl, python-twisted-core, python-twisted-web, debhelper (>= 7.0.50~), python-setuptools
 X-Python-Version: >= 2.4
 Standards-Version: 3.9.1
 Homepage: http://foolscap.lothar.com/
 
=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2011-05-26 13:23:25 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+# there are no guarantees on unpack order, so when the pyshared egg
+# folder is extracted before the symlinks in /usr/lib/.../dist-packages
+# the upgrade will fail due to policy 6.6.4  when there are more than
+# one supported python version as it will try to overwrite a directory
+# after following the symlink
+# => remove egg symlink installed by 0.6.1-1 before unpacking
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "0.6.1-4"; then
+  for f in /usr/lib/python2.*; do
+    # if egg is a link and not pointing to a directory
+    if [ -L "$f/dist-packages/foolscap-0.6.1.egg-info" ] &&
+       [ -f "$f/dist-packages/foolscap-0.6.1.egg-info" ]; then
+      rm -f "$f/dist-packages/foolscap-0.6.1.egg-info";
+    fi
+  done
+fi
+
+#DEBHELPER#
 
=== added file 'debian/pydist-overrides'
--- debian/pydist-overrides	1970-01-01 00:00:00 +0000
+++ debian/pydist-overrides	2011-05-26 13:23:25 +0000
@@ -0,0 +1,1 @@
+twisted python-twisted-core