[X2Go-Commits] [x2goclient] 08/24: license change to AGPLv3+

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.2.0.3
in repository x2goclient.

commit c522c0a7e5bce527de073a51db4adb165f3e9d69
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 12 01:08:30 2012 +0200

    license change to AGPLv3+
---
 debian/copyright       | 11 ++++++-----
 debian/pyhoca-cli.docs |  1 +
 debian/rules           |  2 +-
 setup.py               |  6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 95295add..9e0534c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 PyHoca-CLI is free software; you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -16,13 +16,14 @@ Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 Published under the terms of the GNU Affero General Public License.
-See http://www.gnu.org/licenses/gpl.html for a recent copy.
-
-On Debian systems a local copy of the GPL license can also be 
-found in /usr/share/common-licenses.
+See http://www.gnu.org/licenses/agpl-3.0.txt for a recent copy.
 
 The code has been packaged for Debian by Mike Gabriel
 <mike.gabriel at das-netzwerkteam.de>
 
+For the contained packaging files for Debian/Ubuntu, however, the
+,,normal'' GNU General Public License (version 3 or higher) applies. 
+A copy of this license can also be found at /usr/share/common-licenses/.
+
 light+love,
 Mike Gabriel
diff --git a/debian/pyhoca-cli.docs b/debian/pyhoca-cli.docs
index efae7f1a..0199bc07 100644
--- a/debian/pyhoca-cli.docs
+++ b/debian/pyhoca-cli.docs
@@ -1,3 +1,4 @@
 README
 TODO
+LICENSE.txt
 .build_man2html/html
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index f4ddccc9..0c539067 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file - for pyhoca-cli
 # Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010 by Mike Gabriel
+# Copyright 2010-2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 PYVERS=$(shell pyversions -vr)
 
diff --git a/setup.py b/setup.py
index 6f04946d..b3f0120e 100755
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,10 @@ from setuptools import setup, find_packages
 import pyhoca.cli
 
 setup(
-    name = "PyHoca CLI",
+    name = "PyHoca-CLI",
     version = pyhoca.cli.__VERSION__,
-    description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.",
-    license = 'GPL',
+    description = "PyHoca-CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.",
+    license = 'AGPLv3+',
     author = 'Mike Gabriel',
     url = 'http://www.x2go.org',
     packages = [ 'pyhoca.cli', ],

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