[SCM] ksaneplugin packaging branch, master, updated. debian/4.7.4-2-6-g59e0573

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 59e0573fb8f90fa67421e96a37c61859944ba019
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 17:27:32 2012 +0200

    copyright: convert to copyright-format v1.0, fix
---
 debian/changelog |    1 +
 debian/copyright |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2da888b..a8f7891 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ksaneplugin (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev and libksane-dev build dependencies 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.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jun 2012 17:20:25 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b75e2af..941fa81 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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/
 Upstream-Name: ksaneplugin
 Source: ftp.kde.org
 Comment: This package was developed for Ubuntu by the Kubuntu Developers and
@@ -7,7 +7,7 @@ Comment: This package was developed for Ubuntu by the Kubuntu Developers and
 
 Files: *
 Copyright: 2008, Kare Sars <kare dot sars at iki dot fi>
-License: LGPL-2.1
+License: LGPL-2.1-or-LGPL-3-or-eV
 
 Files: cmake/*
 Copyright: 2008, Kare Sars <kare dot sars at iki dot fi>
@@ -15,9 +15,9 @@ License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-License: LGPL-2.1
+License: LGPL-2.1-or-LGPL-3-or-eV
 
-License: LGPL-2.1
+License: LGPL-2.1-or-LGPL-3-or-eV
  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
@@ -33,9 +33,9 @@ License: LGPL-2.1
  You should have received a copy of the GNU Lesser General Public
  License along with this program.  If not, see <http://www.gnu.org/licenses/>
  .
- 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.1'.
+ On Debian systems, the full texts of the GNU Lesser General Public Licenses
+ version 2 and 3 can be found resp. in `/usr/share/common-licenses/LGPL-2.1'
+ and `/usr/share/common-licenses/LGPL-3'.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without

-- 
ksaneplugin packaging