I started thinking about whether it's reasonable to
switch to the X.org tree for a future Debian release, before all the
modular trees are ready. Also, the modular trees are likely to merge
stuff from the monolithic tree, so it seemed important to clear this stuff up.
Unfortunately, X.org merged from XFree86 4.4.0 before the release
of X11R6.7.0. Meaning potential license issues with code coming from the
X.org tree. :-P
This was with the following commits:
18. Merged in XFree86 code up to 4.4.0 including changes to files that
had a changed license. There was only one change which happened to
be from me (Egbert Eich).
23. Merged with XFree86 4.4.0. Added changes that went into infected
files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions
to avoid future conflicts on ASCII but not humal readable files.
(There should probably be separate CreditsXorg.rtf files)
(Egbert Eich).
I have made a detailed summary (below) of the differences between Branden's
'sanitized' tree and the version merged into the X.org trunk (4.4.0).
If you don't care about that, stop reading now. :-)
I did a diff -qr between the two trees, with
-I '\$XFree86.*\$' \
-I '\$Id.*\$' \
-I '\$Date.*\$' \
-I '\$Header.*\$' \
-I '\$Source.*\$' \
in order to ignore bogus differences due to CVS expandos.
Then I tried to track down the origins of each commit in the XFree86 CVS logs.
(For a few groups of files, I wore out and did not do so, but I can if it's
wanted by anyone.)
For many of these, particularly the David Dawes-authored ones, I assume they
will have to be kept out of Debian's X packages.
This would be most easily accomplished by getting them reverted
in the X.org tree and any modular trees drawing from it.
But it might have to be accomplished in much more tedious ways. Anyway,
many of the changes seem entirely irrelevant to Debian, but they might show
up if the X.org tree is used without further thought. :-P
Most of the non-Dawes changes simply require assurances that the authors
did not intend them to be under the XFree86 1.1/X-Oz licenses, which most
of them probably didn't.
Please feel free to forward this to any list which is appropriate.
Removed files (irrelevant to licensing problems):
=============
xc/doc/hardcopy/test
xc/doc/specs/PEX5
xc/programs/Xserver/hw/xfree86/doc/Status
xc/programs/Xserver/hw/xfree86/drivers/i810/README
xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/var-list
xc/util/compress (directory)
Added files
===========
xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c
The X-Oz commit. Dawes/X-Oz.
xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-amd64 (directory)
Dawes/XFree86 1.1. Yes, the entire directory.
xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/lib-excl
Not actually new (readded the version from Feb 27, 2000).
So, OK.
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 X-Oz commit. Dawes/X-Oz.
Modified files
==============
xc/RELNOTES
I'm unsure. Is this autogenerated?
xc/config/cf/Imake.rules
Revision 3.129, David Dawes
Apparently only affects Speedo fonts
xc/config/cf/X11.tmpl
Revisions 1.248, 1.249, David Dawes
Apparently only affects Speedo fonts
xc/config/cf/apollo.cf
Revision 1.2, David Dawes
xc/config/cf/os2def.db
Revision 1.8, apparently by Frank Giessler, committed by Dawes
xc/fonts/scaled/Speedo/Imakefile
Revisions 1.6 and 1.7, David Dawes
xc/lib/font/FreeType/ftfuncs.c
Revision 1.45.
Appears to be by Chisato Yamauchi, committed by Dawes
xc/lib/font/FreeType/ftfuncs.h
Revision 1.19.
Appears to be by Chisato Yamauchi, committed by Dawes
xc/lib/font/FreeType/xttcap.c
Revision 1.2. Bugfix and deletion of deprecated stuff.
Appears to be by Chisato Yamauchi, committed by Dawes
xc/lib/font/fontfile/encparse.c
Revision 1.21, by 'tsi'.
Warning fix only (adds two casts); non-copyrightable?
xc/lib/freetype2/freetype-def.cpp
Revision 1.7, committed by dawes.
A one-line addition.
Apparently written by Frank Giessler. OS/2 specific.
xc/lib/xtrans/Xtranssock.c
Revision 3.69, commited by dawes.
A deletion. Rather unlikely to be copyrightable.
Apparently written by Frank Giessler. OS/2 specific.
xc/programs/Xserver/Xext/dpms.c
Revision 3.12. One-line change by Egbert Eich.
xc/programs/Xserver/hw/darwin/bundle/Dutch.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/English.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/French.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/German.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/Spanish.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/Swedish.lproj/Credits.rtf
xc/programs/Xserver/hw/darwin/bundle/ko.lproj/Credits.rtf
Addition of acknowledgement clause, and formatting changes.
Committed by 'torrey'.
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/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
The X-Oz commit.
xc/programs/Xserver/hw/xfree86/common/xf86xv.c
Revision 1.38, committed by 'tsi', apparently written by Rene Rebe.
xc/programs/Xserver/hw/xfree86/doc/BUILD
xc/programs/Xserver/hw/xfree86/doc/Install
xc/programs/Xserver/hw/xfree86/doc/LICENSE
xc/programs/Xserver/hw/xfree86/doc/README
xc/programs/Xserver/hw/xfree86/doc/README.DECtga
xc/programs/Xserver/hw/xfree86/doc/README.Darwin
xc/programs/Xserver/hw/xfree86/doc/README.LynxOS
xc/programs/Xserver/hw/xfree86/doc/README.NetBSD
xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD
xc/programs/Xserver/hw/xfree86/doc/README.SiS
xc/programs/Xserver/hw/xfree86/doc/README.apm
xc/programs/Xserver/hw/xfree86/doc/README.chips
xc/programs/Xserver/hw/xfree86/doc/README.mouse
xc/programs/Xserver/hw/xfree86/doc/README.s3virge
xc/programs/Xserver/hw/xfree86/doc/RELNOTES
xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml
xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre
I'm afraid I couldn't stand to go through these.
xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h
xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atimisc.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h
xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h
All by 'tsi', Marc La France.
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c
Revision 1.37 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
Revision 1.117 by Rene Rebe, committed by 'tsi'
Revision 1.118 by Hui Yu at ATI and Benjamin Herrenschmidt,
committed by 'martin'
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h
Revision 1.32 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
Revision 1.13, committed by 'alanh', written by Alan Hourihan
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
Revision 1.50, Alan Hourihan
xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h
Revision 1.6 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
Revision 1.88 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c
Revision 1.13 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dac3026.c
Revision 1.59 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c
Revision 1.55 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
Revision 1.245 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
Revision 1.100 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c
Revision 1.34 by Rene Rebe, committed by 'tsi'
xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c
Revision 1.75, David Dawes.
xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/92xx.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_init.c
xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c
I didn't look hard at this driver, because I wore out. :-(
xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c
Revision 1.14, committed by dawes.
Appears to be written by Eric Wittry, Chisato Yamauchi, and Michael Lampe.
xc/programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h
xc/programs/Xserver/hw/xfree86/drivers/sis/310vtbl.h
xc/programs/Xserver/hw/xfree86/drivers/sis/init.c
xc/programs/Xserver/hw/xfree86/drivers/sis/init.h
xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c
xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h
xc/programs/Xserver/hw/xfree86/drivers/sis/initdef.h
xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h
xc/programs/Xserver/hw/xfree86/drivers/sis/oem310.h
xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis6326_video.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_opt.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_regs.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vb.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vb.h
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c
xc/programs/Xserver/hw/xfree86/drivers/sis/sis_video.c
xc/programs/Xserver/hw/xfree86/drivers/sis/vgatypes.h
xc/programs/Xserver/hw/xfree86/drivers/sis/vstruct.h
I didn't look at this (the SIS driver) much. It looks like there
are few if any changes by anyone but the author (Thomas Winischhofer),
but I didn't do a complete check.
xc/programs/Xserver/hw/xfree86/drivers/trident/blade_accel.c
xc/programs/Xserver/hw/xfree86/drivers/trident/image_accel.c
xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c
xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c
Entirely deletions and reversions, so definitely OK.
xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c
The X-Oz commit.
xc/programs/Xserver/hw/xfree86/drivers/via/via_bios.c
Revision 1.11, commited by dawes.
Apparently written by Luc Verhaegen.
xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.c
Revision 1.33, commited by dawes.
Apparently written by Luc Verhaegen.
xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c
Revision 1.19, committed by 'tsi'.
Apparently written by Marc La France.
xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh
Revisions 1.69-1.73, David Dawes.
xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/bin-list
Revision 1.11, David Dawes. Might not be copyrightable (changes
two .so versions)
xc/programs/Xserver/hw/xfree86/etc/pci.ids
Comes from further upstream, so OK. Plus, it's facts.
xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c
The X-Oz commit.
xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c
Revision 1.7, committed by herrb, apparently written by Mel Kravitz
xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c
The X-Oz commit.
xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c
Revision 1.32, committed and written by Eich.
One-letter typo fix, presumably not copyrightable.
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c
The X-Oz commit.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c
Revision 3.15, committed by dawes.
Typo fix apparently by Frank Giessler.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_init.c
Revision 2.19, committed by dawes. Apparently by Frank Giessler.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c
Revision 3.20, committed by dawes. Apparently by Frank Giessler.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_kbdEv.c
Revision 3.17, committed by dawes. Apparently by Frank Giessler.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c
Revision 3.10, committed by dawes. Apparently by Frank Giessler.
xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.h
Revision 3.2, committed by dawes. Apparently by Frank Giessler.
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
The X-Oz commit.
xc/programs/Xserver/os/WaitFor.c
Revision 3.44, committed and written by Egbert Eich
xc/programs/xkbcomp/symbols/gb
Revision 3.7 committed and written by Ivan Pascal
Tiny fix unlikely to be copyrightable?
xc/programs/xkbcomp/symbols/pc/gb
Revision 1.7 committed and written by Ivan Pascal
Tiny fix unlikely to be copyrightable? Identical to the other one.
--
There are none so blind as those who will not see.
