[SCM] libkdeedu packaging branch, master, updated. debian/4.7.4-2-6-ged7805d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ed7805d9dc60b2843cdea3aee5142f43a66545ba
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 00:14:03 2012 +0200

    copyright: convert to copyright-format v1.0, and fix/update
---
 debian/changelog |    1 +
 debian/copyright |   53 +++++++++--------------------------------------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9539e63..629de7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libkdeedu (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to 4.8.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Add watch file.
+  * Convert copyright to copyright-format v1.0 and fix/update.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Jun 2012 23:34:45 +0200
 
diff --git a/debian/copyright b/debian/copyright
index cad482d..688be06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,20 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Comment: This package was developed for Ubuntu by the Kubuntu Developers and
  modified to be included in Debian. See below the copyright holders for debian/*
  files.
 
 Files: *
-Copyight: 2007-2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net>
-          2007 Jeremy Whiting <jpwhiting at kde.org>
-          1999-2002 Ewald Arnold <kvoctrain at ewald-arnold.de>
-          2004, 2005, 2007 Peter Hedlund <peter.hedlund at kdemail.net>
+Copyright: 1999-2002 Ewald Arnold <kvoctrain at ewald-arnold.de>
+           2004-2008 Peter Hedlund <peter.hedlund at kdemail.net>
+           2005 Eric Pignet <eric at erixpage.com>
+           2007-2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net> <gladhorn at kde.org>
+           2007 Jeremy Whiting <jpwhiting at kde.org> <jeremy at scitools.com>
+           2008 David Capel <wot.narg at gmail.com>
 License: GPL-2+
 
 Files: LibKdeEduConfig.cmake.in
-Copyright: 2008  Andreas Pakulat <apaku at gmx.de>
-           2010  Niko Sams <niko.sams at gmail.com>
+Copyright: 2008 Andreas Pakulat <apaku at gmx.de>
+           2010 Niko Sams <niko.sams at gmail.com>
 License: BSD-3-clause
 
 Files: keduvocdocument/libkeduvocdocument_export.h
@@ -95,43 +97,6 @@ License: LGPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2'.
 
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
-
-License: GPL-3
- 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 3 of the License, or
- (at your option) any later version.
- .
- 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/>.
- .
- On Debian systems, the full text of the GNU General Public License 
- version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

-- 
libkdeedu packaging