[SCM] smplayer/master: Fix syntax of debian/copyright

Fri Mar 29 21:14:30 UTC 2013

The following commit has been merged in the master branch:
commit 056b17f169a110e75332ce2d0942330049c72114
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 29 22:12:51 2013 +0100

    Fix syntax of debian/copyright
    
    This file now passes 'cme check dpkg-copyright'

diff --git a/debian/copyright b/debian/copyright
index fac13a5..56405ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,58 +4,21 @@ Upstream-Contact: Ricardo Villalba <rvm at escomposlinux.org>
 Source: http://smplayer.sf.net
 
 Files: *
-Copyright: 2006-2012, Ricardo Villalba <rvm at escomposlinux.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 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 full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Copyright:
+ 2006-2012, Ricardo Villalba <rvm at escomposlinux.org>
 
 Files: debian/*
+License: GPL-2+
 Copyright:
  2007, Cyril Breuil <cyrilbport at gmail.com>
  2008-2012, Maia Kozheva <sikon at ubuntu.com>
-License: GPL-2+
 
 Files:
  src/myslider.cpp
  src/myslider.h
 Copyright: 2006-2012, Ricardo Villalba <rvm at escomposlinux.org>
 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
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), Trolltech ASA
- (or its successors, if any) and the KDE Free Qt Foundation, which shall
- act as a proxy defined in Section 6 of version 3 of the license.
- .
- 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library.  If not, see http://www.gnu.org/licenses/.
- .
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
 
 Files:
  src/verticaltext.cpp
@@ -124,6 +87,97 @@ License: GPL-2 or GPL-3 or other
 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
+ 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.
+
+Files: src/findsubtitles/quazip/quazip*
+Copyright: 2005-2007, Sergey A. Tachenov
+License: GPL-2+
+
+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
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), Trolltech ASA
+ (or its successors, if any) and the KDE Free Qt Foundation, which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+ .
+ 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see http://www.gnu.org/licenses/.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+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 full text of the GNU General Public
+ 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
@@ -163,34 +217,3 @@ License: infozip
  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.
-
-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
- 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.
-
-Files: src/findsubtitles/quazip/quazip*
-Copyright: 2005-2007, Sergey A. Tachenov
-License: GPL-2+

-- 
smplayer packaging

