[SCM] ardour3/master-a4: Update copyright file.

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

The following commit has been merged in the master-a4 branch:
commit 3f864871db07956c19d925f0a406c17901be8d38
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Apr 22 08:49:48 2015 +0200

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index c0617d7..59ba8c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -187,10 +187,10 @@ Files:
  libs/gtkmm2ext/paths_dialog.cc
  libs/gtkmm2ext/gtkmm2ext/paths_dialog.h
  libs/plugins/reasonablesynth.lv2/rsynth.c
- libs/ardouralsautil/request_device.c
  libs/plugins/reasonablesynth.lv2/lv2.c
+ libs/ardouralsautil/request_device.c
  libs/backends/jack/weak_libjack.c
- libs/backends/asio/rt_thread.h	GPL
+ libs/backends/asio/rt_thread.h
  libs/backends/alsa/alsa_midi.cc
  libs/backends/alsa/alsa_midi.h
  libs/backends/alsa/alsa_sequencer.cc
@@ -909,22 +909,22 @@ 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: LGPL
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation.
- .
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- General Public License for more details.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
  .
- On Debian GNU systems, the complete text of the GNU Lesser General
- Public License (LGPL) can be found in '/usr/share/common-licenses/LGPL-2'.
+ 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.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL-3'.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+ 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: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify it
@@ -1112,6 +1112,35 @@ License: BSD-2-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+License: BSD-4-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+    This product includes software developed by the University of
+    California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
 License: BSL-1.0
  Distributed under the Boost Software License, Version 1.0. (See
  accompanying file LICENSE_1_0.txt or copy at

-- 
ardour3 packaging