This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 88c5821fc3a4a8d32304c9ba58d6db5a8cbe83e2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 2 11:44:17 2021 +0200 debian/copyright: move GPL-3 definition out-of-line. Pulled from Mike's changes. --- debian/changelog | 1 + debian/copyright | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e1f320..78c29c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium + 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. + + Move GPL-3 definition out-of-line. 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 1d1d97f..256ba05 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,21 +12,6 @@ License: GPL-2+~OpenSSL Files: Makefile.docupload Copyright: 2010-2020, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-3 - 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 3 of the License. - . - 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 <https://www.gnu.org/licenses/>. - . - On Debian systems, the full text of the GNU General Public - License version 3 can be found in the file - `/usr/share/common-licenses/GPL-3'. Files: debian/* Copyright: 2007-2020, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> @@ -90,3 +75,20 @@ License: GPL-2+~OpenSSL 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-3 + 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 3 of the License. + . + 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 <https://www.gnu.org/licenses/>. + . + On Debian systems, the full text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git