[Merge] lp:~cshorler/ubuntu/lucid/python-qt4/upstream-and-bug-561303 into lp:ubuntu/lucid/python-qt4

[Christopher Horler]

Christopher Horler has proposed merging lp:~cshorler/ubuntu/lucid/python-qt4/upstream-and-bug-561303 into lp:ubuntu/lucid/python-qt4.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #561303 in python-qt4 (Ubuntu): "PyQt4 applications crash at exit"
  https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/561303

For more details, see:
https://code.launchpad.net/~cshorler/ubuntu/lucid/python-qt4/upstream-and-bug-561303/+merge/106530

I'm not an Ubuntu or bzr user, so apologise if I got anything wrong with regards to filling in commit messages or tagging.  It wasn't clear to me what might be done automatically and what I had to do manually.  I left the branch as-is (python-qt4) and set the tag to the same as the package version (4.7.3-1ubuntu1) and set the bug resolved to 561303.  Then I pushed it to launchpad.

I was prepared an Ubuntu CD image for my father and trying to include an additional piece of software that kept seg faulting on exit.  After debugging it and fixing it several times I determined that I had the same error as here - and so decided I'd fix it as (strangely) it still doesn't appear to have been fixed in lucid.  Hopefully this helps a few people out!

I've merged from Debian stable upstream and fixed ~8 obvious merge conflicts.  No other changes.

I've tested the resulting packages and they fix the segmentation fault for me - so I believe it should resolve the bug noted.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~cshorler/ubuntu/lucid/python-qt4/upstream-and-bug-561303/+merge/106530
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~cshorler/ubuntu/lucid/python-qt4/upstream-and-bug-561303 into lp:ubuntu/lucid/python-qt4.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20120520/f183b3f1/attachment-0001.diff>