[SCM] ardour/master: Update copyright file.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Aug 28 17:14:01 UTC 2016


The following commit has been merged in the master branch:
commit 425bf61444cb44b6670e83470ca728c406fe4a0c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Aug 28 19:13:51 2016 +0200

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index 2d61cf8..b619cd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -163,10 +163,7 @@ License: GPL-2+
 
 Files:
  gtk2_ardour/bundle_env_msvc.cc
- libs/ardour/msvc/msvc_libardour.cc
  libs/ardour/ardour/msvc_libardour.h
- libs/pbd/msvc/msvc_pbd.cc
- libs/pbd/msvc/msvc_poll.cc
  libs/pbd/pbd/msvc_pbd.h
  libs/pbd/pbd/windows_special_dirs.h
  libs/pbd/windows_special_dirs.cc
@@ -299,13 +296,6 @@ Copyright:
 License: GPL-2+
 
 Files:
- libs/pbd/msvc/getopt.h
- libs/pbd/msvc/getopt_long.c
-Copyright:
- 2000 The NetBSD Foundation, Inc
-License: BSD-4-clause
-
-Files:
  libs/pbd/pbd/undo.h
  libs/pbd/undo.cc
 Copyright:
@@ -658,12 +648,6 @@ Copyright:
 License: GPL-2+
 
 Files:
- libs/pbd/msvc/getopt.c
-Copyright:
- 1987, 1993, 1994 The Regents of the University of California
-License: BSD-4-clause
-
-Files:
  libs/ardouralsautil/ardouralsautil/reserve.h
  libs/ardouralsautil/reserve.c
 Copyright:
@@ -992,35 +976,6 @@ 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

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list