On Sun, Jun 19, 2011 at 03:44:28PM -0400, Gaetan Nadon wrote: > On Sun, 2011-06-19 at 08:38 -0700, Alan Coopersmith wrote: > > > On 06/18/11 11:41 AM, Gaetan Nadon wrote: > > > Signed-off-by: Gaetan Nadon <[email protected]> > > > --- > > > configure.ac | 22 ++++++++++++++++++++-- > > > 1 files changed, 20 insertions(+), 2 deletions(-) > > > > > > diff --git a/configure.ac b/configure.ac > > > index 915d55f..245f8fb 100644 > > > --- a/configure.ac > > > +++ b/configure.ac > > > @@ -1,5 +1,23 @@ > > > -dnl Copyright 2007 Peter Hutterer <[email protected]> > > > -dnl Process this file with autoconf to create configure. > > > +# > > > +# Copyright 2007 Peter Hutterer <[email protected]> > > > +# > > > +# Permission to use, copy, modify, distribute, and sell this software > > > and its > > > +# documentation for any purpose is hereby granted without fee, provided > > > that > > > +# the above copyright notice appear in all copies and that both that > > > +# copyright notice and this permission notice appear in supporting > > > +# documentation, and that the name of the author not be used in > > > +# advertising or publicity pertaining to distribution of the software > > > without > > > +# specific, written prior permission. The author makes no > > > +# representations about the suitability of this software for any > > > purpose. It > > > +# is provided "as is" without express or implied warranty. > > > +# > > > +# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, > > > +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO > > > +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR > > > +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS > > > OF USE, > > > +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER > > > +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR > > > +# PERFORMANCE OF THIS SOFTWARE. > > > > > > AC_PREREQ([2.60]) > > > AC_INIT(xinput,[1.5.3], > > > [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput) > > > > That doesn't seem to be the same license notice Peter put on the other code > > in > > xinput from his time at the University, but really he's the one that needs > > to review and sign off on a change like that. > > > > I'll be waiting for his reply. I copied the one from the man pages dir, > which is different from the one in COPYING.
I'm happy to sign-off on any patches to merge my different copyrights into the last one listed by COPYING (the Red Hat one) so we can limit it to two licenses, that one and the one from Frederic Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
