From e925570c4298bb3e19e2f27c1557a8467e742ea6 Mon Sep 17 00:00:00 2001 From: yoogx Date: Tue, 16 Jun 2015 17:45:10 +0200 Subject: [PATCH] * Update licence to GPLv3 + runtime exception For issue #43 --- src/config/ocarina-configuration.adb.in | 36 ++++++++++++------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/config/ocarina-configuration.adb.in b/src/config/ocarina-configuration.adb.in index 64daf546..c1a515a0 100644 --- a/src/config/ocarina-configuration.adb.in +++ b/src/config/ocarina-configuration.adb.in @@ -6,28 +6,26 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2006-2009, GET-Telecom Paris. -- +-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2015 ESA & ISAE. -- -- -- --- Ocarina is free software; you can redistribute it and/or modify -- --- it under terms of the GNU General Public License as published by the -- --- Free Software Foundation; either version 2, or (at your option) any -- --- later version. Ocarina 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 distributed with Ocarina; see file COPYING. -- --- If not, write to the Free Software Foundation, 51 Franklin Street, Fifth -- --- Floor, Boston, MA 02111-1301, USA. -- +-- Ocarina is free software; you can redistribute it and/or modify under -- +-- terms of the GNU General Public License as published by the Free Soft- -- +-- ware Foundation; either version 3, or (at your option) any later ver- -- +-- sion. Ocarina 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. -- -- -- --- As a special exception, if other files instantiate generics from this -- --- unit, or you link this unit with other files to produce an executable, -- --- this unit does not by itself cause the resulting executable to be -- --- covered by the GNU General Public License. This exception does not -- --- however invalidate any other reasons why the executable file might be -- --- covered by the GNU Public License. -- +-- As a special exception under Section 7 of GPL version 3, you are granted -- +-- additional permissions described in the GCC Runtime Library Exception, -- +-- version 3.1, as published by the Free Software Foundation. -- -- -- --- Ocarina is maintained by the Ocarina team -- --- (ocarina-users@listes.enst.fr) -- +-- You should have received a copy of the GNU General Public License and -- +-- a copy of the GCC Runtime Library Exception along with this program; -- +-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- +-- . -- +-- -- +-- Ocarina is maintained by the TASTE project -- +-- (taste-users@lists.tuxfamily.org) -- -- -- ------------------------------------------------------------------------------ -- GitLab