-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi,
At Mon, 09 May 2005 01:43:54 +0900, ISHIKAWA Mutsumi wrote: > >>>>> In <[EMAIL PROTECTED]> > >>>>> Joey Hess <[EMAIL PROTECTED]> wrote: > > >> The changelog also doesn't mention the why > >> debian/patches/02_fix_for_old_automake.dpatch was modified to > >> remove changes to lib/fakelog.c and src/ndtpd.c. > > Perhaps, in the mistake when the dpatch is generated old > 02_fix_for_old_automake.dpath contains whole part of > 01_suppress_verbose_debug_msg.dpatch (lib/fakelog.c and > src/ndtpd.c changes). Those changes are conflict with > 01 dpatch, so dpatch program refuse to apply 02 dpatch. > > Other part of 02 dpatch is needed, and 01 dpatch changeset > are also needed. So I cleaning up 02 dpatch to remove 01 > dpatch's part. Right. 02_fix_for_old_automake.dpatch in old 3.1.5-6 is failed to apply. - -------------------- [from debian/patched/02_fix_for_old_automake.dpatch, 3.1.5-6] patching file lib/fakelog.c Hunk #1 FAILED at 270. 1 out of 1 hunk FAILED -- saving rejects to file lib/fakelog.c.rej patching file src/ndtpd.c Hunk #1 FAILED at 228. 1 out of 1 hunk FAILED -- saving rejects to file src/ndtpd.c.rej patching file doc/Makefile.in patching file doc-ja/Makefile.in - -------------------- The patch for fakelog.c and ndtpd.c are same as in 01_suppress_verbose_debug_msg.dpatch. This log is just from --dry-run, so two Makefile.in aren't patched at this time. IMHO this is a bug of dpatch, but dpatch won't cause error even if the patch is refused by previous one. New 02__fix_for_old_automake.dpatch in 3.1.5-6.2, created by Mutsumi, is removed duplicate patch for fakelog.c and ndtpd.c. Another changes in 3.1.5-6.2 against 3.1.5-6 are: * Add texinfo to Build-depends. This fixes #307615, and maybe part of #301672 also. When texinfo didn't exist, ndtpd Makefile used install-info and made null info file. * Remove doc/ndtpd.info and doc-ja/ndtpd-ja.info in debian/rules clean. This is unnecessary for initial build, but I think it's better to remove them to avoid attaching garbage to .diff file when maintainer build from source again. Thanks, - -- Kenshi Muto [EMAIL PROTECTED] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/> iEYEARECAAYFAkJ+qD4ACgkQQKW+7XLQPLGbpACcDAa+SoGd5/CMCv6HjqXfxjf5 ecsAnAulRYl4dk1RUIWOr33NuuJ5F8gp =g8mT -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
