[SCM] toonloop/master: Update copyright file: Fix include verbatim flavored GPL licensings, and rename to approproate License shortnames.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Apr 6 16:57:20 UTC 2012


The following commit has been merged in the master branch:
commit 431d57183de380b13b24e592b3c6cc4c37c58e96
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 17:59:59 2012 +0200

    Update copyright file: Fix include verbatim flavored GPL licensings, and rename to approproate License shortnames.

diff --git a/debian/copyright b/debian/copyright
index 654f829..b4f3487 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Alexandre Quessy <info at toonloop.com>
  Toonloop discussions <list at toonloop.com>
 Source: http://www.toonloop.com
 Copyright: 2010, Alexandre Quessy
-License: GPL-3+
+License: GPL-3+~Toonloop
 
 Files: */Makefile.in
 Copyright: 1992-2009, Free Software Foundation, Inc.
@@ -12,8 +12,14 @@ License: GAP~Makefile.in
 
 Files: config.guess
  config.sub
- ltmain.sh
- missing
+Copyright: 1992-2009, Free Software Foundation, Inc.
+License: GPL-2+~file with Autoconf exception
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
+
+Files: missing
 Copyright: 1992-2009, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
@@ -21,15 +27,14 @@ License: GPL-2+ with Autoconf exception
  script generated by Autoconf, you may include it under the same
  distribution terms that you use for the rest of that program.
 
-Files: m4/libtool.m4
- m4/lt*.m4
-Copyright: 1996-2008, Free Software Foundation, Inc.
+Files: m4/lt*.m4
+Copyright: 2004-2005,2007-2008, Free Software Foundation, Inc.
 License: GAP
 
 Files: src/v4l2util.cpp
  src/v4l2util.h
 Copyright: 2008-2009, Société des arts technologiques (SAT)
-License: GPL-3+
+License: GPL-3+~ART
 
 Files: m4/ax_boost_*.m4
 Copyright: 2008, Daniel Casimiro <dan.casimiro at gmail.com>
@@ -42,15 +47,31 @@ Files: configure
 Copyright: 1992-1996,1998-2009, Free Software Foundation, Inc.
 License: GAP~configure
 
+Files: m4/libtool.m4
+Copyright: 1996-2001,2003-2008, Free Software Foundation, Inc.
+License: GAP and GPL-2+~Libtool with Libtool exception
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program or library that is built
+ using GNU Libtool, you may include this file under the same
+ distribution terms that you use for the rest of that program.
+
 Files: aclocal.m4
 Copyright: 1996-2009, Free Software Foundation, Inc
  2004, Scott James Remnant <scott at netsplit.com>
-License: GAP and GPL-2+ with Autoconf exception
+License: GAP and GPL-2+~file with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
  script generated by Autoconf, you may include it under the same
  distribution terms that you use for the rest of that program.
 
+Files: ltmain.sh
+Copyright: 1992-2009, Free Software Foundation, Inc.
+License: GPL-2+~Libtool with Libtool exception
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program or library that is built
+ using GNU Libtool, you may include this file under the same
+ distribution terms that you use for the rest of that program.
+
 Files: install-sh
 Copyright: 1994, X Consortium
 License: Expat~X with X exception
@@ -64,26 +85,34 @@ Copyright: 2010, Alexandre Quessy <alexandre at quessy.net>
  2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-3
 
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify it
+License: GPL-3+~Toonloop
+ Toonloop 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 3 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.
+ Toonloop 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.
 Comment:
- Some files differ from above by replacing "this file" and/or "this
- program" with more specific terms.
- .
  On Debian systems the 'GNU General Public License' version 3 is located
  in '/usr/share/common-licenses/GPL-3'.
  .
  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-3+~ART
+ [propulse]ART 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 3 of the License, or (at
+ your option) any later version.
+ .
+ [propulse]ART 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.
+
 License: GPL-3
  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
@@ -108,6 +137,23 @@ Comment:
  On Debian systems the 'GNU General Public License' version 2 is located
  in '/usr/share/common-licenses/GPL-2'.
 
+License: GPL-2+~file
+ This file 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.
+
+License: GPL-2+~Libtool
+ GNU Libtool 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.
+
 License: Expat~X
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list