[SCM] libav/master: Clarify licensing in debian/copyright (Closes: #698019)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 89600743123c6edae9e4a937e0c9189118d0da2e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 28 09:39:37 2014 -0400

    Clarify licensing in debian/copyright (Closes: #698019)
    
    This should help until we have a more sophisticated license tracking
    infrastructure with confusion such as discussed in the bug.

diff --git a/debian/README.Debian b/debian/README.Debian
index 0d27ec8..7501b68 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,7 +12,7 @@ i386 architecture, as we know that the upstream build system will
 produce PIC libraries where necessary. Only architectures like i386 will
 be built non-PIC, mainly for performance reasons.
 
- -- Reinhard Tartler <siretart at tauware.de>, Sat, 28 Jun 2014 09:33:54 -0400
+ -- Reinhard Tartler <siretart at tauware.de>, Sat, 28 Jun 2014 09:38:52 -0400
 
 Source package
 ==============
@@ -26,10 +26,10 @@ application packages.
 License of the Debian ffmpeg packages
 =====================================
 
-The license for the whole work is the GPL, not the LGPL, because GPL-only
-parts of ffmpeg were activated -- namely libpostproc, libswscale, x11grab and
-(optionally) libfaad2. If you need LGPL versions of the libraries, please
-comment out the appropriate line in debian/confflags.
+The license for the whole work is the GPL, not the LGPL, because
+GPL-only parts of ffmpeg were activated -- namely libswscale, x11grab
+and other GPL licensed libraries. If you need LGPL versions of the
+libraries, please comment out the appropriate line in debian/confflags.
 
 Because libavcodec-extra-* links against libraries that are licensed
 under Apache License 2.0, the resulting binaries are distributed under
diff --git a/debian/copyright b/debian/copyright
index 913bed7..2ae0b86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Libav
 Upstream-Contact: libav-devel at libav.org
 Source: http://libav.org
+Comment:
+  The license for the whole work is the GPL, not the LGPL, because GPL-only
+  parts of Libav were activated -- namely libswscale, x11grab and
+  other GPL licensed libraries. If you need LGPL versions of the libraries,
+  please comment out the appropriate line in debian/confflags.
+  .
+  Because libavcodec-extra-* links against libraries that are licensed
+  under Apache License 2.0, the resulting binaries are distributed under
+  the GPL version 3 or later.
 
 Files: *
 Copyright: 1994-2012, the Xiph.Org Foundation and contributors

-- 
Libav/FFmpeg packaging