[SCM] keditbookmarks packaging branch, master, updated. 498f08350d02acedffaeebb61ebb8f21415d7c76

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/keditbookmarks.git;a=commitdiff;h=498f083

The following commit has been merged in the master branch:
commit 498f08350d02acedffaeebb61ebb8f21415d7c76
Author: Pino Toscano <pino at debian.org>
Date:   Mon Dec 25 11:19:30 2017 +0100

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0280a2b..f0c4a29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ keditbookmarks (17.08.3-0r1) UNRELEASED; urgency=medium
     libqt5x11extras5-dev, libx11-dev, pkg-config, and qtwebengine5-dev.
   * Do not ship the development symlinks.
   * Update lintian overrides.
+  * Update copyright.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 18:00:34 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 162c8b7..ac50c90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
-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: keditbookmarks
-Source: http://download.kde.org
 
 Files: *
-Copyright: (C) 2000, 2010 David Faure <faure at kde.org>
- (C) 2005 Daniel Teske <teske at squorn.de>
- (C) 2002-2003 Alexander Kellett <lypanov at kde.org>
+Copyright: 2000, 2010 David Faure <faure at kde.org>
+           2002-2003 Alexander Kellett <lypanov at kde.org>
+           2005 Daniel Teske <teske at squorn.de>
 License: GPL-2 or GPL-3
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@@ -20,8 +19,55 @@ License: GPL-2 or GPL-3
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>
 
+Files: doc/*
+Copyright: Frerich Raabe <raabe at kde.org
+           Pamela Roberts <pamroberts at blueyonder.co.uk>
+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'.
+
+Files: po/uk/keditbookmarks.po
+Copyright: 2007, 2008 Ivan Petrouchtchak <fr.ivan at ukrainian-orthodox.org>
+           2008, 2009, 2010, 2011, 2016, 2017 Yuri Chornoivan <yurchor at ukr.net>
+License: LGPL-2-or-3-eV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+
+Files: src/kbookmarkmerger.cpp
+Copyright: 2005 Frerich Raabe <raabe at kde.org>
+License:
+ 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 above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ 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.
+
 Files: debian/*
-Copyright: (C) 2016 Raymond Wooninck <tittiatcoke at gmail.com>
+Copyright: 2016 Raymond Wooninck <tittiatcoke at gmail.com>
+           2017 Pino Toscano <pino at debian.org>
 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

-- 
keditbookmarks packaging