[debian-edu-commits] debian-edu/pkg-team/ 01/01: Updated copyright information

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 56b3662d04239ecab73dc554f8749a4c2726bae8
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Wed May 11 23:44:21 2016 +0200

    Updated copyright information
---
 debian/copyright                 | 27 ++++++++++++++++-----------
 debian/patches/vst-no-wine.patch |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fcc4d2d..2348622 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -139,10 +139,12 @@ License: GPL-2+
 Files: plugins/LadspaEffect/swh/*
 Copyright:
  1999 Juhana Sadeharju <kouhia at nic.funet.fi>
- 2000-2003 Alexander Ehlert
+ 2000-2003 Alexander Ehlert <mag at glame.de>
  2000-2002 Steve Harris <steve at plugin.org.uk>
- Frank Neumann
- Joern Nettingsmeier
+ Andy Wingo <wingo at pobox.com>
+ Frank Neumann <franky at users.sourceforge.net>
+ Jesse Chappell <jesse at essej.net>
+ Joern Nettingsmeier <nettings at folkwang-hochschule.de>
  Marcus Andersson
  Mark Knecht
  Matthias Nagorni
@@ -168,7 +170,10 @@ Copyright:
  Achim Settelmeier <settel-linux at sirlab.de>
  Hexasoft <hexasoft.corp at free.fr>
  Josh Green <jgreen at users.sourceforge.net>
-License: GPL-3+
+License: GPL-2+
+Comment:
+ Despite the file stating GPL-3+, vocoder is under GPL-2+. See
+ https://github.com/LMMS/lmms/issues/2366 for more details.
 
 Files: plugins/LadspaEffect/tap/*
 Copyright:
@@ -232,7 +237,7 @@ Copyright:
  Tobias Doerffel
 License: GPL-2+
 Comment:
- Despite the files stating GPL-2, ZynAddSubFX is GPL-2+. See
+ Despite the files stating GPL-2, ZynAddSubFX is under GPL-2+. See
  https://github.com/LMMS/lmms/issues/2752 for more details.
 
 License: Artistic-2
@@ -255,7 +260,7 @@ License: Artistic-2
  license directly with the Copyright Holder of a given Package.  If the
  terms of this license do not permit the full use that you propose to
  make of the Package, you should contact the Copyright Holder and seek
- a different licensing arrangement. 
+ a different licensing arrangement.
  .
  Definitions
  .
@@ -288,7 +293,7 @@ License: Artistic-2
  .
      "Modified Version" means the Package, if it has been changed, and
      such changes were not explicitly requested by the Copyright
-     Holder. 
+     Holder.
  .
      "Original License" means this Artistic License as Distributed with
      the Standard Version of the Package, in its current version or as
@@ -321,7 +326,7 @@ License: Artistic-2
  Package will still be considered the Standard Version, and as such
  will be subject to the Original License.
  .
- Distribution of Modified Versions of the Package as Source 
+ Distribution of Modified Versions of the Package as Source
  .
  (4)  You may Distribute your Modified Version as Source (either gratis
  or for a Distributor Fee, and with or without a Compiled form of the
@@ -354,7 +359,7 @@ License: Artistic-2
          available in that license fees are prohibited but Distributor
          Fees are allowed.
  .
- Distribution of Compiled Forms of the Standard Version 
+ Distribution of Compiled Forms of the Standard Version
  or Modified Versions without the Source
  .
  (5)  You may Distribute Compiled forms of the Standard Version without
@@ -371,7 +376,7 @@ License: Artistic-2
  the Source, provided that you comply with Section 4 with respect to
  the Source of the Modified Version.
  .
- Aggregating or Linking the Package 
+ Aggregating or Linking the Package
  .
  (7)  You may aggregate the Package (either the Standard Version or
  Modified Version) with other packages and Distribute the resulting
@@ -387,7 +392,7 @@ License: Artistic-2
  include the Package, and Distribute the result without restriction,
  provided the result does not expose a direct interface to the Package.
  .
- Items That are Not Considered Part of a Modified Version 
+ Items That are Not Considered Part of a Modified Version
  .
  (9) Works (including, but not limited to, modules and scripts) that
  merely extend or make use of the Package, do not, by themselves, cause
diff --git a/debian/patches/vst-no-wine.patch b/debian/patches/vst-no-wine.patch
index cce4528..83408f2 100644
--- a/debian/patches/vst-no-wine.patch
+++ b/debian/patches/vst-no-wine.patch
@@ -4,6 +4,7 @@ Description: Compile VST plugins without Wine
 Author: Javier Serrano Polo <javier at jasp.net>
 Bug-Debian: https://bugs.debian.org/763720
 Forwarded: https://github.com/LMMS/lmms/pull/2735
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/CMakeLists.txt
 ===================================================================

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git