[SCM] kdegraphics-strigi-analyzer packaging branch, master, updated. debian/4.7.4-2-6-g0ddb64c

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdegraphics-strigi-analyzer.git;a=commitdiff;h=0ddb64c

The following commit has been merged in the master branch:
commit 0ddb64c9747a6619f4bf3416c42420e130655518
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 14:55:35 2012 +0200

    copyright: convert to copyright-format v1.0, fix/update
---
 debian/changelog |    1 +
 debian/copyright |   62 ++++++++++++++++++++++++-----------------------------
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bdf74ca..c61b467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kdegraphics-strigi-analyzer (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>  Sun, 17 Jun 2012 14:41:18 +0200
 
diff --git a/debian/copyright b/debian/copyright
index ffe7430..6e8a08e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KDEGraphics Strigi Analyzer
 Upstream-Contact: kde-devel at kde.org
 Source: ftp.kde.org
@@ -8,13 +8,11 @@ Comment: This package was developed for Ubuntu by the Kubuntu Developers and
 
 Files: *
 Copyright: 2002, Ignacio Castaño <castano at ludicon.com>
-           2002, Matthias Witzgall <witzi at gmx.net>
            2003, 2006, Brad Hards <bradh at frogmouth.net>
            2005, Steffen Hansen <hansen at kde.org>
            2002, Nadeem Hasan <nhasan at kde.org>
            2003, Volker Krause <vkrause at kde.org>
            2004, Melchior FRANZ <mfranz at kde.org>
-           2007, Jos van den Oever <jos at vandenoever.info>
 License: GPL-2
 
 Files: dvi/dviendanalyzer.cpp
@@ -29,7 +27,7 @@ License: LGPL-2+
 Files: raw/parse.c
 Copyright: 2004, Dave Coffin <dcoffin a cybercom o net>
            Steffen Hansen <hansen at kde.org>
-License:
+License: other
  dcraw.c:
  No license is required to download and use dcraw.c.  However,
  to lawfully redistribute dcraw, you must either (a) offer, at
@@ -52,43 +50,39 @@ Files: debian/*
 Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2
 
-License: LGPL-2
- This program 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 of the License, or
- (at your option) any later version.
+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 as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ 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 Lesser General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
 License: GPL-2
- 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 2 of the License.
+ 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 version 2.
  .
- 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.
+ 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.  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 General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
kdegraphics-strigi-analyzer packaging