[SCM] kaffeine packaging branch, master, updated. debian/2.0.5-1-9-g02c4527

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=18ef89e

The following commit has been merged in the master branch:
commit 18ef89ec751d3714dfdda0e2a2035371202813f4
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 17:56:25 2017 +0200

    more fixes to copyright
---
 debian/copyright | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f6a2faa..a96599e 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: kaffeine
 Upstream-Contact: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
 Source: https://www.kde.org/applications/multimedia/kaffeine/
@@ -10,7 +10,7 @@ License: GPL-2+
 
 Files: cmake/modules/*
 Copyright: 2011, Michael Jansen <info at michael-jansen.biz>
-           2016-2017, Pino Toscano <pino at kde.org>
+           2016, Pino Toscano <pino at kde.org>
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,44 +41,16 @@ Copyright: 2000, Marcus Metzler <marcus at convergence.de>
            2000, Holger Waechtler <holger at convergence.de>
            2000, Andre Draszik <ad at convergence.de>
 License: LGPL-2.1+
- 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.1
- of the License, or (at your option) any later version.
- .
- 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 Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- .
  On Debian systems, the complete texts of the GNU Lesser General Public
  Licenses version 2.1 or any later version can be found in
  `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
 
 Files: debian/*
-Copyright: 2009-2010 Fathi Boudra <fabo at debian.org>
-           2016, Pino Toscano <pino at debian.org>
+Copyright: 2009-2010, Fathi Boudra <fabo at debian.org>
+           2016-2017, Pino Toscano <pino at debian.org>
 License: GPL-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, or
- (at your option) any later version.
- .
- 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 program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
  On Debian systems, the complete texts of the GNU General Public Licenses
  version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
  `/usr/share/common-licenses/GPL-3'.

-- 
kaffeine packaging