From 6c5c64dc58cb23b00f7ac15f1ee36eb3f1c36d1e Mon Sep 17 00:00:00 2001 From: Jocelyn DELALANDE Date: Tue, 15 May 2012 12:28:45 +0200 Subject: [PATCH] licensing fix Signed-off-by: Michael Jumper --- AUTHORS | 2 ++ include/unicode_convtable.h | 37 +++++++++++++++++++++++++++++++ src/guac_handlers.c | 3 +++ src/unicode_convtable.c | 51 +++++++++++++++++++++++++++++-------------- tools/ini2dot_h_unimap.py | 38 +++++++++++++++++++++++++++++--- 5 files changed, 112 insertions(+), 19 deletions(-) diff --git a/AUTHORS b/AUTHORS index c500977..dc7ab73 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,4 @@ Michael Jumper Matt Hortman +Jocelyn Delalande +David Lechevalier \ No newline at end of file diff --git a/include/unicode_convtable.h b/include/unicode_convtable.h index d74b55b..30e9fb3 100644 --- a/include/unicode_convtable.h +++ b/include/unicode_convtable.h @@ -1,3 +1,40 @@ + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is libguac-client-rdp. + * + * The Initial Developer of the Original Code is + * Jocelyn DELALANDE Ulteo SAS - http://www.ulteo.com + * + * Portions created by the Initial Developer are Copyright (C) 2012 Ulteo SAS. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + #ifndef _GUAC_UNICODE_CONVTABLE_H #define _GUAC_UNICODE_CONVTABLE_H diff --git a/src/guac_handlers.c b/src/guac_handlers.c index ebc3307..5cb216c 100644 --- a/src/guac_handlers.c +++ b/src/guac_handlers.c @@ -21,6 +21,9 @@ * * Contributor(s): * Matt Hortman + * Jocelyn DELALANDE Ulteo SAS - http://www.ulteo.com + * + * Portions created by Ulteo SAS employees are Copyright (C) 2012 Ulteo SAS * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/src/unicode_convtable.c b/src/unicode_convtable.c index a627c21..e022e96 100644 --- a/src/unicode_convtable.c +++ b/src/unicode_convtable.c @@ -1,22 +1,41 @@ -/** - * Copyright (C) 2012 Ulteo SAS - * http://www.ulteo.com - * Author Jocelyn DELALANDE 2012 + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is libguac-client-rdp. + * + * The Initial Developer of the Original Code is + * Jocelyn DELALANDE Ulteo SAS - http://www.ulteo.com + * + * Portions created by the Initial Developer are Copyright (C) 2012 Ulteo SAS. + * + * Contributor(s): David LECHEVALIER 2011 * - * 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; version 2 - * of the License. + * Portions created by Ulteo Employees are Copyright (C) 2011-2012 Ulteo SAS. * - * 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. + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - **/ + * ***** END LICENSE BLOCK ***** */ #include "unicode_convtable.h" diff --git a/tools/ini2dot_h_unimap.py b/tools/ini2dot_h_unimap.py index 8de6340..16573ed 100644 --- a/tools/ini2dot_h_unimap.py +++ b/tools/ini2dot_h_unimap.py @@ -1,9 +1,41 @@ #!/usr/bin/env python + +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is libguac-client-rdp. # -# Copyright (C) 2012 Ulteo SAS -# http://www.ulteo.com -# Author Jocelyn DELALANDE 2012 +# The Initial Developer of the Original Code is +# Jocelyn DELALANDE Ulteo SAS - http://www.ulteo.com # +# Portions created by the Initial Developer are Copyright (C) 2012 Ulteo SAS. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + # Converts a .ini file defining unicode exceptions to a dot_h file # The dot_h file defines an array of keysim->unicode # -- 1.7.10.4