On Tue, Jul 27, 2004 at 09:20:32PM -0400, Thomas Dickey wrote: > The reference is: > > http://cvsweb.xfree86.org/cvsweb/xc/config/cf/Imake.rules > > Revision 3.138 / (view) - annotate - [select for diffs] , Sun Jul 18 14:10:26 2004 UTC (9 days, 11 hours ago) by dickey > Branch: MAIN > CVS Tags: xf-4_4_99_10, HEAD > Changes since 3.137: +2 -2 lines > Diff to previous 3.137 > > 147. Modify CppRawFileTarget() to transform trailing backslashes in the input > manpages so the backslash is followed by a blank, defeating the C > preprocessor's tendency to remove the following newline (Thomas Dickey, > Debian #259996). [...] > =================================================================== > RCS file: /xf86/anoncvs/cvs/xc/config/cf/Imake.rules,v > retrieving revision 3.137 > retrieving revision 3.138 > diff -u -r3.137 -r3.138 > --- xc/config/cf/Imake.rules 2004/06/01 00:16:53 3.137 > +++ xc/config/cf/Imake.rules 2004/07/18 15:10:26 3.138 > @@ -1,6 +1,6 @@ > XCOMM --------------------------------------------------------------------- > XCOMM Imake rules for building libraries, programs, scripts, and data files > -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.136 2004/04/23 20:48:06 tsi Exp $ > +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.137 2004/06/01 00:16:53 dawes Exp $ > /* > * Copyright (c) 1994-2004 by The XFree86 Project, Inc. > * All rights reserved. > @@ -3412,7 +3412,7 @@ > dst:: src deplist @@\ > RemoveFile($@) @@\ > ClearmakeOSName \ > - $(RAWCPP) CppNoLineInfoOption defs <src | CppSedMagic >$@ @@\ > + sed -e 's/\\$$/\\ /' src | $(RAWCPP) CppNoLineInfoOption defs | CppSedMagic >$@ @@\ > @@\ > clean:: @@\ > RemoveFiles(dst) Okay. I'm going to apply this based on the following reasoning: 1) The XFree86 Project, Inc. relicensed this file under the new XFree86 1.1 license. When exactly this happened is, of course, unclear. David Dawes said "everything" he does is under the new license, and he has changed the file several times. Some commit messages include the notice "These changes are Copyright (c) 2004 The XFree86 Project, Inc Rights as per version 1.1 of the XFree86 License (http://www.xfree86.org/legal/licenses.html)." On 1 June 2004, he added the XFree86 1.1 license notice to the file. 2) However, the macro in question hasn't changed in a very long time (over five years); therefore its existing form must still be under the previous license as well. 3.55 (dawes 21-Mar-99): /* Like CppFileTarget, but don't add any default defines */ 3.55 (dawes 21-Mar-99): #ifndef CppRawFileTarget 3.55 (dawes 21-Mar-99): #define CppRawFileTarget(dst,src,defs,deplist) @@\ 3.55 (dawes 21-Mar-99): dst:: src deplist @@\ 3.55 (dawes 21-Mar-99): RemoveFile($@) @@\ 3.55 (dawes 21-Mar-99): ClearmakeOSName \ 3.138 (dickey 18-Jul-04): sed -e 's/\\$$/\\ /' src | $(RAWCPP) CppNoLineInfoOption defs | CppSedMagic >$@ @@\ 3.55 (dawes 21-Mar-99): @@\ 3.55 (dawes 21-Mar-99): clean:: @@\ 3.55 (dawes 21-Mar-99): RemoveFiles(dst) 1.1 (dawes 27-Apr-94): #endif /* CppFileTarget */ (Okay, technically, the above doesn't establish that the line Thomas Dickey changed hadn't already been changed since the relicening went into effect -- whenever that was for this file, which isn't entirely clear. So let's cvs annotate against revision 3.137: 3.55 (dawes 21-Mar-99): /* Like CppFileTarget, but don't add any default defines */ 3.55 (dawes 21-Mar-99): #ifndef CppRawFileTarget 3.55 (dawes 21-Mar-99): #define CppRawFileTarget(dst,src,defs,deplist) @@\ 3.55 (dawes 21-Mar-99): dst:: src deplist @@\ 3.55 (dawes 21-Mar-99): RemoveFile($@) @@\ 3.55 (dawes 21-Mar-99): ClearmakeOSName \ 3.55 (dawes 21-Mar-99): $(RAWCPP) CppNoLineInfoOption defs <src | CppSedMagic >$@ @@\ 3.55 (dawes 21-Mar-99): @@\ 3.55 (dawes 21-Mar-99): clean:: @@\ 3.55 (dawes 21-Mar-99): RemoveFiles(dst) So, nope, it hadn't changed recently.) 3) Since Thomas Dickey knows how Debian feels about the new XFree86 license, and since he and I have discussed it before, I'm going to assume his change is either not copyright able, or if it is, is under the traditional MIT/X11 terms (revision 3.55 of this file had no copyright notice or license statement). If I'm making any bad assumptions, Thomas Dickey can easily correct me. I've gone through this exercise to illustrate how careful we need to be when dealing with XFree86 after 12 February 2004, and why it's usually less trouble to get patches straight from the authors. I hope Mr. Dawes is deriving some satisfaction from the hoops he is forcing his fellow free software developers to jump through; there seems to be so little else that gives him pleasure. -- G. Branden Robinson | Debian GNU/Linux | Extra territorium jus dicenti branden@debian.org | impune non paretur. http://people.debian.org/~branden/ |
Attachment:
signature.asc
Description: Digital signature