[SCM] baloo packaging branch, master, updated. debian/4.14.2-1-7-g22e149c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 55238b4eb0a2417baeba9857d8fa2df93c846a88
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jul 28 08:00:57 2016 +0200

    copyright: small fixes
---
 debian/changelog | 1 +
 debian/copyright | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9586c05..efb9450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ baloo (4:4.14.3-0r1) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Remove obsolete Ubuntu fields.
   * Rename XS-Testsuite field as Testsuite.
+  * Small fixes to copyright.
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jul 2016 07:52:05 +0200
 
diff --git a/debian/copyright b/debian/copyright
index ec30424..ddc5e66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: baloo
 Source: git://anongit.kde.org/baloo
 
@@ -9,7 +9,7 @@ Copyright: 2010, 2010-13, 2010-14, 2011-2014 Vishesh Handa <me at vhanda.in>
            2013 Daniel Vrátil <dvratil at redhat.com>
            2014  Christian Mollekopf <mollekopf at kolabsys.com>
            2014 Laurent Montel <montel at kde.org>
-License: LGPL 2.1 or 3 or approved by KDE e.V.
+License: LGPL-2.1-or-LGPL-3-or-approved-by-KDE-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
@@ -47,7 +47,7 @@ Files:  src/file/eventmonitor.cpp
         src/kioslaves/timeline/timelinetools.h
 Copyright: 2008 Sebastian Trueg <trueg at kde.org>
            2010-14 Vishesh Handa <me at vhanda.in>
-License: LGPL-2
+License: GPL-2-or-GPL-3-or-approved-by-KDE-eV
  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
@@ -102,7 +102,7 @@ Files: icons/*
        src/pim/agent/abstractindexer.cpp
 Copyright: 2013 Vishesh Handa <me at vhanda.in>
            2007 David Faure <faure at kde.org>
-License: GPL 2 or 3 or approved by KDE e.V.
+License: GPL-2-or-GPL-3-or-approved-by-KDE-eV
  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

-- 
baloo packaging