I had a quick go at a direct merge last night, and there were a few conflicts to sort out... I guess I wasn't sure whether the priority is to minimise the delta between the new package and (a) the current Ubuntu package (b) Debian unstable or (c) Debian experimental.
I'll have another look at it later, and try to pick the best bits of each, and make the eventual merge as painless as possible!
I had a quick go at a direct merge last night, and there were a few conflicts to sort out... I guess I wasn't sure whether the priority is to minimise the delta between the new package and (a) the current Ubuntu package (b) Debian unstable or (c) Debian experimental.
I'll have another look at it later, and try to pick the best bits of each, and make the eventual merge as painless as possible!