[SCM] gmerlin-avdecoder/master: Update copyright file: Better license shortnames.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 309f2a40859cd6b3aad31844591bf76750da1ebe
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 18:30:39 2012 +0200

    Update copyright file: Better license shortnames.

diff --git a/debian/copyright b/debian/copyright
index e538263..defa4cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,16 +14,16 @@ License: GPL-2+
 Files: config.rpath
  m4/*.m4
 Copyright: 1995-2006, Free Software Foundation, Inc
-License: other-GAP
+License: GAP
 
 Files: lib/targa.[ch]
 Copyright: 2001-2003, Emil Mikulic
-License: other-targa
+License: targa
 
 Files: lib/base64.c
 Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
   1998-2000, University College London
-License: BSD-3-clause and other-Bellcore
+License: BSD-3-clause and Bellcore
 
 Files: include/RTjpeg.[ch]
 Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
@@ -33,7 +33,7 @@ License: LGPL-2.1+
 
 Files: po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
-License: other-GAP-gettext
+License: GAP~gettext
 
 Files: debian/*
 Copyright: 2008, Christian Marillat <marillat at debian.org>
@@ -106,7 +106,7 @@ License: BSD-3-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: other-Bellcore
+License: Bellcore
  Permission to use, copy, modify, and distribute this material for any
  purpose and without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies, and
@@ -117,7 +117,7 @@ License: other-Bellcore
  FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
  IMPLIED WARRANTIES.
 
-License: other-GAP
+License: GAP
  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.
@@ -130,13 +130,13 @@ License: other-GAP
  Some files differ from above by replacing "This file" with "This
  Makefile.in".
 
-License: other-GAP-gettext
+License: GAP~gettext
  This file may be copied and used freely without restrictions.  It may
  be used in projects which are not available under a GNU Public License,
  but which still want to provide support for the GNU gettext
  functionality.
 
-License: other-targa
+License: targa
  Source and binary redistribution of this code, with or without changes,
  for free or for profit, is allowed as long as this copyright notice is
  kept intact.  Modified versions must be clearly marked as modified.

-- 
gmerlin-avdecoder packaging