[X2Go-Commits] [x2goserver] 01/03: Makefile.docupload: Switch license to GPL-2+.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 7e4503444438623d9a221968fcb841c4bf795c59
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 18 03:12:24 2018 +0100

    Makefile.docupload: Switch license to GPL-2+.
---
 Makefile.docupload | 17 ++++++++++++++++-
 debian/changelog   |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile.docupload b/Makefile.docupload
index c7922d9..10eab5d 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,21 @@
 #!/usr/bin/make -f
 # Makefile.docupload file - for x2goserver
-# Copyright 2010-2015 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3 applies to this file
+# Copyright (C) 2010-2015 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+# 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
diff --git a/debian/changelog b/debian/changelog
index df7189b..165656d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     - x2goserver-x2goagent/bin/x2goagent: Fix license version (GPL-2+ not 3+).
       This script however is obsolete and should be replaced by a symlink to
       $BINDIR/nxagent.
+    - Makefile.docupload: Switch license to GPL-2+.
   * debian/control:
     + Change D (x2goserver-xsession) on perl-modules to perl. The existence of
       the perl-modules package is an implementation detail of the Debian Perl

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git