[SCM] libdvbpsi/master: Update debian/copyright.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Dec 30 20:12:55 UTC 2012
The following commit has been merged in the master branch:
commit ca6a1a54fa4ae0d6621f4d8e81dc18963b29665a
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Dec 30 20:08:26 2012 +0000
Update debian/copyright.
diff --git a/debian/copyright b/debian/copyright
index 4d53fb4..68a7fd4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,8 @@ License: LGPL-2.1+
Files: *
Copyright:
- 2001-2011 VideoLAN
+ 2001-2012 VideoLAN
+ 2010-2012 Adam Charrett
2005-2010 M2X BV
2005-2010 Andrew John Hughes
License: LGPL-2.1+
@@ -14,19 +15,6 @@ License: LGPL-2.1+
Files: misc/test_dr.h
Copyright: 2001-2002 VideoLAN
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Files: debian/*
Copyright:
@@ -45,8 +33,26 @@ License: LGPL-2.1+
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
+ .
+ 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 complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
--
libdvbpsi packaging
More information about the pkg-multimedia-commits
mailing list