[SCM] kgeography packaging branch, master, updated. 26dd20790caf58983e149c53059dec703949f94f

Eshat Cakar eshat-guest at alioth.debian.org
Mon Oct 24 21:41:19 UTC 2011


The following commit has been merged in the master branch:
commit c2b5109374ebaae40e9880b2495382e29c346cf2
Author: Eshat Cakar <info at eshat.de>
Date:   Mon Oct 24 23:33:47 2011 +0200

    add us to compyright, and make it DEP-5 correct
---
 debian/copyright |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 208ea57..e6571ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,16 +20,9 @@ Files: doc/*
 Copyright: 2005, Anne-Marie Mahfouf
            2008, Kushal Das
 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.
- .
- 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'.
 
 Files: debian/*
+Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2+
 
@@ -54,3 +47,13 @@ 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: 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.
+ .
+ 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'.

-- 
kgeography packaging



More information about the pkg-kde-commits mailing list