Merge lp:~stefanor/ubuntu/natty/pywebkitgtk/pywebkitgtk-688732 into lp:ubuntu/natty/pywebkitgtk

[Stefano Rivera]

This blocks on LP: #705426

[Barry Warsaw (barry)]

Thanks for adding the cleanup. After the transition, does the bogus __init__.pyc still get installed? If so, should your patch also prevent that from happening? (I can't do a local build to check that, for reasons explained in the bug comments.)

[Stefano Rivera (stefanor)]

Barry: the problem was with an intermediate version of pywebkitgtk (1.1.8-1), that installed the .py file. I'm guessing python-support's byte-compilation then created the .pyc on install. As .pyc wasn't part of the package, it wasn't removed when the next upload didn't have this .py file any more, as this isn't a python-support managed directory.

Presumably this bug is due to python-support not supporting 2.7 yet when 1.1.8-1 was built

[Barry Warsaw (barry)]

Yet another reason to migrate to dh_python2 I guess :). Anyway, thanks for the explanation, and your change looks good to me. I can approve the review, but I do not have permission to approve the merge proposal.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-10 14:48:38 +0000
+++ debian/changelog	2011-01-20 14:37:49 +0000
@@ -1,3 +1,10 @@
+pywebkitgtk (1.1.8-1ubuntu2) natty; urgency=low
+
+  * Cleanup after 1.1.8-1 which may have left a .pyc in
+    /usr/lib/python2.7/dist-packages/webkit/ (LP: #688732)
+
+ -- Stefano Rivera <[e-mail]>  Thu, 20 Jan 2011 14:55:17 +0200
+
 pywebkitgtk (1.1.8-1ubuntu1) natty; urgency=low
 
   * debian/control:

=== added file 'debian/python-webkit.postinst'
--- debian/python-webkit.postinst	1970-01-01 00:00:00 +0000
+++ debian/python-webkit.postinst	2011-01-20 14:37:49 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        if [ -d /usr/lib/python2.7/dist-packages/webkit ]; then
+            # 1.1.8-1 accidentally contained a .py file here
+            # LP: #688732
+            rm -f /usr/lib/python2.7/dist-packages/webkit/__init__.pyc
+            rmdir /usr/lib/python2.7/dist-packages/webkit || true
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#