[SCM] ffmpeg/master.extra: add note to debian/copyright that the package is distributed under GPLv3

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue May 3 11:30:22 UTC 2011


The following commit has been merged in the master.extra branch:
commit 5fa424498356f0654d58f5678c3eedaffaeb49a4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:46:56 2011 +0100

    add note to debian/copyright that the package is distributed under GPLv3

diff --git a/debian/copyright b/debian/copyright
index 9a92261..261a8f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,4 @@
-SVN snapshots are downloaded with subversion from the ffmpeg SVN at:
-    <svn://svn.ffmpeg.org/ffmpeg/>
+This package was downloaded from http://git.libav.org
 
 Upstream Authors: Fabrice Bellard
                   Alex Beregszaszi
@@ -94,3 +93,7 @@ On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
 
+
+NB: This package links against opencore-amr, which is licensed under
+Apache License 2.0. This means that this binary package is distributed
+under the terms of the GNU General Public License 3.0!

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list