[SCM] libmediainfo/master: Update copyright file

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Wed Jul 10 01:19:50 UTC 2013 

The following commit has been merged in the master branch:
commit b7f14a140b98a693e01eaf6964b4458543fbc97d
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Jul 9 23:03:53 2013 +0800

    Update copyright file

diff --git a/debian/copyright b/debian/copyright
index 42702ab..7eeea69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,135 +4,24 @@ Upstream-Contact: MediaArea.net SARL <Info at MediaArea.net>
 Source: http://mediainfo.sf.net
 
 Files: *
-Copyright: 2002-2011, MediaArea.net SARL <Info at MediaArea.net>
-License: LGPL-3+
-
-Files: Project/NetBeans/Example.JNA/src/HowToUse_Dll.JNA.java
-       Project/NetBeans/Example.JNA/src/MediaInfoDLL.JNA.java
-       Source/Example/HowToUse.cpp
-       Source/Example/HowToUse_Dll.JNA.java
-       Source/Example/HowToUse_Dll.cpp
-       Source/MediaInfo/Export/Export_Mpeg7.cpp
-       Source/MediaInfo/Export/Export_Mpeg7.h
-       Source/MediaInfo/Export/Export_PBCore.cpp
-       Source/MediaInfo/Export/Export_PBCore.h
-       Source/MediaInfo/MediaInfo_Const.h
-       Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.h
-       Source/MediaInfoDLL/MediaInfoDLL.JNA.java
-       Source/MediaInfoDLL/MediaInfoDLL.h
-       Source/MediaInfoDLL/MediaInfoDLL.py
-       Source/MediaInfoDLL/MediaInfoDLL3.py
-       Source/MediaInfoDLL/MediaInfoDLL_Static.h
-Copyright: 2002-2011, Jerome Martinez <Zen at MediaArea.net>
-License: LGPL-3+
-
-Files: Source/MediaInfo/Audio/File_Als.cpp
-       Source/MediaInfo/Audio/File_Als.h
-       Source/MediaInfo/Audio/File_Celt.cpp
-       Source/MediaInfo/Audio/File_Celt.h
-       Source/MediaInfo/Audio/File_La.cpp
-       Source/MediaInfo/Audio/File_La.h
-       Source/MediaInfo/Audio/File_Tak.cpp
-       Source/MediaInfo/Audio/File_Tak.h
-       Source/MediaInfo/Multiple/File_Ivf.cpp
-       Source/MediaInfo/Multiple/File_Riff_Elements.cpp
-Copyright: 2002-2011, MediaArea.net SARL <Info at MediaArea.net>
-           2009-2011, Lionel Duchateau, kurtnoise at free.fr
-License: LGPL-3+
-
-Files: Project/MSCS2008/Example/MediaInfoDLL.cs
-       Project/MSCS2008/asp_net_web_application/MediaInfoDLL.cs
-       Project/MSCS2010/Example/MediaInfoDLL.cs
-       Project/MSCS2010/asp_net_web_application/MediaInfoDLL.cs
-       Source/MediaInfo/File__Analyse_Automatic.h
-       Source/MediaInfo/MediaInfo_Config_Automatic.cpp
-       Source/MediaInfoDLL/MediaInfoDLL.cs
-Copyright: 2002-2009, Jerome Martinez <Zen at MediaArea.net>
-           2005-2007, Jerome Martinez, Zen at MediaArea.net
-           2008-2008, Jerome Martinez, Zen at MediaArea.net
-License: LGPL-2.1+
+Copyright: 2002-2013, MediaArea.net SARL <Info at MediaArea.net>
+License: BSD-2-clause
 
 Files: Project/MSCS2008/Example/HowToUse_Dll.cs
        Project/MSCS2010/Example/HowToUse_Dll.cs
-       Source/Example/HowToUse_Dll.cs
-       Source/Example/HowToUse_Dll.py
-       Source/Example/HowToUse_Dll3.py
-       Source/Example/HowToUse_Dll_CLI.cs
-Copyright: *No copyright*
+Copyright: MediaArea.net SARL <Info at MediaArea.net>
 License: Zlib
 
-Files: Source/MediaInfo/Audio/File_Ape.cpp
-       Source/MediaInfo/Audio/File_Ape.h
-Copyright: 2003-2009, Jasper van de Gronde <th.v.d.gronde at hccnet.nl>
-           2003-2011, MediaArea.net SARL <Info at MediaArea.net>
-License: LGPL-3+
-
-Files: Source/MediaInfo/Audio/File_Rkau.cpp
-       Source/MediaInfo/Audio/File_Rkau.h
-Copyright: 2011-2011, Lionel Duchateau <kurtnoise at free.fr>
-           2011-2011, MediaArea.net SARL <Info at MediaArea.net>
-License: LGPL-3+
-
-Files: Project/NetBeans/Example.JNative/src/MediaInfoDLL.JNative.java
-       Source/MediaInfoDLL/MediaInfoDLL.JNative.java
-Copyright: 2006, Bro3 <bro3 at users.sourceforge.net>
-           2006-2009, Jerome Martinez <Zen at MediaArea.net>
-License: LGPL-2.1+
-
-Files: Project/NetBeans/Example.JNative/src/HowToUse_Dll.JNative.java
-       Source/Example/HowToUse_Dll.JNative.java
-Copyright: 2006-2009, Jerome Martinez <Zen at MediaArea.net>
-License: LGPL-2.1+
-
-Files: Source/MediaInfo/Multiple/File_Ivf.h
-Copyright: 2004-2011, MediaArea.net SARL <Info at MediaArea.net>
-           2010, Lionel Duchateau <kurtnoise at free.fr>
-License: LGPL-3+
-
-Files: Source/MediaInfo/Audio/File_La.h
-Copyright: 2009, Lionel Duchateau <kurtnoise at free.fr>
-License: LGPL-3+
+Files: Source/ThirdParty/tinyxml2/tinyxml2.cpp
+       Source/ThirdParty/tinyxml2/tinyxml2.h
+Copyright: Copyright: 2011-2012 Lee Thomason <leethomason at gmail.com>
+License: Zlib
 
 Files: debian/*
 Copyright: 2008, MediaArea.net SARL <Info at MediaArea.net>
            2012, Chow Loong Jin <hyperair at debian.org>
 License: GPL-3+
 
-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) any later version.
- .
- 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the full text of this license can be found in
- /usr/share/common-licenses/LGPL-2.1.
-
-License: LGPL-3+
- 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 3 of the License, or
- any later version.
- .
- 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 systems, the full text of this license can be found in
- /usr/share/common-licenses/LGPL-3.
-
 License: 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
@@ -165,3 +54,24 @@ License: GPL-3+
  .
  On Debian systems, the full text of this license can be found in
  /usr/share/common-licenses/LGPL-3.
+
+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:
+ .
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS “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 COPYRIGHT HOLDER 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.

-- 
libmediainfo packaging

More information about the pkg-multimedia-commits mailing list