Re: updating the patches
On Sun, Nov 25, 2007 at 08:42:55PM -0500, Kamaraju S Kusumanchi wrote:
> I have a very naive question. I am involved in maintaining texmacs package.
I thought it was a good question myself, not naive at all!
> dptach. The files involved in these patches have been altered upstream in
> the latest version 1.0.6.12 (Debian Sid currently has 1.0.6.11). So the old
> patches no longer apply. What is the most efficient way in this scenario?
I think it would depend on how much the files have altered, or rather
how big and nasty the .rej file is.
If it doesn't look too bad, then I would use dpatch-edit-patch to
apply the patch and work on that version of the files to fix the
problems up. Once you are happy, exit out of the subshell and you have a
new patch.
If it is patching very messily, then you may want to move the patch out
of the way, use dpatch-edit-patch again (but it won't apply the moved
patch) and then manually make the changes using the moved patch as your
guide.
You don't mention what the patches are for, but it is a good idea
to consider if you require them anymore. For example you may of had
a work-around for some bug and the upstream has put a proper fix in,
so its not required.
As an aside, dpatch is pretty neat little program that has defintely
solved the majority of headaches for patching, though not all. Certainly
better than the bad old days :)
- Craig
--
Craig Small GnuPG:1C1B D893 1418 2AF4 45EE 95CB C76C E5AC 12CA DFA5
http://www.enc.com.au/ csmall at : enc.com.au
http://www.debian.org/ Debian GNU/Linux, software should be Free
Reply to: