[SCM] parley packaging branch, master, updated. debian/4.13.1-1-123-g80421b1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/parley.git;a=commitdiff;h=d6923c1

The following commit has been merged in the master branch:
commit d6923c127de62238149dee7afbc062f5e1b717a0
Author: Michał Zając <quintasan at kubuntu.org>
Date:   Mon Jul 11 10:56:39 2011 +0200

    Relicense packaging to GPL-2.0+, Add doc/* to debian/copyright and mention added GFDF 1.2 license to tarball
---
 debian/changelog |  4 ++--
 debian/copyright | 37 +++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c267e9..f2cc09a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 parley (4:4.6.90+repack-0ubuntu1) UNRELEASED; urgency=low
 
   * Initial release (parley moved out of kdeedu)
-  * Repacked tarball to include COPYING
+  * Repacked tarball to include a copy of GPL-2 and GFDL-1.2
 
- -- Michał Zając <quintasan at kubuntu.org>  Tue, 05 Jul 2011 22:29:08 +0200
+ -- Michał Zając <quintasan at kubuntu.org>  Mon, 11 Jul 2011 10:54:49 +0200
diff --git a/debian/copyright b/debian/copyright
index 939d1c6..0befb61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,26 +11,15 @@ Copyright: 2007-2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net>
 	   1999-2001 Ewald Arnold <kvoctrain at ewald-arnold.de>
 License: GPL-2.0+
 
+Files: doc/*
+Copyright: 2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net>
+           2010 Daniel Laidig <d.laidig at gmx.de>
+	   2010 Sabine Eller <s.eller at voxhumanitatis.org>
+License: GFDL-1.2
+
 Files: debian/*
 Copyright: 2011 Michał Zając <quintasan at kubuntu.org>
-License: GPL-3.0+
-
-License: GPL-3.0+
- This package 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 3 of the License, or
- (at your option) any later version.
- .
- This package 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 <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+License: GPL-2.0+
 
 License: GPL-2.0+
  This package is free software; you can redistribute it and/or modify
@@ -48,3 +37,15 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GFDL-1.2
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ .
+ On Debian systems, the full text of the GNU Free Documentation
+ License version 1.2 can be found in the file
+ `/usr/share/common-licenses/GFDL-1.2'.

-- 
parley packaging