This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 40ce45d4e09159bae605bb7744d88b25b1563ca6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 2 11:38:15 2021 +0200 debian/copyright: add new license "GPL-2+~OpenSSL" for the modified GPL 2+ license including the OpenSSL exception and use that where appropriate. Pulled from Mike's changes. --- debian/changelog | 3 +++ debian/copyright | 74 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26bfb08..6e1f320 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium Pulled from Mike's changes. * debian/copyright: + Switch Upstream-Contact to myself. Pulled from Mike's changes. + + Add new license "GPL-2+~OpenSSL" for the modified GPL 2+ license + including the OpenSSL exception and use that where appropriate. Pulled + from Mike's changes. * debian/: + New file "watch". We won't need this per se (since we're upstream and there cannot be a newer version of the Debian package without releasing diff --git a/debian/copyright b/debian/copyright index 7fa9676..1d1d97f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,42 +7,7 @@ Files: * Copyright: 2005-2020, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> 2005-2020, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2005-2020, obviously nice - https://www.obviously-nice.de -License: GPL-2+ - 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 package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. -Comment: - Quoting from README.OpenSSL-Exception... - . - * 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. +License: GPL-2+~OpenSSL Files: Makefile.docupload Copyright: 2010-2020, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -67,6 +32,8 @@ Files: debian/* Copyright: 2007-2020, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> 2011-2020, Reinhard Tartler <siretart@tauware.de> 2011-2020, Mike Gabriel <sunweaver@debian.org> +License: GPL-2+ or GPL-2+~OpenSSL + License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -88,3 +55,38 @@ License: GPL-2+ On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. + +License: GPL-2+~OpenSSL + 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + . + 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. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git