Author: branden Date: 2005-06-23 00:01:52 -0500 (Thu, 23 Jun 2005) New Revision: 255
Modified: trunk/debian/TODO trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff Log: Update annotations for patch #908. Remove #908 from list of patches to be audited; I have done so. Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2005-06-23 05:00:14 UTC (rev 254) +++ trunk/debian/TODO 2005-06-23 05:01:52 UTC (rev 255) @@ -212,7 +212,6 @@ 905_debian_xdm.diff 906_debian_xfs.diff 907_debian_xterm.diff -908_debian_exclude_non-free_fonts_and_docs.diff 909_debian_piclib_support.diff 910_debian_Xserver_RTFF.diff 911_debian_XF86Config_to_XF86Config-4.diff Modified: trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff =================================================================== --- trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff 2005-06-23 05:00:14 UTC (rev 254) +++ trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff 2005-06-23 05:01:52 UTC (rev 255) @@ -1,11 +1,18 @@ $Id$ -Eliminate the building of non-capital-F-Free fonts and docs; -debian/prune-non-free.sh also assists by excising these same fonts and docs -from the tree, so you can generate your .orig.tar.gz's in peace. This -patch originally by Branden Robinson, subsequently forward-ported and updated -by Warren Turkal and Daniel Stone. +Modify Imakefiles to not attempt to manipulate files that have been pruned +from the source tree for licensing reasons (see debian/copyright). +Any files removed from the source tree by the debian/rules target +"prune-upstream-tree", and which cannot be avoided by changing Imake +variables (e.g., in the LinuxDebian section of xc/config/cf/linux.cf) +should generally see patches here to stop them from being referenced during +the build. + +This patch by Branden Robinson. +Forward-ported to xfree86 4.3.0 by Warren Turkal and Daniel Stone. +Forward-ported to xorg-x11 6.8.2.dfsg.1 by Branden Robinson. + --- xc/fonts/scaled/Type1/Imakefile.orig Fri Jan 10 18:55:55 2003 +++ xc/fonts/scaled/Type1/Imakefile Fri Jan 10 18:57:00 2003 @@ -8,25 +8,14 @@ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
