>>>>> In <[EMAIL PROTECTED]> >>>>> ISHIKAWA Mutsumi <[EMAIL PROTECTED]> wrote: >> >>>>> In <[EMAIL PROTECTED]> >> >>>>> Branden Robinson <[EMAIL PROTECTED]> wrote:
>> >> On Thu, Jul 03, 2003 at 06:26:27AM -0500, X Strike Force SVN Admin wrote: >> >> Oh. For Xft.3x it's obvious. >> >> >> ISHIKAWA-san, can you update your "shut off Xft,Xrender,Xcursor" patch >> >> to ensure that the manpage doesn't get shipped? That way we can have a >> >> patch that's clean for upstream. >> I think it is upstream bug of man page name confliction. >> >> Both xc/lib/Xft and xc/lib/Xft1 contain different man page with >> same file name (Xft.man). When both BuildXft and BuildXft1 are enabled, >> xc/lib/Xft/Xft.man and xc/lib/Xft1/Xft.man will be instaled on >> same place with same file name (e.g Xft.3x), perhaps >> xc/lib/Xft/Xft.man will overwrite xc/lib/Xft1/Xft.man. I'll commit change set to fix this. patch #065: It simply rename from xc/lib/Xft1/Xft.man to xc/lib/Xft1/Xft1.man. http://hanzubon.jp/Linux/Debian/XFree86/065_Xft1_manpage_conflict.diff update xlibs-dev.install* and debian/MANIFEST.*: Add usr/X11R6/man/man3/Xft1.3x entry to adapt patch #065 change Whole patch set svn diff: http://hanzubon.jp/Linux/Debian/XFree86/Xft.man_conflict_fix.svn.diff Any comments? -- ISHIKAWA Mutsumi <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]>
