[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.7-1-20-gda6f820

Sun Mar 27 10:59:30 UTC 2016

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

The following commit has been merged in the master branch:
commit da6f820aa27d1c50ddcfb430bf4684f4290faf14
Author: Pino Toscano <pino at debian.org>
Date:   Sun Mar 27 12:58:55 2016 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 89 +++++++++++++++++++++++---------------------------------
 2 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4156c59..8356cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ subtitlecomposer (0.6.2-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.7, no changes required.
   * Remove no more useful Build-Conflicts: qt5-default.
   * Switch mplayer2 suggest to mplayer.
+  * Update copyright.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 27 Mar 2016 08:57:39 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0cb4bca..84d7f82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,35 +3,48 @@ Upstream-Name: subtitlecomposer
 Source: https://github.com/maxrd2/subtitlecomposer
 
 Files: *
-Copyright: 2007-2009, Sergio Pistone (sergio_pistone at yahoo.com.ar) based on Kaffeine by Jürgen Kofler
-           2007-2009, Sergio Pistone (sergio_pistone at yahoo.com.ar) based on smplayer by Ricardo Villalba
-           2007-2012, Sergio Pistone (sergio_pistone at yahoo.com.ar)
-           2013, Mladen Milinkovic (max at smoothware.net)
-           2006-2008, Ricardo Villalba (rvm at escomposlinux.org)
+Copyright: 2006-2008, Ricardo Villalba <rvm at escomposlinux.org>
+           2007-2009, Sergio Pistone <sergio_pistone at yahoo.com.ar> based on Kaffeine by Jürgen Kofler
+           2007-2009, Sergio Pistone <sergio_pistone at yahoo.com.ar> based on smplayer by Ricardo Villalba
+           2007-2012, Sergio Pistone <sergio_pistone at yahoo.com.ar>
+           2010-2016, Mladen Milinkovic <max at smoothware.net>
 License: GPL-2+
 
-Files: src/main/utils/kfind_p.h
-       src/main/utils/kreplace.cpp
-       src/main/utils/kreplace.h
-Copyright: 2001, S.R.Haque <srhaque at iee.org>.
-           2002, David Faure <david at mandrakesoft.com>
-           2004, Arend van Beelen jr. <arend at auton.nl>
-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 version 2, as published by the Free Software Foundation.
+Files: cmake/*
+Copyright: 2006-2008, Laurent Montel <montel at kde.org>
+           2006-2007, Matthias Kretz <kretz at kde.org>
+           2006, Tim Beaulen <tbscope at gmail.com>
+           2008, Helio Chissini de Castro <helio at kde.org>
+           2009, Nokia Corporation
+           2010, Yury G. Kudryashov <urkud at ya.ru>
+           2011, Raphael Kubo da Costa <kubito at gmail.com>
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
- 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
- Library General Public License for more details.
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
  .
- The complete text of the GNU Library General Public License version 2 can be
- found in the `/usr/share/common-licenses/LGPL-2' file.
+ 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: src/common/qxtsignalwaiter.cpp
        src/common/qxtsignalwaiter.h
-Copyright: 2006, Adam Higerd ahigerd at stratitec.com
+Copyright: 2006, Adam Higerd <ahigerd at stratitec.com>
 License: LGPL-2.1+_or_GPL-2+
  QxtSignalWaiter is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -54,38 +67,10 @@ License: LGPL-2.1+_or_GPL-2+
  text of the GNU Lesser General Public License version 2.1 can be found in
  `/usr/share/common-licenses/LGPL-2.1'.
 
-Files: src/services/FindGStreamer.cmake
-Copyright: 2012, Raphael Kubo da Costa <rakuco at webkit.org>
-License: BSD-2-Clause
-
-Files: src/services/xine/FindXCB.cmake
-Copyright: 2007, Matthias Kretz <kretz 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
- 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.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- 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: 2009, José Manuel Santamaría Lema <panfaust at gmail.com>
+           2015, Martin Steghöfer <martin at steghoefer.eu>
+           2016, Pino Toscano <pino at debian.org>
 License: GPL-2+
 
 License: GPL-2+

-- 
subtitlecomposer packaging

