[SCM] kgpg packaging branch, master, updated. 18c40e51dac72972b74831244a71c214e1155c68

[Sune Vuorela]

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

The following commit has been merged in the master branch:
commit 71c7d30d1c3dca260e6cfc4ef354d835ee67d711
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Jun 17 13:58:24 2012 +0200

    fix up debian/copyright
---
 debian/copyright |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0265644..316ac47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,5 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kgpg
-Source: ftp://ftp.kde.or
+Source: ftp://ftp.kde.org
 
 Files: *
 Copyright: 2006-2012, Rolf Eike Beer <kde at opensource.sf-tec.de>
@@ -10,7 +9,7 @@ Copyright: 2006-2012, Rolf Eike Beer <kde at opensource.sf-tec.de>
 	   2011, Philip Greggory Lee <rocketman768 at gmail.com>
 	   2003, Waldo Bastian <bastian at kde.org>
 	   2007, Lukas Kropatschek <lukas.krop at gmail.com>
-License: GPL-2+
+License: Mix of GPL v2+ and GPLv2 or GPLv3 or later editions as approved by KDE eV
 
 Files: debian/*
 Copyright: 2012, Eshat Cakar <info at eshat.de>
@@ -34,3 +33,21 @@ License: GPL-2+
  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: GPLv2 or GPLv3 or later editions as approved by KDE eV
+ This program 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) version 3 or any later version
+ 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/>.
+ 

-- 
kgpg packaging