[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: SPARC patch set



On Tue, Oct 17, 2000 at 09:57:01PM -0400, Ben Collins wrote:
> Well, here it is. This should unpack right into the source dir. It
> includes the sparc specific debhelper files, and the MANIFEST. It also has
> 4 patches in debian/patches/
> 
> 301 - SPARC PCI stuff
> 302 - minor fix (might be in v18?)
> 303 - Misc. fixes I found in RedHat's SRPM
> 204 - The libxrx fixup

302 is unnecessary.  303 is too miscellaneous for my purposes.  But first
and foremost, 301 doesn't apply very nicely.

cat debian/stampdir/patches/301_sparc_pci_stuff.diff.log
patching file programs/Xserver/hw/xfree86/common/compiler.h
Hunk #1 succeeded at 631 with fuzz 1 (offset 155 lines).
Hunk #2 succeeded at 1478 with fuzz 2.
patching file programs/Xserver/hw/xfree86/common/xf86pciBus.c
Hunk #3 succeeded at 1518 with fuzz 1 (offset 40 lines).
Hunk #4 FAILED at 1598.
1 out of 4 hunks FAILED -- saving rejects to file
programs/Xserver/hw/xfree86/common/xf86pciBus.c.rej
patching file programs/Xserver/hw/xfree86/loader/xf86sym.c
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.c
Hunk #1 succeeded at 1049 with fuzz 1.
Hunk #2 FAILED at 1149.
1 out of 2 hunks FAILED -- saving rejects to file
programs/Xserver/hw/xfree86/os-support/bus/Pci.c.rej
patching file programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c
patching file programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
patching file programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file
programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c.rej
patching file programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- saving rejects to file
programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c.rej
patching file programs/Xserver/hw/xfree86/os-support/bus/Pci.h
Hunk #1 FAILED at 139.
1 out of 1 hunk FAILED -- saving rejects to file
programs/Xserver/hw/xfree86/os-support/bus/Pci.h.rej

-- 
G. Branden Robinson            |     A committee is a life form with six or
Debian GNU/Linux               |     more legs and no brain.
branden@deadbeast.net          |     -- Robert Heinlein
http://deadbeast.net/~branden/ |

Attachment: pgpYRZTEmrzpU.pgp
Description: PGP signature


Reply to: