Author: branden Date: 2004-12-08 02:15:26 -0500 (Wed, 08 Dec 2004) New Revision: 2049
Modified: HACKING Log: Update and correct erroneous information about the original licensing of the X-Oz XFree86 "autoconfig" patch. Modified: HACKING =================================================================== --- HACKING 2004-12-08 05:23:45 UTC (rev 2048) +++ HACKING 2004-12-08 07:15:26 UTC (rev 2049) @@ -280,79 +280,35 @@ independent source with a known DFSG-free and GPL-compatible provenance, and this will not exist in all cases. -Furthermore, XFree86's new license was tested in a preliminary fashion in a set -of changes committed to XFree86 CVS on 2003-10-08. These changes, which are -copyrighted by X-Oz Technologies, Inc., and which bear a license substantially -similar to the new XFree86 "1.1" license, should also not be used in Debian's -packages of XFree86. The following files were affected by this change: +Furthermore, XFree86's new license was tested in a preliminary fashion prior to +that date. Some changes implementing "automatic configuration support" were +checked into XFree86 CVS on 2003-10-08. Parts of these changes, which are +copyrighted by X-Oz Technologies, Inc., were relicensed without any code changes +on 2003-12-12. The new license is substantially similar to the new XFree86 +"1.1" license, and also should not be used in Debian's packages of XFree86. The +following files were affected by this change: - xc/programs/Xserver/hw/xfree86/CHANGELOG - xc/programs/Xserver/hw/xfree86/Imakefile - xc/programs/Xserver/hw/xfree86/XF86Config.man - xc/programs/Xserver/hw/xfree86/common/Imakefile - xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c - xc/programs/Xserver/hw/xfree86/common/xf86Config.c - xc/programs/Xserver/hw/xfree86/common/xf86Config.h - xc/programs/Xserver/hw/xfree86/common/xf86Configure.c - xc/programs/Xserver/hw/xfree86/common/xf86Helper.c - xc/programs/Xserver/hw/xfree86/common/xf86Init.c - xc/programs/Xserver/hw/xfree86/common/xf86Mode.c - xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c - xc/programs/Xserver/hw/xfree86/getconfig/Imakefile - xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample - xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl - xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh - xc/programs/Xserver/hw/xfree86/getconfig/xfree86.cfg - xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c - xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c - xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c - xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h - xc/programs/Xserver/hw/xfree86/parser/scan.c - xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h + xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c (revision 1.3) + xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl (revision 1.2) + xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh (revision 1.2) -Of the above files, the following were added by the "X-Oz commit": +However, none of these files experienced code changes at the time, and in fact, +as of this writing (2004-12-08), they have still not changed in XFree86 CVS, +which means that these files remain available under the XFree86 1.0 license +in their current state. (Should these files change in XFree86 CVS in the +future, those changes will presumably fall under the new XFree86 1.1 license.) - xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c - xc/programs/Xserver/hw/xfree86/getconfig/Imakefile - xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample - xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl - xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh - xc/programs/Xserver/hw/xfree86/getconfig/xfree86.cfg +On 2003-12-12, a copy of the X-Oz License was also added to: -The remaining files already existed. To be absolutely safe, here is a list of -those files with their corresponding "last known safe" revisions: + xc/programs/Xserver/hw/xfree86/doc/LICENSE (revision 1.23) + xc/programs/Xserver/hw/xfree86/doc/LICENSE.sgml (revision 1.17) - xc/programs/Xserver/hw/xfree86/CHANGELOG 3.2873 - xc/programs/Xserver/hw/xfree86/Imakefile 3.85 - xc/programs/Xserver/hw/xfree86/XF86Config.man 1.21 - xc/programs/Xserver/hw/xfree86/common/Imakefile 3.153 - xc/programs/Xserver/hw/xfree86/common/xf86Config.c 3.275 - xc/programs/Xserver/hw/xfree86/common/xf86Config.h 1.6 - xc/programs/Xserver/hw/xfree86/common/xf86Configure.c 3.79 - xc/programs/Xserver/hw/xfree86/common/xf86Helper.c 1.134 - xc/programs/Xserver/hw/xfree86/common/xf86Init.c 3.207 - xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 1.68 - xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c 1.38 - xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 1.77 - xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1.22 - xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 1.24 - xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c 1.1 - xc/programs/Xserver/hw/xfree86/parser/scan.c 1.28 - xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h 1.32 +for reference purposes. -For convenience, a "sanitized" checkout of XFree86 CVS HEAD as of 2004-02-12, -with the files affected by the X-Oz commit deleted and dialed back to the safe -revisions as necessary, has been prepared, and is available for browsing or -download at the following URLs: +[An earlier version of this document claimed that the XFree86 automatic +configuration code was initially checked in with the XFree86 1.1 license +present. That claim was in error.] - http://necrotic.deadbeast.net/xsf/XFree86/xfree86-CVS-pre-4.4.0-RC3-new-license-sanitized - http://necrotic.deadbeast.net/xsf/XFree86/xfree86-CVS-pre-4.4.0-RC3-new-license-sanitized.tar.gz - -Please note that the above resources do not feature "sanitization" of the -checkout for any other license problems in the XFree86 source tree, such as -non-free fonts. The "prune-non-free" script in the Debian source package of -XFree86 is designed to handle those. - Release Checklist -----------------
