[SCM] ffms2/master: Document src/avisynth/avisynth.h

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 085a3a6bf232d31e4e829b81d4ee6dc8221c7134
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Dec 7 20:51:31 2013 +0100

    Document src/avisynth/avisynth.h

diff --git a/debian/copyright b/debian/copyright
index c7e8963..5881cfa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,8 +74,8 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public
- License along with VapourSynth; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ License along with VapourSynth; 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
  version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
@@ -86,6 +86,46 @@ Comment:
  https://github.com/FFMS/ffms2/commit/1a11397e25435e21e2a6da72b0f8730cf6c36579
  for the change of the license.
 
+Files: src/avisynth/avisynth.h
+Copyright: 2002 Ben Rudiak-Gould et al.
+License: GPL-2+ with Avisynth exception
+ 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, or visit
+ http://www.gnu.org/copyleft/gpl.html.
+ .
+ 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'.
+ .
+ As a special exception, the copyright holders of Avisynth give you permission
+ to link Avisynth with independent modules that communicate with Avisynth solely
+ through the interfaces defined in avisynth.h, regardless of the license terms
+ of these independent modules, and to copy and distribute the resulting combined
+ work under terms of your choice, provided that every copy of the combined work
+ is accompanied by a complete copy of the source code of Avisynth (the version
+ of Avisynth used to produce the combined work), being distributed under the
+ terms of the GNU General Public License plus this exception.  An independent
+ module is a module which is not derived from or based on Avisynth, such as
+ 3rd-party filters, import and export plugins, or graphical user interfaces.
+Comment:
+ Upstream confirmed in https://github.com/FFMS/ffms2/issues/140 that this file
+ is directly included from Avisynth. Although all source files in Avisynth 2.5
+ are covered by the same exception, it is missing from the GPL copy included in
+ Avisynth (which can be found at
+ http://avisynth2.cvs.sourceforge.net/viewvc/avisynth2/avisynth/distrib/gpl.txt?revision=1.2&view=markup).
+ Also note that the exception got removed in later versions of Avisynth (see
+ http://avisynth2.cvs.sourceforge.net/viewvc/avisynth2/avisynth/src/core/avisynth.h?r1=1.17.2.17&r2=1.17.2.18).
+ In any case, this file is only used for Windows builds of ffms2.
+
 Files: debian/*
 Copyright:
  2009-2010, Rickard Närström <rickard.narstrom at gmail.com>

-- 
ffms2 packaging