[SCM] libbluray/master: Update debian/copyright:
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Oct 5 12:06:32 UTC 2013
The following commit has been merged in the master branch:
commit 79ba47fa7abbbe8fb0dc4b09fbd8d2a7d0cc9d0b
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Oct 5 13:05:06 2013 +0100
Update debian/copyright:
- Refresh the format according to debian copyright format 1.0
- Add myself to the copyright holders list of the debian/ directory.
- Group files by license, split licenses from file stanzas.
diff --git a/debian/copyright b/debian/copyright
index 7e0e82d..c0e38db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,34 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libbluray
Source: http://git.videolan.org/?p=libbluray.git
Files: *
-Copyright: 2010, hpi1
- 2010, fraxinas
- 2010, John Stebbins
- 2010, Joakim
- 2010, Obliter0n
- 2010, William Hahne
+Copyright:
+ 2010, hpi1
+ 2010, fraxinas
+ 2010, John Stebbins
+ 2010, Joakim
+ 2010, Obliter0n
+ 2010, William Hahne
+ 2003, the VideoLAN team
+License: LGPL-2.1
+
+Files: src/examples/bdj_test.c
+Copyright: 2010, William Hahne
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ 2010-2011 Andres Mejia <amejia at debian.org>
+ 2011, Rico Tzschichholz <ricotz at ubuntu.com>
+ 2013 Alessio Treglia <alessio at debian.org>
+License: LGPL-2.1+
+
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.
+ License as published by the Free Software Foundation,
+ version 2.1 of the License.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,27 +41,22 @@ Comment: You should have received a copy of the GNU Lesser General Public
License version 2.1 can be found in the file
'/usr/share/common-licenses/LGPL-2.1'.
-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.
+License: LGPL-2.1+
+ This program 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,
+ 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
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
Comment: 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/>.
+ License along with this program. 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'.
+ 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'.
-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
@@ -72,23 +82,3 @@ Comment: You should have received a copy of the GNU General Public License
.
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'.
-
-Files: debian/*
-Copyright: 2010-2011 Andres Mejia <amejia at debian.org>
- 2011, Rico Tzschichholz <ricotz at ubuntu.com>
-License: LGPL-2.1+
- This program 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 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 Lesser General Public License for more details.
-Comment: You should have received a copy of the GNU Lesser General Public
- License along with this program. 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'.
-
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list