[SCM] ffms2/master: Convert d/copyright to CF 1.0

Mon Dec 2 21:43:03 UTC 2013

The following commit has been merged in the master branch:
commit 0f75ae5798af8761d6dd7b3b2491d6ec423d5582
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 2 22:00:46 2013 +0100

    Convert d/copyright to CF 1.0
    
    Also update copyright years

diff --git a/debian/copyright b/debian/copyright
index a0cfd61..23af6bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,70 +1,72 @@
-Name: ffmpegsource
-Source: http://code.google.com/p/ffmpegsource/downloads/list
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: ffms2
+Source: https://github.com/FFMS/ffms2
 
+Files: *
 Copyright:
-    2007-2009, Fredrik Mellbin
-    2004-2009, Mike Matsnev
+ 2007-2012, Fredrik Mellbin
+ 2004-2009, Mike Matsnev
 Comment:
-    The FFMS2 source is licensed under the MIT license, but its binaries
-    are licensed under the GPL because GPL components of FFmpeg are
-    used. FFmpeg can be built with either GPLv2, GPLv3, or even be
-    nonredistributable. Refer to FFmpeg's sources for licensing information.
-    .
-    On a Debian system the full text of GPL can be found at
-    /usr/share/common-licenses/GPL-2 and /usr/share/common-licenses/GPL-3
-License: MIT
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    .
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-    .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
+ The FFMS2 source is licensed under the MIT license, but its binaries
+ are licensed under the GPL because GPL components of FFmpeg are
+ used. FFmpeg can be built with either GPLv2, GPLv3, or even be
+ nonredistributable. Refer to FFmpeg's sources for licensing information.
+ .
+ On a Debian system the full text of GPL can be found at
+ /usr/share/common-licenses/GPL-2 and /usr/share/common-licenses/GPL-3
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
 
 Files: src/core/matroskaparser.*
-Copyright: 2004-2009 Mike Matsnev
-License:
-    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 immediately at the beginning of the file, without modification,
-       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.
-    3. Absolutely no warranty of function or purpose is made by the author
-       Mike Matsnev.
-    .
-    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 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.
+Copyright: 2004-2008 Mike Matsnev
+License: BSD-3-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 immediately at the beginning of the file, without modification,
+    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.
+ 3. Absolutely no warranty of function or purpose is made by the author
+    Mike Matsnev.
+ .
+ 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 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.
 
 Files: debian/*
 Copyright:
-    2009-2010, Rickard Närström <rickard.narstrom at gmail.com>
-    2010, Reinhard Tartler <siretart at tauware.de>
+ 2009-2010, Rickard Närström <rickard.narstrom at gmail.com>
+ 2010, Reinhard Tartler <siretart at tauware.de>
 License:
-    Copying and distribution of this package, with or without
-    modification, are permitted in any medium without royalty
-    provided the copyright notice and this notice are
-    preserved.
+ Copying and distribution of this package, with or without
+ modification, are permitted in any medium without royalty
+ provided the copyright notice and this notice are
+ preserved.
 

-- 
ffms2 packaging

