backport 11443

[vlc] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 692421174e0d4f63669ddf622c22323696b22be7..a310a5a1fca114402ca76496a56d594cb964ed77 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,36 @@
 This package was debianized by Sam Hocevar <sam@zoy.org> on
 Mon, 13 Mar 2000 02:21:45 +0100.
 
-It was taken from the CVS tree. See http://developers.videolan.org/cvs.html
+It was taken from http://download.videolan.org/pub/vlc/, and the source
+tarball also contains the faad2 and x264 trees.
 
-Upstream Authors: The VideoLAN Team <videolan@videolan.org>
+Upstream authors: The VideoLAN Team <videolan@videolan.org>
+
+faad2 authors: M. Bakker (mbakker(at)nero.com)
+               Alexander Kurpiers (a.kurpiers(at)nt.tu-darmstadt.de)
+               Volker Fischer (v.fischer(at)nt.tu-darmstadt.de)
+
+x264 authors: Laurent Aimar <fenrir@via.ecp.fr>
+              Eric Petit <titer@videolan.org>
+              Min Chen <chenm001@163.com>
+              Justin Clay (justin_clay(at)hotmail.com)
+              Måns Rullgård (mru(at)mru.ath.cx)
 
 VideoLAN is Copyright 1996-2004 The VideoLAN Team
 
-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, or (at your option) any
-later version.
+  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, 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.
+  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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.