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

Bug#226162: Some patches have a name mismatch



Package: xfree86
Version: 4.2.1-15

Running debian/rules checksource on my system gives the following
results:

Applying patch debian/patches/001b_m68k_haslinuxinput_too.diff...dry run 
failed.
patching file config/cf/linux.cf
Hunk #1 FAILED at 157.
1 out of 1 hunk FAILED -- saving rejects to file config/cf/linux.cf.rej
make: *** [debian/stampdir/patchapply] Error 1

Another run after correcting the problem shows another one:

# make sure all the patches applied cleanly
debian/stampdir/
patches/011a_recognize_glibc_2.3.2_locale_names.diff.log:Hunk #1 
succeeded at 839 (offset 1 line).
debian/stampdir/patches/011_chinese_locale_fixups.diff.log:Hunk #1 
succeeded at 636 (offset 1 line).
Some patches did not apply cleanly.  Please investigate.
make: *** [checksource] Error 1

After investigating I found that my system sort the patches names
in an alphabetical order which doesn't correspond to the correct
order of their application. I solved renaming all offending patches
in this manner:

001a_linux_cf.diff                (was 001_linux_cf.diff)
001b_damn_cpp_3.3_to_hell.diff    (was 001a_damn_cpp_3.3_to_hell.diff
001c_m68k_haslinuxinput_too.diff  (was 001b_m68k_haslinuxinput_too.diff)

011a_chinese_locale_fixups.diff
(was 011_chinese_locale_fixups.diff)
011b_recognize_glibc_2.3.2_locale_names.diff
(was 011a_recognize_glibc_2.3.2_locale_names.diff)
011c_recognize_ko_KR.EUC-KR_locale.diff
(was 011b_recognize_ko_KR.EUC-KR_locale.diff)

Dunno if this is happening to me only in all of the world  :-)

Have a happy new year,
Paolo

-- 
Paolo Ulivi
pulivi AT libero DOT it
GPG KeyID: 5C4F3D94
GPG Fingerprint: 3AF7 BFA2 3DE6 6A73 5379 5E0A 0949 6A1E 5C4F 3D94

If Linux is not Unix then Windows are not Gates
                         Anonymous, XXI Century




Reply to: