I can confirm the Ubuntu changes can be dropped - the only being to build it against Python 2.4, which is no longer needed given python- support. -- Please sync pytone (universe) from unstable https://launchpad.net/bugs/60684