Comment 4 for bug 377158

debdiff is acting weird, if someone could explain it, I'd appreciate it!

I redid the merge, and

$ debdiff atlas_3.6.0-22ubuntu2.dsc atlas_3.6.0-24ubuntu1.dsc > atlas_3.6.0-24ubuntu1.debdiff

creates a patch identical to above. 1/2 of the patch is "reversed" and 1/2 is normal.

$ patch -p1 ../atlas_3.6.0-24ubuntu1.debdiff

in the source directory runs indefinitely.

To get around that, I'm attaching a bzr diff and please see the merge at:
https://code.edge.launchpad.net/~showard314/ubuntu/lucid/atlas/mergeto3.6.0-24ubuntu1/+merge/14678
let me know if this works. I'll also put diffs of debian/ between ubuntu versions and between debian and ubuntu.