[SCM] kalgebra packaging branch, master, updated. debian/4.7.4-2-14-g284cddd

[José Manuel Santamaría Lema]

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

The following commit has been merged in the master branch:
commit 284cddd488f887ba468a7d3a8c697b923b9e2217
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Jun 17 20:01:16 2012 +0200

    Update copyright file.
---
 debian/changelog |    1 +
 debian/copyright |   35 ++++++-----------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db9a560..acf062f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ kalgebra (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Update installed files.
   * Bump Standards-Version to 3.9.3, no changes needed.
   * Add watch file.
+  * Update copyright file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jun 2012 03:12:19 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c2bfebd..dd3986c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,24 @@
-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: *
-Copyright: 2007-2011 by Aleix Pol <aleixpol at kde.org>
-           2010 by Percy Camilo T. Aucahuasi <percy.camilo.ta at gmail.com>
+Copyright: 2007-2011 Aleix Pol <aleixpol at kde.org>
+           2010 Percy Camilo T. Aucahuasi <percy.camilo.ta at gmail.com>
 License: GPL-2+
 
-Files: analitza/analitzaexport.h analitza/pushvalue.h
-Copyright: 2006 Matt Rogers <mattr at kde.org>
-           2004 Jaroslaw Staniek <js at iidea.pl>
-           2007-2008 David Nolden <david.nolden.kdevelop at art-master.de>
-License: LGPL-2
-
 Files: debian/*
 Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+           2012 José Manuel Santamaría Lema <panfaust at gmail.com>
 License: GPL-2+
 
 Files: doc/*
 Copyright: 2007 Aleix Pol
 License: GFDL-1.2
 
-Files: cmake/FindReadline.cmake
+Files: cmake/*
+Copyright: 2011 Aleix Pol <aleixpol at kde.org>
 License: BSD-3-clause
 
 License: GPL-2+
@@ -44,25 +40,6 @@ License: GPL-2+
  version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: LGPL-2
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
- .
- 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  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 Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-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

-- 
kalgebra packaging