[SCM] smplayer/master: clear copyright

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Sun May 3 20:04:32 UTC 2015


The following commit has been merged in the master branch:
commit cf8835b292d5b2e9d7b4530963a1dedf23b32ab6
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun May 3 21:56:19 2015 +0200

    clear copyright

diff --git a/debian/copyright b/debian/copyright
index c04d0bb..fedadaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,8 +48,6 @@ License: LGPL-2+
 Files: src/findsubtitles/filedownloader/main.cpp:
 Copyright: 2004-2008, Trolltech ASA
 License: LGPL-2.1+
-
-License: LGPL-2.1+
  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
@@ -90,28 +88,3 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-License: BSD-2-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.
- .
- 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 OR
- CONTRIBUTORS 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.
- .
- The views and conclusions contained in the software and documentation are those of the
- authors and should not be interpreted as representing official policies, either expressed
- or implied, of the author.

-- 
smplayer packaging



More information about the pkg-multimedia-commits mailing list