[SCM] libshout/master: Update copyright info: Use SPDX License shortnames.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Aug 29 11:14:26 UTC 2017


The following commit has been merged in the master branch:
commit e1b8f8c8b54d7592d7141479c95723668c89689f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 10:31:30 2017 +0200

    Update copyright info: Use SPDX License shortnames.

diff --git a/debian/copyright b/debian/copyright
index 4937c48..7f504b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ License: LGPL-2+
 
 Files: */Makefile.in
 Copyright: 1994-2009, Free Software Foundation, Inc.
-License: GAP~Makefile.in
+License: FSFULLR~Makefile.in
 
 Files: compile
  depcomp
@@ -38,11 +38,11 @@ License: NTP~Rushing
 
 Files: configure
 Copyright: 1992-1996,1998-2010, Free Software Foundation, Inc.
-License: GAP~configure
+License: FSFUL
 
 Files: aclocal.m4
 Copyright: 1996-2009, Free Software Foundation, Inc
-License: GAP
+License: FSFULLR
 
 Files: src/net/sock.h
 Copyright: 1999, the icecast team
@@ -55,11 +55,7 @@ License: LGPL-2+
 
 Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat~X with X exception
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
+License: X11
 
 Files: debian/*
 Copyright: 2003, Keegan Quinn <ice at thebasement.org>
@@ -130,7 +126,7 @@ License: GPL-2+~file
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  General Public License for more details.
 
-License: Expat~X
+License: X11
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -149,12 +145,13 @@ License: Expat~X
  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
 
 License: NTP~Rushing
- Copyright (C) 1995-1997 by Sam Rushing <rushing at nightmare.com>
- .
- All Rights Reserved
- .
  Permission to use, copy, modify, and distribute this software and its
  documentation for any purpose and without fee is hereby granted,
  provided that the above copyright notice appear in all copies and that
@@ -171,26 +168,16 @@ License: NTP~Rushing
  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
 
-License: GAP
+License: FSFUL
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+License: FSFULLR
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
 
-License: GAP~configure
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-License: GAP~Makefile.in
+License: FSFULLR~Makefile.in
  This Makefile.in is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list