From 4d25c9c3ab792b9b94c3cf094d53d2d9e72f9f0a Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Wed, 2 Mar 2011 17:58:47 +0100 Subject: Conform to GPLv3 licensing As part of the utouch effort, align licensing accordingly. Signed-off-by: Henrik Rydberg --- AUTHORS | 1 + COPYING | 17 +++++++++++------ tools/mtview.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..dcc56b6 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Henrik Rydberg diff --git a/COPYING b/COPYING index 890b067..bf0f7d3 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,12 @@ -mtview - Multitouch Viewer (GPLv3 license) - Copyright (C) 2010-2011 Henrik Rydberg + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Preamble + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. @@ -65,7 +69,7 @@ patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS 0. Definitions. @@ -615,9 +619,9 @@ an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -669,3 +673,4 @@ may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . + diff --git a/tools/mtview.c b/tools/mtview.c index c607cea..de01646 100644 --- a/tools/mtview.c +++ b/tools/mtview.c @@ -1,3 +1,24 @@ +/***************************************************************************** + * + * mtview - Multitouch Viewer (GPLv3 license) + * + * Copyright (C) 2010, 2011 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + ****************************************************************************/ + #include "config.h" #include #include -- cgit v1.2.3