Applying the Debian 5.2.1 packaging diff; still needs lots of work; also tried to disable a lot of plugins