Revert "License update"

AUTHORS

@@ -1,56 +1,4 @@
-Authors of Remmina Project
+Please check the application About dialog or the official web site for a full list of authors.
 
-    Aaron Small <aaron.small@shadnet.shad.ca>
-    Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-    aihtdikh <aihtdikh@users.sourceforge.net>
-    Alexander Logvinov <avl@logvinov.com>
-    Andrey Gankov <gankov@opensuse.org>
-    Antenore Gatta <antenore@simbiosi.org>
-    Antonio Guillen <antonio@guillen.com.es>
-    Benjamin Podszun <benjamin.podszun@gmail.com>
-    Ben Kohler <bkohler@gmail.com>
-    Christopher Rawlings <chris.rawlings+git@gmail.com>
-    Daniel M. Weeks <dan@danweeks.net>
-    Dmitry Kubatkin <maelnor@gmail.com>
-    dupondje <jean-louis@dupondje.be>
-    Emmanuel Grognet <emmanuel@grognet.fr>
-    Frank Bongrand <fbongrand@free.fr>
-    Giovanni Panozzo <giovanni@panozzo.it>
-    Iain Lane <iain.lane@canonical.com>
-    Jay Carlson <nop@nop.com>
-    Jean-Louis Dupond <jean-louis@dupond.be>
-    Jerad Simpson <jbsimpson@gmail.com>
-    Jeremy Bicha <jbicha@ubuntu.com>
-    Kirill Müller <krlmlr@users.noreply.github.com>
-    Kyle Sanderson <kyle.leet@gmail.com>
-    llyzs <llyzs@b6cfa94a-2857-405c-b0d6-536ef9fc39e1>
-    Luca Falavigna <dktrkranz@debian.org>
-    Marc-André Moreau <marcandre.moreau@gmail.com>
-    Mike Dalessio <mike@csa.net>
-    Mike Gilbert <floppym@gentoo.org>
-    Muflone <muflone@vbsimple.net>
-    Nekhelesh Ramananthan <krnekhelesh@gmail.com>
-    Nikolay Martynov <mar.kolya@gmail.com>
-    Raphael Kubo da Costa <rakuco@FreeBSD.org>
-    Rene Rheaume <rene.rheaume@gmail.com>
-    repzilon <repzilon@users.noreply.github.com>
-    Rex Tsai <chihchun@kalug.linux.org.tw>
-    Robert Ancell <robert.ancell@canonical.com>
-    Shuhrat Dehkanov <k@efir.uz>
-    Swen Kooij <photonios@outlook.com>
-    Vic Lee <llyzs@163.com>
-    weberho <jweberhofer@weberhofer.at>
+http://remmina.sourceforge.net/contact.shtml
 
-Artists:
-
-    Martin Lettner <m.lettner@gmail.com>
-
-Documenters:
-
-    Dario Cavedon <dcavedon@gmail.com>
-
-
-
-In the case you have contributed to Remmina and you don't appera into the list,
-let us know your name, email and what modification you have done, we will add you
-immediately.

CMakeLists.txt

@@ -1,4 +1,36 @@
-# See LICENSE and COPYING files for copyright and license details.
+# Remmina - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2011 Marc-Andre Moreau
+# Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
 
 cmake_minimum_required(VERSION 2.8)
 

LICENSE

@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
             GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
              END OF TERMS AND CONDITIONS
-
+
         How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

remmina-plugins/CMakeLists.txt

@@ -1,4 +1,36 @@
-# See LICENSE and COPYING files for copyright and license details.
+# Remmina - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2011 Marc-Andre Moreau
+# Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+# Boston, MA  02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
 
 include_directories(${CMAKE_SOURCE_DIR}/remmina-plugins)
 

remmina-plugins/common/remmina_plugin.h

@@ -1,4 +1,37 @@
-/*  See LICENSE and COPYING files for copyright and license details. */
+/*
+ * Remmina - The GTK+ Remote Desktop Client
+ * Copyright (C) 2010 Vic Lee 
+ * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02110-1301, USA.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ *
+ */
 
 #ifndef __REMMINAPLUGINCOMMON_H__
 #define __REMMINAPLUGINCOMMON_H__

remmina-plugins/nx/CMakeLists.txt

@@ -1,4 +1,35 @@
-# See LICENSE and COPYING files for copyright and license details.
+# remmina-plugin-nx - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2011 Marc-Andre Moreau
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+# Boston, MA  02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
 
 set(REMMINA_PLUGIN_NX_SRCS
 	nx_session.c

remmina-plugins/nx/nx_plugin.c

@@ -1,4 +1,37 @@
-/*  See LICENSE and COPYING files for copyright and license details. */
+/*
+ * Remmina - The GTK+ Remote Desktop Client
+ * Copyright (C) 2010-2011 Vic Lee
+ * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ *
+ */
 
 #include <errno.h>
 #include <pthread.h>

remmina-plugins/nx/nx_plugin.h

@@ -1,4 +1,37 @@
-/*  See LICENSE and COPYING files for copyright and license details. */
+/*
+ * Remmina - The GTK+ Remote Desktop Client
+ * Copyright (C) 2010 Vic Lee 
+ * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02110-1301, USA.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ *
+ */
 
 #ifndef __REMMINAPLUGINNX_H__
 #define __REMMINAPLUGINNX_H__