Re: new cthumb release - 4.1.5 - tps's changes

someone wrote:
> Carlos Puchol wrote:
> > the patches were not straightforward
> > to apply (my eternal complaint, that it why it took more time than
> > usual :)
> 
> Could something smarter have been done to make your life easier ??

now that you ask, yes :-)

- the patch should be against cthumb.in preferably,
  because otherwise, like in a patch for HtmlExtension, it barfed
  due to having "${prefix}/share/images/cthumb" instead of "@themedir@".
- the patch should be (preferably) against the cvs version,
  mostly because i apply the patch to that.
- the patch should not be reversed. the second file on the diff -u
  line should be the newer file. (this happens automatically
  in cvs diff.) otherwise i have to apply it with -R. the patch program
  sometimes tells me that it may be reversed, but not always, in particular,
  it appears, if the first diff entry cannot be applied, the rest just barf,
  so it barfs with and without -R.

this is a stretch, but for bonus points (although this does not apply to cthumb
much), because there are not, the patch should be run through this script that
i call diff2patch. the cvs diff does not always apply fully cleanly to a file
when files inside directories are involved.

	diff2patch < original.diff > new.diff

bash$ cat diff2patch
#!/usr/bin/perl -wi
# Propagate the full pathname from the Index: line in CVS output into
# the diff itself so that patch will use it.
#  Thrown together by Jason Merrill <[email protected]>

while (<>)
{
  if (/^Index: (.*)/) 
    {
      $full = $1;
      print;
      for (1..7)
        {
          $_ = <>;
          s/ [^\t]+\t/ $full\t/;
          print;
        }
    }
  else
    {
      print;
    }
}



-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31