[SCM] smplayer/master: Update debian/copyright

Sat Apr 25 18:34:58 UTC 2015

The following commit has been merged in the master branch:
commit 96272925b7f6be4c73e150396931cbbeae2ddd4f
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sat Apr 25 20:35:48 2015 +0200

    Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 28c4065..21d25c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,18 @@
 smplayer (14.9.0.6690~ds0-1) UNRELEASED; urgency=medium
 
   [ Mateusz Łukasik ]
-  * New upstream release.
+  * New upstream release. (LP: #1390937)
   * Bump standards version to 3.9.6. (no changes needed)
   * Patch working: (thanks Alf Gaida <agaida at siduction.org>) 
     - Add 03-completely_disable_check_updates.patch to completely disable
     checking updates. (Closes: #770357)
     - Add 04-not_define_reminder_actions.patch to do not define reminder
     actions (Closes: #770359)
-    - Add 06_add_unity_launcher_quicklist.patch for add Unity Launcher
+    - Add 05_add_unity_launcher_quicklist.patch for add Unity Launcher
     Quicklist. (LP: #938015)
+  * debian/rules:
+    - Remove /usr/share/doc/smplayer/es/gpl.htm
+  * Update debian/copyright.
   
   [ Alf Gaida ]
   * debian/rules:
diff --git a/debian/copyright b/debian/copyright
index 8abb1cb..c04d0bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ License: GPL-2+
 Copyright:
  2007, Cyril Breuil <cyrilbport at gmail.com>
  2008-2012, Maia Kozheva <sikon at ubuntu.com>
+ 2013-2015, Mateusz Łukasik <mati75 at linuxmint.pl>
 
 Files:
  src/myslider.cpp
@@ -46,65 +47,7 @@ License: LGPL-2+
 
 Files: src/findsubtitles/filedownloader/main.cpp:
 Copyright: 2004-2008, Trolltech ASA
-License: GPL-2 or GPL-3 or other
- This file is part of the example classes of the Qt Toolkit.
- .
- This file may be used under the terms of the GNU General Public
- License versions 2.0 or 3.0 as published by the Free Software
- Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
- included in the packaging of this file.  Alternatively you may (at
- your option) use any later version of the GNU General Public
- License if such license has been publicly approved by Trolltech ASA
- (or its successors, if any) and the KDE Free Qt Foundation. In
- addition, as a special exception, Trolltech gives you certain
- additional rights. These rights are described in the Trolltech GPL
- Exception version 1.2, which can be found at
- http://www.trolltech.com/products/qt/gplexception/ and in the file
- GPL_EXCEPTION.txt in this package.
- .
- Please review the following information to ensure GNU General
- Public Licensing requirements will be met:
- http://trolltech.com/products/qt/licenses/licensing/opensource/. If
- you are unsure which license is appropriate for your use, please
- review the following information:
- http://trolltech.com/products/qt/licenses/licensing/licensingoverview
- or contact the sales department at sales at trolltech.com.
- .
- In addition, as a special exception, Trolltech, as the sole
- copyright holder for Qt Designer, grants users of the Qt/Eclipse
- Integration plug-in the right for the Qt/Eclipse Integration to
- link to functionality provided by Qt Designer and its related
- libraries.
- .
- This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
- INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
- granted herein.
- .
- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Files: src/findsubtitles/quazip/crypt.h
-Copyright: 1998-2005, Gilles Vollant
-License: infozip
-
-Files: src/findsubtitles/quazip/unzip.c
-Copyright: 1990-2000 Info-ZIP
-License: infozip
-
-Files:
- src/findsubtitles/quazip/unzip.h
- src/findsubtitles/quazip/zip.h
-Copyright: 1998-2005, Gilles Vollant
-License: Zlib
-
-Files: src/findsubtitles/maia/
-Copyright: 2010 Sebastian Wiedenroth
-License: BSD-2-clause
-
-Files: src/findsubtitles/quazip/quazip*
-Copyright: 2005-2007, Sergey A. Tachenov
-License: GPL-2+
+License: LGPL-2.1+
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -148,82 +91,6 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: infozip
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
- .
- This software is provided "as is," without warranty of any kind, express or
- implied. In no event shall Info-ZIP or its contributors be held liable for any
- direct, indirect, incidental, special or consequential damages arising out of
- the use of or inability to use this software.
- .
- Permission is granted to anyone to use this software for any purpose, including
- commercial applications, and to alter it and redistribute it freely, subject to
- the above disclaimer and the following restrictions:
- .
- Redistributions of source code (in whole or in part) must retain the above
- copyright notice, definition, disclaimer, and this list of conditions.
- .
- Redistributions in binary form (compiled executables and libraries) must
- reproduce the above copyright notice, definition, disclaimer, and this list of
- conditions in documentation and/or other materials provided with the
- distribution. Additional documentation is not needed for executables where a
- command line license option provides these and a note regarding this option is
- in the executable's startup banner. The sole exception to this condition is
- redistribution of a standard UnZipSFX binary (including SFXWiz) as part of a
- self-extracting archive; that is permitted without inclusion of this license, as
- long as the normal SFX banner has not been removed from the binary or disabled.
- .
- Altered versions--including, but not limited to, ports to new operating systems,
- existing ports with new graphical interfaces, versions with modified or added
- functionality, and dynamic, shared, or static library versions not from
- Info-ZIP--must be plainly marked as such and must not be misrepresented as being
- the original source or, if binaries, compiled from the original source. Such
- altered versions also must not be misrepresented as being Info-ZIP
- releases--including, but not limited to, labeling of the altered versions with
- the names "Info-ZIP" (or any variation thereof, including, but not limited to,
- different capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
- explicit permission of Info-ZIP. Such altered versions are further prohibited
- from misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses or the
- Info-ZIP URL(s), such as to imply Info-ZIP will provide support for the altered
- versions.
- .
- Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
- "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source
- and binary releases.
-
-License: Zlib
- Condition of use and distribution are the same than zlib :
- .
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
 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:

-- 
smplayer packaging

