[SCM] pairs packaging branch, master, updated. debian/4.10.2-1-2-g87d3e4e

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 87d3e4e4f37811ade16e19e0389b068b5ab87273
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 15 15:29:11 2013 +0200

    copyright: improve
---
 debian/changelog |    2 ++
 debian/copyright |   17 ++++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 676f7dc..3030936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 pairs (4:4.10.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Improve copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Apr 2013 15:25:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 91b2add..51d9628 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,26 +3,17 @@ Upstream-Contact: kde-edu at kde.org
 Source: ftp.kde.org
 
 Files: *
+Copyright:
  Copyright (C) 2007-2010 <Albert Astals Cid> <aacid at kde.org>
  Copyright (C) 2010-2012 <Aleix Pol> <aleixpol at kde.org>
  Copyright (C) 2011-2012 <Marco Calignano> <marco.calignano at gmail.com>
  Copyright (C) 2012 <Heena Mahour> <heena393 at gmail.com>
-
-
+License: GPL-2+3+eV
 
 Files: debian/*
 Copyright: 2013, Sune Vuorela <sune at debian.org>
 License: GPL-2+
 
-License: GFDL-NIV-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.
- .
- On Debian systems, the complete text of the GNU Free Documentation License
- version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
-
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -52,12 +43,12 @@ License: GPL-2+3+eV
  accepted by the membership of KDE e.V. (or its successor approved
  by the membership of KDE e.V.), which shall act as a proxy
  defined in Section 14 of version 3 of the license.
- 
+ .
  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, see <http://www.gnu.org/licenses/>.
  .

-- 
pairs packaging