[SCM] hydrogen/master: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Jul 19 09:51:56 UTC 2017


The following commit has been merged in the master branch:
commit 14c14e7df22c19117a04b258766c70e474a078b2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 19 11:49:21 2017 +0200

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

diff --git a/debian/copyright b/debian/copyright
index d0aa44f..6a3212e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,17 +11,32 @@ Copyright:
   2008,2013, Sebastian Moors <mauser at smoors.de>
   2013, Pawel Piatek
   2015, Aurelien Leblond <blablack at gmail.com>
+License-Grant:
+ 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.
 License: GPL-2+
 
 Files: src/plugins/wasp/*
 Copyright: 2005, Artemiy Pavlov <http://artemiolabs.com>
+License-Grant:
+ This program is free software, it may be distributed under the terms
+ and conditions of the GNU General Public License version 2 or later.
 License: GPL-2+
 
 Files: cmake/*
 Copyright:
   2009, Jérémy Zurcher, <jeremy at asynk.ch>
   2009-2010, Tobias Rautenkranz <tobias at rautenkranz.ch>
+License-Grant:
+ Redistribution and use is allowed according to the terms of the BSD
+ license. For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 License: BSD-3-clause
+Comment:
+ File COPYING-CMAKE-SCRIPTS is not included with upstream source.
+ Identically named file found in various other project (from historic
+ releases of cmake, apparently), containing the BSD-3-clause license.
 
 Files:
  src/core/include/hydrogen/IO/JackMidiDriver.h
@@ -33,6 +48,11 @@ Files:
  src/core/include/hydrogen/lilypond/lilypond.h
  src/core/src/lilypond/lilypond.cpp
 Copyright: 2015, Sacha Delanoue
+License-Grant:
+ 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.
 License: GPL-2+
 
 Files: */ladspa.h
@@ -40,6 +60,11 @@ Copyright:
   2000-2002, Paul Barton-Davis
   2000-2002, Richard W.E. Furse
   2000-2002, Stefan Westerfeld
+License-Grant:
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
 License: LGPL-2.1+
 
 Files: src/core/include/hydrogen/nsm.h
@@ -58,42 +83,21 @@ Files: debian/*
 Copyright:
   2010-2011, Jonas Smedegaard <dr at jones.dk>
   2014-2016, Jaromír Mikeš <mira.mikes at seznam.cz>
-License: GPL-2+
-
-License: GPL-2+
+License-Grant:
  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, 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.
-Comment:
- On Debian GNU systems the GNU General Public License (GPL) version 2 is
- located 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+
+
+License: GPL-2+
+License-Reference: /usr/share/common-licenses/GPL-2
+
+License: GPL-3+
+License-Reference: /usr/share/common-licenses/GPL-3
 
 License: LGPL-2.1+
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- .
- This library 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 GNU systems the GNU Lesser General Public License (LGPL)
- version 2.1 is located in '/usr/share/common-licenses/LGPL-2.1'.
- .
- 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/>.
+License-Reference: /usr/share/common-licenses/LGPL-2.1
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list