-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 7/14/10 7:06 PM, Charles Lepple wrote:
> On Wed, Jul 14, 2010 at 3:51 PM, David Lowe <doctorjl...@verizon.net> wrote:
>> On 14 Jul, 2010, at 3:41 AM, Alexander Hansen wrote:
>>
>>> Try a different level. The default -p1 patch assumes that you're
>>> rooted in the top level Fink build directory for the package
>>> (/sw/src/freeciv-2.2.1-5/), and your diff appears to be from at least
>>> one level lower. Try p2 maybe.
>>
>> The problem remains, though it has changed slightly. Here is more
>> detail from the -p1 level:
>
> Try "-p0". The default "-p1" means "strip off one directory level from
> the names in the diff", and I assume that "client/" is in the top
> level of freeciv-2.2.1.
>
> The "-p0" setting is common in your case, where someone makes a backup
> copy of the file in the same directory. "-p1" is more common when
> someone makes a backup of the entire package ( "cp -pr freeciv-2.2.1
> freeciv-2.2.1.orig") and then does a diff from the directory
> containing both the original and the copy ("diff -Naur
> freeciv-2.2.1.orig freeciv-2.2.1").
>
Oops. That'll teach me not to read the manpages. ;-)
- --
Alexander Hansen
Fink User Liaison
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkw+Q4AACgkQB8UpO3rKjQ8gMACfd22zFIqWEcKS1LVp8hPxR2oq
QHIAoKfEZ23mPWS2sO/89LESM/Xd9Y4u
=zxgC
-----END PGP SIGNATURE-----
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
