[X2Go-Commits] [python-x2go] 01/03: debian/copyright: Relicense packaging files under same license as upstream files.

git-admin at x2go.org git-admin at x2go.org
Wed Nov 12 06:17:01 CET 2014


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

x2go pushed a commit to branch master
in repository python-x2go.

commit e015a953b57eafa31db3611cb3e1a40354b961a8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 21 01:06:34 2014 +0200

    debian/copyright: Relicense packaging files under same license as upstream files.
---
 debian/changelog |    2 ++
 debian/copyright |   20 +-------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca7c78c..a7be44b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ python-x2go (0.5.0.2-0x2go1) UNRELEASED; urgency=medium
     - Continue development...
   * debian/control:
     + Bump Standards: to 3.9.6. No changes needed.
+  * debian/copyright:
+    + Relicense packaging files under same license as upstream files.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 20 Oct 2014 23:30:04 +0200
 
diff --git a/debian/copyright b/debian/copyright
index adf56c5..eea667c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,25 +40,7 @@ License: GPL-3+
 
 Files: debian/*
 Copyright: 2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-License: GPL-2+
- Python X2Go 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.
- .
- Python X2Go 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.
- .
- 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: AGPL-3+
 
 License: AGPL-3+
  Python X2Go is free software; you can redistribute it and/or modify

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list