[SCM] libbluray/master: update debian/copyright

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 42b88df7cc20fc0770c01db693229d9d23866292
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Tue Feb 22 19:28:50 2011 +0100

    update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 3d743e5..124f6d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,102 @@
-License:
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: libbluray
+Upstream-Contact: ?
+Source: http://git.videolan.org/?p=libbluray.git
 
-    Copyright (C) 2009-2010 John Stebbins et al.
+Files: *
+Copyright: 2010, hpi1
+           2010, fraxinas
+           2010, John Stebbins
+           2010, Joakim
+           2010, Obliter0n
+           2010, William Hahne
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
+ <http://www.gnu.org/licenses/>.
+ .
+ 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'.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+Files: src/utils/bits.h
+Copyright: 2003, the VideoLAN team
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
+ <http://www.gnu.org/licenses/>.
+ .
+ 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'.
 
-    This library 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
-    Lesser General Public License for more details.
+Files: src/examples/bdj_test.c
+Copyright: 2010, William Hahne
+License: GPL-2+
+ 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, see <http://www.gnu.org/licenses/>.
+ .
+ In addition, as a special exception, the copyright holders of libbluray
+ gives permission to link the code of its release of libbluray with the
+ OpenSSL project's "OpenSSL" library (or with modified versions of it
+ that use the same license as the "OpenSSL" library), and distribute
+ the linked executables.  You must obey the GNU General Public License
+ in all respects for all of the code used other than "OpenSSL".  If you
+ modify this file, you may extend this exception to your version of the
+ file, but you are not obligated to do so.  If you do not wish to do
+ so, delete this exception statement from your version.
+ .
+ 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'.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library. If not, see
-    <http://www.gnu.org/licenses/>.
+Files: debian/*
+Copyright: 2011, Rico Tzschichholz <ricotz at ubuntu.com>
+License: GPL-3+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+ .
+ 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-3'.
 
-License for src/utils/bits.h:
-
-    Copyright (C) 2003 the VideoLAN team
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library. If not, see
-    <http://www.gnu.org/licenses/>.
-
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License version 2.1 is in `/usr/share/common-licenses/LGPL-2.1'.

-- 
libbluray packaging