[Pkg-gstreamer-commits] [SCM] GStreamer libav plugin 1.0 Packaging branch, master, updated. upstream/0.11.90-8-g7014743

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 7014743a0963190e8347c2c587f105b7928bd64f
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu May 3 19:20:46 2012 +0200

    Update copyright.

diff --git a/debian/changelog b/debian/changelog
index 00db1f3..238ce6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ gst-libav1.0 (0.11.90-1) experimental; urgency=low
   [ Sebastian Dröge ]
   * Transition package to multi-arch.
   * Use gstreamer1.0-libav as binary package names for consistency.
+  * Update copyright.
 
- -- Sebastian Dröge <slomo at debian.org>  Thu, 03 May 2012 13:55:24 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 03 May 2012 19:20:40 +0200
 
 gstreamer0.10-ffmpeg (0.10.13-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index bd39e6d..2a577f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,35 @@ Wed, 16 Jun 2004 22:52:13 -0400
 
 It was downloaded from http://gstreamer.freedesktop.org/
 
-Upstream Authors:
-
-    The GStreamer Team
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GStreamer libav Plugins 1.0
+Upstream-Contact: gstreamer-devel at lists.freedesktop.org
+Source: http://gstreamer.freedesktop.org
+
+
+Files: ext/ffmpeg/gstffmpeg.c
+ ext/ffmpeg/gstffmpeg.h
+ ext/ffmpeg/gstffmpegcodecmap.h
+ ext/ffmpeg/gstffmpegdec.c
+ ext/ffmpeg/gstffmpegdemux.c
+ ext/ffmpeg/gstffmpegenc.c
+ ext/ffmpeg/gstffmpegenc.h
+ ext/ffmpeg/gstffmpegmux.c
+ ext/ffmpeg/gstffmpegprotocol.c
+Copyright: <1999> Erik Walthinsen <omega at cse.ogi.edu>
+License: LGPL-2+
+
+Files: ext/ffmpeg/gstffmpegcfg.c
+ ext/ffmpeg/gstffmpegcfg.h
+ ext/ffmpeg/gstffmpegpipe.h
+Copyright: <2006> Mark Nauwelaerts <manauw at skynet.be>
+License: LGPL-2+
+
+Files: gst-libs/ext/libav/
+Copyright: The libav team
+License: LGPL-2.1+
+
+ Not used for this source package
 
 Copyright:
 

-- 
GStreamer libav plugin 1.0 Packaging