Comment 25 for bug 605027

Hi Scott,

I have been having some trouble with the merge as described previously. Basically, I'm not sure how to deal with two issues: firstly, the Debian source has the patches applied whereas the current Ubuntu source does not. I'm pretty new to packaging, so I'm not sure what the best solution is. Secondly, dpkg-source seems to be creating a patch called debian*.diff which undoes some of the changes in the other patches in the series. I don't know why this is happening or how to avoid it.

Unassigning myself for now! I'm currently on vacation, so I won't be able to work on this for a couple of weeks. Any help would be appreciated. Sorry for all the confusion!