X Strike Force XFree86 SVN commit: r1350 - /
Author: branden
Date: 2004-05-03 12:36:18 -0500 (Mon, 03 May 2004)
New Revision: 1350
Modified:
HACKING
Log:
Add section on borrowing patches from XFree86 CVS, warning of license
issues and advertising availability of X-Oz/XFree86-1.1-license "sanitized"
CVS checkout.
Modified: HACKING
===================================================================
--- HACKING 2004-05-02 21:51:19 UTC (rev 1349)
+++ HACKING 2004-05-03 17:36:18 UTC (rev 1350)
@@ -269,6 +269,88 @@
10) Upgrade to the resulting packages.
dpkg -iO ../*.deb
+Borrowing patches from upstream CVS
+-----------------------------------
+
+Please be aware that due to the GPL-incompatible (and possibly DFSG-non-free)
+change in XFree86's license policy, and unclear information as to the scope of
+the new license's application to changes even to files not explicitly
+relicensed, no code committed to XFree86 CVS after 2004-02-12 should be included
+in Debian packages.
+
+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:
+
+ 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
+
+Of the above files, the following were added by the "X-Oz commit":
+
+ 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
+
+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/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 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:
+
+ 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.
+
$Id$
vim:set ai et tw=80:
Reply to: