[SCM] zynaddsubfx/master: Fix copyright file.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4cb6f07c525878b364944564bc1fb1115442330f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 28 01:30:33 2015 +0100

    Fix copyright file.

diff --git a/debian/copyright b/debian/copyright
index 297b9cf..5627d75 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,13 @@ Files:
  src/Nio/JackEngine.cpp
 Copyright:
  2009 Alan Calvert
-License: GPL-3+
+License: GPL-2+
+
+Files:
+ src/Nio/jack_osc.h
+Copyright:
+ 2014 Hanspeter Portner <dev at open-music-kontrollers.ch>
+License: zlib/libpng
 
 Files: debian/*
 Copyright:
@@ -44,19 +50,38 @@ License: GPL-2
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: GPL-3+
+License: GPL-2+
  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,
+ This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-3'.
- .
- You should have received a copy of the GNU General Public License
+Comment: You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: zlib/libpng
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ . 
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ . 
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ . 
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ . 
+ 3. This notice may not be removed or altered from any source
+    distribution.

-- 
zynaddsubfx packaging