[SCM] tsdecrypt/master: debian/copyright:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Apr 18 09:07:45 UTC 2012


The following commit has been merged in the master branch:
commit 2c24b4ea31a64a88a7aebfe470825263c42f75f0
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Apr 18 11:06:51 2012 +0200

    debian/copyright:
    
    - Some code are GPL-2 only, not GPL-2+.
    - Fix reference to GPL-2 license file.

diff --git a/debian/copyright b/debian/copyright
index c1e8f7d..6b37a2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: tsdecrypt
 Upstream-Contact: Georgi Chorbadzhiyski <georgi at unixsol.org>
 Source: http://georgi.unixsol.org/programs/tsdecrypt/
 Comment: Upstream SCM is at: https://github.com/gfto/tsdecrypt
-License: GPL-2+
+License: GPL-2
 
 Files: *
 Copyright: 2006-2011 Unix Solutions Ltd.
-License: GPL-2+
+License: GPL-2
 
 Files: libfuncs/* libtsfuncs/*
 Copyright: 2006-2011 Unix Solutions Ltd.
@@ -23,6 +23,22 @@ Files: debian/*
 Copyright: 2012 Alessio Treglia <alessio at debian.org>
 License: GPL-2+
 
+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, version 2 of the License.
+ .
+ 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:
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 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
@@ -35,7 +51,7 @@ License: GPL-2+
  GNU Lesser General Public License for more details.
 Comment:
  On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ License can be found in `/usr/share/common-licenses/GPL-2'.
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
tsdecrypt packaging



More information about the pkg-multimedia-commits mailing list