[SCM] analitza packaging branch, master, updated. f0da9c1087cbba8ce8d2a746d1e48d5879dad769

[José Manuel Santamaría Lema]

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

The following commit has been merged in the master branch:
commit f0da9c1087cbba8ce8d2a746d1e48d5879dad769
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Jun 17 19:37:15 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index c3f9a9c..a7d406e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ analitza (4:4.8.4-0r2) UNRELEASED; urgency=low
   * Update symbols 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>  Thu, 26 Jan 2012 17:32:13 +0100
 
diff --git a/debian/copyright b/debian/copyright
index c2bfebd..5babcff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,8 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
-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.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 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
@@ -16,13 +13,11 @@ 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+
@@ -63,38 +58,3 @@ License: LGPL-2
  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
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
- .
- 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'.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products 
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
analitza packaging