Comment 24 for bug 542994

Hi Jaap,
Don't get lost with the tools; for 0.47 I also tryed to use bazaar to diff with my svn and local trees and it was a mess, so I reverted back to doing things by hand.
I suggest that, for this patch, you forget about svn and use the patch directly. I do it by hand and take great care it is right and works as expected.
By the way, I've updated the patch with your screenshot.py changes and the setup.py fix.

IMHO, the easyest way to merge this, is to take a local branch from 0.47 and apply the patch directly (by hand). Then you'll have your bazaar branch synced to my local/svn trees. We will take care of small details like any remaining absent, moved or deleted file then.
Then I'll try to find some way of making svn and bazaar play well together in my local tree, and will delete the bazaar svn import (it seems useless for both of us) and will create here a new branch from the merged one for future development, so we can use bazaar to merge future changes while I keep svn in sync.

About scrot.py, it is still scrot.py in 0.47 tarball, so that explains I didn't noticed anything.
About GNU_R_Plot_Editor, you are right, I missed a few files. Already solved.
About MANIFEST.in, it doesn't exists in the 0.47 tarball, and I didn't consider any file absent from the tarballs.