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

4.3.0 branch patching broken



   Is anyone else seen the 4.3.0 branch not be able to
correctly patch for the last few days? Using the files...

branches-4.3.0-sid-debian-2003.06.28.tar.gz
xfree86_4.3.0.orig.tar.gz

from http://necrotic.deadbeast.net/xfree86/ I now get...

Applying patch debian/patches/000_stolen_from_HEAD.diff...dry run failed.
patching file config/imake/imake.c
patching file lib/X11/OpenDis.c
patching file programs/Xserver/hw/xfree86/common/xf86Events.c
patching file programs/Xserver/hw/xfree86/drivers/rendition/rendition.c
patching file programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c
patching file programs/Xserver/hw/xfree86/drivers/trident/trident_video.c
Hunk #1 FAILED at 21.
Hunk #2 succeeded at 852 (offset 79 lines).
1 out of 2 hunks FAILED -- saving rejects to file programs/Xserver/hw/xfree86/drivers/trident/trident_video.c.rej
patching file programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c
make: *** [debian/stampdir/patchapply] Error 1

Any idea what is going on here?
                                   Jack



Reply to: