[SCM] kanagram packaging branch, kubuntu_stable, updated. debian/4.14.2-1-29-g41ef8e5

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Aug 12 09:21:11 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kanagram.git;a=commitdiff;h=41ef8e5

The following commit has been merged in the kubuntu_stable branch:
commit 41ef8e586de4473d50ad6504b0c6ff5bdf9349bf
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 12 11:21:06 2015 +0200

    remove duplicated gpl2 definition by Clive Johnston
---
 debian/copyright | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b7af9a7..7e00677 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,16 @@ Files: *
 Copyright: 2005 Joshua Keel <joshuakeel at gmail.com>
            2007 Jeremy Whiting <jeremy at scitools.com>
 License: GPL-2+
+
+Files: doc/*
+Copyright: 2005 Danny Allen
+License: GFDL-1.2
+
+Files: debian/*
+Copyright: 2011 Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+License: GPL-2+
+
+License: GPL-2+
  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 2 of the License, or
@@ -22,8 +32,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: doc/*
-Copyright: 2005 Danny Allen
 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
@@ -34,22 +42,3 @@ License: GFDL-1.2
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GFDL-1.2"
-
-Files: debian/*
-Copyright: 2011 Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-License: GPL-2+
- 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 2 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 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
kanagram packaging



More information about the pkg-kde-commits mailing list