The branch, master has been updated via 74cdf077242ce11351cc8fd238fe39d9b35bcacb (commit) from 68d7a9d5781cfa069141d5f7a596a2508666739a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 74cdf077242ce11351cc8fd238fe39d9b35bcacb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Apr 12 01:06:53 2012 +0200 fix license / copyright passages ----------------------------------------------------------------------- Summary of changes: LICENSE => LICENSE.txt | 0 Makefile.docupload | 2 +- README | 4 ++-- debian/copyright | 13 +++++++++---- debian/python-x2go.docs | 1 + debian/rules | 2 +- examples/x2go_resume_session.py | 2 +- examples/x2go_start_session.py | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) rename LICENSE => LICENSE.txt (100%) The diff of changes is: diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/Makefile.docupload b/Makefile.docupload index f8386cd..aa4869d 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for python-x2go -# Copyright 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3+ applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/README b/README index 21b921f..e4af585 100644 --- a/README +++ b/README @@ -47,8 +47,8 @@ and wholeheartedness concerning this inner process. - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go applications... it's highly recommended -=== Current features === +=== Current features === * start X2Go agent session * suspend X2Go session @@ -65,8 +65,8 @@ and wholeheartedness concerning this inner process. * desktop sharing (shadow sessions) * color depth auto-recognition -=== Installation === +=== Installation === Ubuntu: ------- diff --git a/debian/copyright b/debian/copyright index 2256bf0..5a23998 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de +Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Python X2Go is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -15,11 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -On Debian/Ubuntu systems a copy of the AGPLv3 license unfortunately -cannot be found at /usr/share/common-licenses/ (see #634607) and is -shipped with this package in /usr/share/doc/python-x2go/LICENSE.gz. +Published under the terms of the GNU Affero General Public License. +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@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/python-x2go.docs b/debian/python-x2go.docs index 415a02b..6c900fe 100644 --- a/debian/python-x2go.docs +++ b/debian/python-x2go.docs @@ -1,5 +1,6 @@ README README.Trinity-Desktop TODO +LICENSE.txt .epydoc/html/ #.epydoc/pdf/ diff --git a/debian/rules b/debian/rules index a912612..c1d1c52 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file - for python-x2go # Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> PYVERS=$(shell pyversions -vr) diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py index d755860..5fdb29a 100644 --- a/examples/x2go_resume_session.py +++ b/examples/x2go_resume_session.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py index 48244e4..d260f64 100644 --- a/examples/x2go_start_session.py +++ b/examples/x2go_start_session.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).