[debian-edu-commits] debian-edu/pkg-team/ 01/01: Fixed some copyright mismatches reported by debmake
Javier Serrano Polo
jasp00-guest at moszumanska.debian.org
Mon May 16 23:57:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
jasp00-guest pushed a commit to branch master
in repository lmms.
commit aa889b1cc1cb7ff4c5af7534abc72c3dc5614433
Author: Javier Serrano Polo <javier at jasp.net>
Date: Tue May 17 01:55:32 2016 +0200
Fixed some copyright mismatches reported by debmake
---
debian/copyright | 44 +-
debian/patches/copyright-fixes.patch | 2131 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 2171 insertions(+), 5 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 2348622..560afa4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,9 +12,7 @@ Comment:
Files: *
Copyright:
1998-2000 Paul Kellett (mda-vst.com)
- 1999-2007 Simon Peter <dn.tlp at gmx.net>
1999-2004 Dag Lem <resid at nimrod.no>
- 1999-2000 Tatsuyuki Satoh
2002 Kjetil S. Matheussen
2003-2007 Rui Nuno Capela
2003-2005 Shay Green
@@ -117,6 +115,14 @@ Copyright:
Thorsten Wilms <t_w_ at freenet.de>
Tom Szilagyi <tomszilagyi at gmail.com>
Torben Hohn <torbenh at gmx.de>
+License: LGPL-2+
+Comment:
+ COPYING is the GNU Lesser General Public License. Headers refer to version 2 of
+ this license instead of version 2.1.
+
+Files: plugins/LadspaEffect/calf/src/calf/vumeter.h
+Copyright:
+ 2007 Krzysztof Foltman <wdev at foltman.com>
License: GPL-2+
Files: plugins/LadspaEffect/caps/*
@@ -172,7 +178,7 @@ Copyright:
Josh Green <jgreen at users.sourceforge.net>
License: GPL-2+
Comment:
- Despite the file stating GPL-3+, vocoder is under GPL-2+. See
+ Despite the original file stating GPL-3+, vocoder is under GPL-2+. See
https://github.com/LMMS/lmms/issues/2366 for more details.
Files: plugins/LadspaEffect/tap/*
@@ -202,7 +208,17 @@ Copyright:
2000-2004 Zachary Smith
License: GPL-3+
-Files: plugins/sfxr/sfxr.*
+Files: plugins/opl2/fmopl.*
+ plugins/opl2/mididata.h
+ plugins/opl2/opl.h
+ plugins/opl2/temuopl.*
+Copyright:
+ 1999-2007 Simon Peter <dn.tlp at gmx.net>
+ 1999-2000 Tatsuyuki Satoh
+License: LGPL-2.1+
+
+Files: plugins/sfxr/readme.*
+ plugins/sfxr/sfxr.*
Copyright:
2007 Tomas Pettersson <drpetter at gmail.com>
2014 Wong Cho Ching <chwongie-banana at yahoo.com>
@@ -237,7 +253,7 @@ Copyright:
Tobias Doerffel
License: GPL-2+
Comment:
- Despite the files stating GPL-2, ZynAddSubFX is under GPL-2+. See
+ Despite the original files stating GPL-2, ZynAddSubFX is under GPL-2+. See
https://github.com/LMMS/lmms/issues/2752 for more details.
License: Artistic-2
@@ -886,6 +902,24 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-3'.
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2'.
+
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
diff --git a/debian/patches/copyright-fixes.patch b/debian/patches/copyright-fixes.patch
new file mode 100644
index 0000000..d08bca5
--- /dev/null
+++ b/debian/patches/copyright-fixes.patch
@@ -0,0 +1,2131 @@
+Description: Fix copyright notices
+ Vocoder and ZynAddSubFX are under GPL-2+. See
+ https://github.com/LMMS/lmms/issues/2366 and
+ https://github.com/LMMS/lmms/issues/2752 for more details.
+Author: Javier Serrano Polo <javier at jasp.net>
+Forwarded: https://github.com/LMMS/lmms/pull/2765
+Applied-Upstream: 1.1.91
+
+Index: lmms-1.1.3/plugins/LadspaEffect/swh/vocoder_1337.c
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/vocoder_1337.c 2016-05-17 00:31:09.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/swh/vocoder_1337.c 2016-05-17 00:31:24.000000000 +0200
+@@ -24,7 +24,7 @@
+ Licence: GPL
+ 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 3 of the License, or
++ 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,
+Index: lmms-1.1.3/plugins/zynaddsubfx/README.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/README.txt 2016-05-16 21:26:58.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/README.txt 2016-05-16 21:29:56.000000000 +0200
+@@ -3,7 +3,7 @@
+ It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
+ Copyright (c) 2002-2009 Nasca Octavian Paul and others contributors
+ e-mail: zynaddsubfx AT yahoo D0T com
+-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
++ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
+
+ --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
+ --==## MADE WITH ZynAddSubFX ##==--
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/README.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/README.txt 2016-05-17 00:37:25.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/README.txt 2016-05-17 00:38:01.000000000 +0200
+@@ -3,7 +3,7 @@
+ It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
+ Copyright (c) 2002-2014 Nasca Octavian Paul and others contributors
+ e-mail: zynaddsubfx AT yahoo D0T com
+-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
++ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
+
+ --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
+ --==## MADE WITH ZynAddSubFX ##==--
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp 2016-05-17 01:39:43.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h 2016-05-17 01:39:43.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp 2016-05-17 01:39:43.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h 2016-05-17 01:39:43.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp 2016-05-17 01:39:44.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -15,8 +15,9 @@
+ DSP analog modeling theory & practice largely influenced by various CCRMA publications, particularly works by Julius O. Smith.
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h 2016-05-17 01:40:09.000000000 +0200
+@@ -10,8 +10,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Harald Hvaal
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h 2016-05-17 01:39:45.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Lars Luthman
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Lars Luthman
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -33,8 +33,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h 2016-05-17 01:40:09.000000000 +0200
+@@ -33,8 +33,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -4,8 +4,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h 2016-05-17 01:39:46.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h 2016-05-17 01:40:09.000000000 +0200
+@@ -7,8 +7,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h 2016-05-17 01:40:09.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp 2016-05-17 00:38:41.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp 2016-05-17 00:38:51.000000000 +0200
+@@ -7,7 +7,7 @@
+ This file is part of ZynAddSubFX, which 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.
++ version 2 of the License, or (at your option) any later version.
+
+ ZynAddSubFX is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h 2016-05-17 00:38:41.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h 2016-05-17 00:38:57.000000000 +0200
+@@ -7,7 +7,7 @@
+ This file is part of ZynAddSubFX, which 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.
++ version 2 of the License, or (at your option) any later version.
+
+ ZynAddSubFX is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp 2016-05-17 01:40:09.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp 2016-05-17 00:38:41.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp 2016-05-17 00:39:02.000000000 +0200
+@@ -6,7 +6,7 @@
+ This file is part of yoshimi, which 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.
++ version 2 of the License, or (at your option) any later version.
+
+ yoshimi is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h 2016-05-17 00:38:41.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h 2016-05-17 00:39:09.000000000 +0200
+@@ -6,7 +6,7 @@
+ This file is part of yoshimi, which 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.
++ version 2 of the License, or (at your option) any later version.
+
+ yoshimi is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h 2016-05-17 01:40:10.000000000 +0200
+@@ -8,8 +8,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -3,8 +3,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h 2016-05-17 01:39:47.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h 2016-05-17 01:40:10.000000000 +0200
+@@ -7,8 +7,9 @@
+ Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp 2016-05-17 01:39:48.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h 2016-05-17 01:39:49.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -7,8 +7,9 @@
+ Authors: Mark McCurry, Harald Hvaal
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -7,8 +7,9 @@
+ Authors: Mark McCurry, Harald Hvaal
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: zco
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Authors: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -7,8 +7,9 @@
+ Authors: Mark McCurry, Harald Hvaal
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/globals.h
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/globals.h 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/globals.h 2016-05-17 01:40:10.000000000 +0200
+@@ -7,8 +7,9 @@
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
+Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp
+===================================================================
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp 2016-05-17 01:39:50.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp 2016-05-17 01:40:10.000000000 +0200
+@@ -6,8 +6,9 @@
+ Copyright (C) 2012-2014 Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+- it under the terms of version 2 of the GNU General Public License
+- as published by the Free Software Foundation.
++ 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
diff --git a/debian/patches/series b/debian/patches/series
index 6f86504..0effbec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ zynaddsubfx-libs.patch
useless-deps.patch
switch-pulse.patch
license-gpl3.patch
+copyright-fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git
More information about the debian-edu-commits
mailing list