Robert Schwebel wrote: > On Sun, Nov 23, 2008 at 06:23:58AM -0700, Gary Thomas wrote: >>> Applied, thanks. >>> >>> Your patches still seem to be broken; make sure you can save your own >>> mail, then apply it to a clean trunk with "patch -p1 < your_patch". I >>> fixed it manually. >> Just a matter of where/how I made the diffs (using SVN) - I normally >> use -p0 patches internally. How about this (hopefully fixes both issues)? > > It's not a matter of -p0 vs. -p1; your first patches contained here... > >> --- ptx/rules/ckermit.in (revision 4690) > ^^^ >> +++ ptx/rules/ckermit.in (working copy) > ^^^ > different path depths; -pN cuts off N directories, so after having done > that with both paths, it should end in the same "rest".
Precisely the difference between -p0 and -p1. If my patches were meant to be applied -p0, one would: % cd .../ptxdist-trunk % patch -p0 <gary-p0.patch whereas a patch designed for -p1 would need to be applied thusly % cd "directory-containing-ptxdist-trunk" % patch -p1 <gary-p1.patch No matter, anything I send from now on will be -p1 style. >> @@ -1,9 +1,10 @@ >> ## SECTION=communication >> menuconfig CKERMIT >> tristate >> - prompt "Columbia Univ 'kermit' terminal program" >> + prompt "C-Kermit" >> select NCURSES >> help >> - Basic file transfer & terminal control >> + Columbia Univ 'kermit' terminal program, provides >> + basic file transfer & serial port control > > The other menu entries are even all-lowercase, I made it that way now. Sorry, but I don't see this at all: % grep prompt rules/*.in yields *tons* of entries that are long or have upper case or both... Here are just a few examples: rules/sdl.in: prompt "Build Shared libraries" rules/sqlite.in: prompt "Assume text encoding" rules/ssmtp.in: prompt "support for MD5 authentication" > However, thanks for your patches! Glad to have a forum for this work (which I use all the time) -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------ -- ptxdist mailing list [email protected]
