[SCM] mediainfo/master: Update copyright

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Wed Jul 10 15:21:26 UTC 2013


The following commit has been merged in the master branch:
commit f6356bdeac7729cf57c482ca4f694932812adbda
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jul 10 01:06:15 2013 +0800

    Update copyright

diff --git a/debian/copyright b/debian/copyright
index e526ffb..f09a000 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,68 +4,34 @@ Upstream-Contact: Info at MediaArea.net
 Source: http://mediainfo.sourceforge.net/en/Download/Source
 
 Files: *
-Copyright: 2002-2012, MediaArea.net SARL <Info at MediaArea.net>
-License: LGPL-3+
-
-Files: Source/GUI/Common/GUI_Main_Common_Core.h
-       Source/GUI/Common/GUI_Main_Easy_Box_Core.h
-       Source/GUI/Common/GUI_Main_Easy_Core.h
-       Source/GUI/VCL_New/GUI_Main_Easy.h
-       Source/GUI/VCL_New/GUI_Main_HTML.h
-       Source/GUI/VCL_New/GUI_Main_Text.h
-       Source/GUI/VCL_New/GUI_Main_Tree.h
-       Source/GUI/WxWidgets/GUI_Main_Easy.h
-       Source/GUI/WxWidgets/GUI_Main_Easy_Box.h
-       Source/GUI/WxWidgets/GUI_Main_HTML.h
-       Source/GUI/WxWidgets/GUI_Main_Sheet.h
-       Source/GUI/WxWidgets/GUI_Main_Text.h
-       Source/GUI/WxWidgets/GUI_Main_Tree.h
-Copyright: 2007-2011, MediaArea.net SARL <Info at MediaArea.net>
-License: LGPL-2.1+
-
-Files: Source/Common/Preferences.cpp
-Copyright: 2002-2009, Jerome Martinez, Zen at MediaArea.net
-License: GPL-3+
+Copyright: 2002-2013, MediaArea.net SARL <Info at MediaArea.net>
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2008, MediaArea.net <info at mediaarea.net>
            2012, Chow Loong Jin <hyperair at debian.org>
 License: GPL-3+
 
-License: LGPL-3+
- This program 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 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 Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http:www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public License may
- be found at /usr/share/common-licenses/LGPL-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 the GNU Lesser General Public License may
- be found at /usr/share/common-licenses/LGPL-2.1.
+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.
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify

-- 
mediainfo packaging



More information about the pkg-multimedia-commits mailing list