The changelog was a mess because I hadn't merged in the latest version from karmic-security. That is done now.

According to http://dep.debian.net/deps/dep3/, Forwarded: not-needed is only meant to document that a patch shouldn't be sent upstream because it is vendor specific. In this case, its obvious from the Origin tag that this came *from* upstream. I've added the optional upstream, prefix to the Origin, which I think does an adequate job of documenting that fact.

The merge is to karmic-security because that is where the latest changes are imported today. I think this is a weakness of UDD actually, and should be looked at. There should simply be a 'latest' branch or something like that, so that this merge proposal isn't nullified by an upload to updates.

Anyway, this way you get a diff that you can apply to the latest archive version and upload to proposed without problems.